- add reference on paysheet models

- fix some casse problems
- improve AsODT files to be able to displays more lines in one page

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

bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Print Pay Sheet</string> </value>
+            <value> <string>Print Payslip</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml

@@ -99,6 +99,7 @@
                     <value>
                       <list>
                         <string>my_title</string>
+                        <string>my_reference</string>
                         <string>my_destination_section_title</string>
                         <string>my_source_section_title</string>
                         <string>my_social_insurance_annotation_line_source_title</string>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml

@@ -139,7 +139,7 @@ AAA=</string> </value>
       </style:table-cell-properties>\n
     </style:style>\n
     <style:style style:family=\'table-row\' style:name=\'Tableau1.3\'>\n
-      <style:table-row-properties style:min-row-height=\'0.4cm\'/>\n
+      <style:table-row-properties style:min-row-height=\'0.35cm\'/>\n
     </style:style>\n
     <style:style style:family=\'table-cell\' style:name=\'Tableau1.A3\'>\n
       <style:table-cell-properties fo:padding=\'0cm\' fo:border-right=\'0.008cm solid #000000\' fo:border-top=\'none\' fo:background-color=\'transparent\' fo:border-left=\'0.008cm solid #000000\' fo:border-bottom=\'none\' style:vertical-align=\'middle\'>\n
@@ -592,7 +592,7 @@ AAA=</string> </value>
         </table:table-row>\n
         <table:table-row table:style-name=\'Tableau1.5\'>\n
           <table:table-cell table:style-name=\'Tableau1.A5\'\n
-                            table:number-columns-spanned=\'9\' office:value-type=\'string\'>\n
+                            table:number-columns-spanned=\'6\' office:value-type=\'string\'>\n
             <table:table table:style-name=\'Tableau3\' table:name=\'Tableau3\'>\n
               <table:table-column table:style-name=\'Tableau3.A\'/>\n
               <table:table-column table:style-name=\'Tableau3.B\'/>\n
@@ -619,20 +619,20 @@ AAA=</string> </value>
                   <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/net_salary\', tax_category=\'tax_category/employee_share\')), data_dict[\'currency\'])">800.000,00</text:p>\n
                 </table:table-cell>\n
               </table:table-row>\n
-              <table:table-row table:style-name=\'Tableau3.1\'>\n
-                <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+              <table:table-row table:style-name=\'Tableau1.4\'>\n
+                <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
                   <text:p text:style-name=\'Table_20_Contents\'/>\n
                 </table:table-cell>\n
-                <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+                <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
                   <text:p text:style-name=\'Table_20_Contents\'/>\n
                 </table:table-cell>\n
-                <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+                <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
                   <text:p text:style-name=\'Table_20_Contents\'/>\n
                 </table:table-cell>\n
-                <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+                <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
                   <text:p text:style-name=\'Table_20_Contents\'/>\n
                 </table:table-cell>\n
-                <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+                <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
                   <text:p text:style-name=\'Table_20_Contents\'/>\n
                 </table:table-cell>\n
               </table:table-row>\n
@@ -647,9 +647,6 @@ AAA=</string> </value>
           <table:covered-table-cell/>\n
           <table:covered-table-cell/>\n
           <table:covered-table-cell/>\n
-          <table:covered-table-cell/>\n
-          <table:covered-table-cell/>\n
-          <table:covered-table-cell/>\n
         </table:table-row>\n
       </table:table>\n
       <text:p text:style-name=\'P4\'/>\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml

@@ -117,7 +117,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Print Pay Sheet</string> </value>
+            <value> <string>Print Payslip</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

bt5/erp5_payroll/bt/revision

-360
+362
\ No newline at end of file