To have a valid format change the column length to privilege the

selections_columns and to have a minumun of 1.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34759 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml

@@ -102,8 +102,8 @@
             tal:condition="python: field.get_value(\'title\')">\n
           <!-- if the group bottom there isn\'t a title -->\n
           <table:table-cell table:number-rows-spanned=\'1\'\n
-              table:style-name=\'report-content-heading2-with-lines\'\n
-            tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or column_len-1"\n
+            table:style-name=\'report-content-heading2-with-lines\'\n
+            tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or max(column_len-1, 1)"\n
             office:value-type=\'string\'\n
             tal:define="value python: field.get_value(\'default\')">\n
             <tal:block tal:condition="python: same_type(value, []) or same_type(value, ())">\n

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml

@@ -112,17 +112,15 @@ dQEAAAAA</string> </value>
           <tal:block tal:define="global field_list python: form.get_fields_in_group(group)"/>\n
           <tal:block tal:condition="python:len(field_list) &gt; 0">\n
             <tal:block tal:define="global column_len python: 5"/>\n
-            <tal:block tal:condition="report_item | nothing">\n
-               <tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or 0;"/>\n
-            </tal:block>\n
-            <tal:block tal:condition="python: column_len &lt; 6">\n
-              <tal:block tal:repeat="field python:field_list">\n
-                <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
-                   <tal:block tal:define="column_list python: field.get_value(\'columns\');\n
-                                         global column_len python: max(column_len, len(column_list))" />\n
-                </tal:block>\n
+            <tal:block tal:repeat="field python:field_list">\n
+              <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
+                 <tal:block tal:define="column_list python: field.get_value(\'columns\');\n
+                                       global column_len python: max(column_len, len(column_list))" />\n
               </tal:block>\n
             </tal:block>\n
+            <tal:block tal:condition="report_item | nothing">\n
+               <tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or column_len;"/>\n
+            </tal:block>\n
             <!-- Display field -->\n
             <tal:block tal:repeat="field python:field_list">\n
               <tal:block metal:use-macro="form/field_ods_macro/macros/field_render" />\n

bt5/erp5_ods_style/bt/revision

-232
+233
\ No newline at end of file