diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml
index d38116f3b7bb5d94cd2e5311e28aacbb3fd8fb86..f6ffdcf6c982939b6171cf83d5880646629c596d 100644
--- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml
+++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml
@@ -71,7 +71,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/RatioSettings_view</string> </value>
+            <value> <string>string:${object_url}/PaySheetModelRatioLine_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
index c5a0a05b84cb6e7da9dce040163fb5e8ffb841f8..dfbc5b5053bac64046c04ae9340f24072c48e8de 100644
--- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
+++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/PaySheet_viewODTPrintDialog</string> </value>
+            <value> <string>string:${object_url}/PaySheetTransaction_viewODTPrintDialog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py b/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py
index 3dcb8aad5aca28ccceecff20d1ca57b80dae2541..c69b35ba781f0386ab4a821348b04f86d719ed76 100644
--- a/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py
+++ b/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py
@@ -66,7 +66,7 @@ class PaySheetModelLine(TradeModelLine):
 
   security.declareProtected(Permissions.ModifyPortalContent,
                             'newCellContent' )
-  def newCellContent(self, id, portal_type='Pay Sheet Model Cell', **kw):
+  def newCellContent(self, id, portal_type='Pay Sheet Model Cell', **kw): # pylint:disable=redefined-builtin
     """Overriden to specify default portal type
     """
     return self.newContent(id=id, portal_type=portal_type, **kw)
diff --git a/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.xml b/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.xml
index 00c627631797602992435c2f744a4f53b41a6852..546abaa685f67654a4893db2a1022a1500546d0d 100644
--- a/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.xml
+++ b/bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.xml
@@ -37,9 +37,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W: 69, 27: Redefining built-in \'id\' (redefined-builtin)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_payroll/ModuleTemplateItem/paysheet_model_module.xml b/bt5/erp5_payroll/ModuleTemplateItem/paysheet_model_module.xml
index 343d12aad68dc1f85a7a7ecc9fdee23205593152..1bfafe5f6d4b6a3d116fdaaca0ba43be5edb0a56 100644
--- a/bt5/erp5_payroll/ModuleTemplateItem/paysheet_model_module.xml
+++ b/bt5/erp5_payroll/ModuleTemplateItem/paysheet_model_module.xml
@@ -10,9 +10,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ERP5TioSafe Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
diff --git a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml
index 4ff1f712a1bdb730ad347fe60c631100ce7cf184..e08fe55f3b44c44ea61bc9354ef76e0f1e01b766 100644
--- a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml
+++ b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>init_script</string> </key>
-            <value> <string>PaySheetModeLine_init</string> </value>
+            <value> <string>PaySheetModelLine_init</string> </value>
         </item>
         <item>
             <key> <string>permission</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py
index c56c64029c2a253498b87e121f6e4fd00cc0d76d..ba1ebf0e03e26baad3467033db434ff75a516fef 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py
@@ -3,7 +3,6 @@ from DateTime import DateTime
 
 request = context.REQUEST
 portal = context.getPortalObject()
-translateString = portal.Base_translateString
 
 net_salary_base_amount_uid = \
               portal.portal_categories.base_amount.payroll.report.salary.net.getUid()
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_section_category.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_section_category.xml
index ffa710998dcf8be1485499abdbe53687a6ae70ab..f688ae6f46ceea3c28a8c1285c57d9e56f8ce585 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_section_category.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_section_category.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>required</string>
-                <string>editable</string>
                 <string>default</string>
+                <string>editable</string>
                 <string>items</string>
+                <string>required</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -98,6 +102,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_simulation_state.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_simulation_state.xml
index 6dbd314430f13fe523d5fe1e9d8ccab9f79c7488..0b26cefefa37417cfea20105a2434b631f2933ea 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_simulation_state.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_simulation_state.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>required</string>
-                <string>editable</string>
                 <string>default</string>
+                <string>editable</string>
                 <string>items</string>
+                <string>required</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -98,6 +104,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_at_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_at_date.xml
index 4719ec0c8fdfa6f6e274f10d33ebee5bb80c7453..03724b79d518bc46aee04d698759c842d0a0deaf 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_at_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_at_date.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>required</string>
                 <string>title</string>
-                <string>default</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_from_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_from_date.xml
index 6201fe1af7547ab91622e3da5afb12e3f10906f8..ee6ca4af62b897490ba2deeacc0fabd05fcbd35f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_from_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_from_date.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>default</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -78,6 +78,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_simulation_state.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_simulation_state.xml
index 5a3632eaf52665ea5fd5d1b23f100f2465693d8e..03faebaf41c2f0a1b79f84ca06a35c0f5d5a8bbe 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_simulation_state.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_simulation_state.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>description</string>
-                <string>title</string>
+                <string>items</string>
                 <string>required</string>
                 <string>size</string>
-                <string>default</string>
-                <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -94,6 +94,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>Only consider transactions in those states.</string> </value>
@@ -106,6 +112,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_section_category.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_section_category.xml
index ffa710998dcf8be1485499abdbe53687a6ae70ab..f688ae6f46ceea3c28a8c1285c57d9e56f8ce585 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_section_category.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_section_category.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>required</string>
-                <string>editable</string>
                 <string>default</string>
+                <string>editable</string>
                 <string>items</string>
+                <string>required</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -98,6 +102,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_simulation_state.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_simulation_state.xml
index 6dbd314430f13fe523d5fe1e9d8ccab9f79c7488..0b26cefefa37417cfea20105a2434b631f2933ea 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_simulation_state.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_simulation_state.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>required</string>
-                <string>editable</string>
                 <string>default</string>
+                <string>editable</string>
                 <string>items</string>
+                <string>required</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -98,6 +104,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_at_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_at_date.xml
index 4719ec0c8fdfa6f6e274f10d33ebee5bb80c7453..03724b79d518bc46aee04d698759c842d0a0deaf 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_at_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_at_date.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>required</string>
                 <string>title</string>
-                <string>default</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_from_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_from_date.xml
index 6201fe1af7547ab91622e3da5afb12e3f10906f8..ee6ca4af62b897490ba2deeacc0fabd05fcbd35f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_from_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_from_date.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>default</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -78,6 +78,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_simulation_state.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_simulation_state.xml
index 5a3632eaf52665ea5fd5d1b23f100f2465693d8e..03faebaf41c2f0a1b79f84ca06a35c0f5d5a8bbe 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_simulation_state.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_simulation_state.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>description</string>
-                <string>title</string>
+                <string>items</string>
                 <string>required</string>
                 <string>size</string>
-                <string>default</string>
-                <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -94,6 +94,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>Only consider transactions in those states.</string> </value>
@@ -106,6 +112,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml
index abecf9a0d8f8a50931cd054f4b069e464e0f4b7e..100268d11998f2560d4aacea5e6dea821f35a61f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml
@@ -62,7 +62,7 @@ AAA=</string> </value>
         </item>
         <item>
             <key> <string>ooo_stylesheet</string> </key>
-            <value> <string>PaySheet_getODTStyleSheet</string> </value>
+            <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
         </item>
         <item>
             <key> <string>ooo_xml_file_id</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListPrintDialog/your_format.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListPrintDialog/your_format.xml
index d3e6b034415716e1dc678dbd38df0f067d003cc0..e033d0be44bad4edf57c228486ef3456108f7c8a 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListPrintDialog/your_format.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListPrintDialog/your_format.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>default</string>
+                <string>description</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>Printing format</string> </value>
@@ -98,6 +102,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_quantity_unit.xml
index f133581f06e3a4a69ff46bc11a9c5b049c0d1aa3..d270ae6bc40b628b2ef6810135da786b7ffb5235 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_price.xml
index d2392340dc7270e3c770c93538e61a22bcd02e77..9d9cca33153e1fa5f028cdf1ca4159608eb61362 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_price.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_price.xml
@@ -10,11 +10,11 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
+                <string>description</string>
                 <string>display_width</string>
+                <string>input_style</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -89,6 +89,10 @@
                     <key> <string>description</string> </key>
                     <value> <string>The price paid for the one unit of quantity</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_quantity_unit.xml
index 8510ac03852e5dc700d802eec6e0fba2f859b647..0f8a4a1854b072b9eae4a6d510fd9c2e93168062 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetCell_view/my_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetCell_view/my_price.xml
index 09185d44d888926a271d5d511fdb771fdce06afe..ff6ab4c4ce571aa84fa98d0e75b292d61e6cf7e4 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetCell_view/my_price.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetCell_view/my_price.xml
@@ -10,11 +10,11 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
+                <string>description</string>
                 <string>display_width</string>
+                <string>input_style</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -89,6 +89,10 @@
                     <key> <string>description</string> </key>
                     <value> <string>The Ratio applied to the Base.</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.py
index d7e562ecea4ceb6c81da7c9354ef2fbcd769e69d..098f460664f72efdbc23fddb70f36474ac5f9746 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.py
@@ -14,20 +14,20 @@ if resource is not None:
 
       for v in base_application_variation_dict.values():
         if matrixbox == 1:
-          cell_range.append(map(lambda x: (x[1],x[0]), v))
+          cell_range.append([(y, x) for x, y in v])
         else:
           cell_range.append(v)
     else:
       if matrixbox == 1:
         # XXX matrixbox is right_display (not as listfield) => invert display and value in item
         if context.getVariationCategoryList(base_category_list=(base_category,)):
-          cell_range.append(map(lambda x: (x[1],x[0]),
+          cell_range.append([(y, x) for x, y in
             context.getVariationCategoryItemList(base_category_list=\
-                (base_category,) ) ) )
+                (base_category,) )])
       else:
         cell_range.append(context.getVariationCategoryList(base_category_list=\
             (base_category,)))
 
-  cell_range = filter(lambda x: x != [], cell_range )
+  cell_range = [x for x in cell_range if x]
 
 return cell_range
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_variation_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_variation_category_list.xml
index d57e0d3fcc51e916532254e70f8cb21baafd99b7..c4bff8ae707443066d0788cd864e3102f2aaa789 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_variation_category_list.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_price.xml
index ee7917c7fa92451b1549ca2e156f8252ef06982d..11bd33060358261fb612ed7db17743bbc48472cb 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_price.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_price.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>default</string>
+                <string>description</string>
                 <string>display_width</string>
+                <string>input_style</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -92,10 +92,18 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>The Ratio applied to the Base.</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_quantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_quantity.xml
index a29b838d75ca802219bb3451a2ecabdff4eb430b..b8a7683830ee2d9f2e8be8197d6f605da6aa1883 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_quantity.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_quantity.xml
@@ -10,13 +10,13 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>default</string>
+                <string>description</string>
                 <string>display_width</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -99,10 +99,18 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>The Base used to calculate the tax.</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
@@ -115,6 +123,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml
index 562f069cfc0b1cd40607e994d2b610c59b2c1dad..361eda6e72fc7c656ecaefe95e6f2cc60503b49b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml
@@ -10,13 +10,13 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
-                <string>editable</string>
-                <string>input_style</string>
                 <string>default</string>
                 <string>display_width</string>
+                <string>editable</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -99,6 +99,14 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -115,6 +123,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_variation_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_variation_category_list.xml
index fba79a9dbc59a2af0a0df2b2387f8d62b24ce833..8327ae8eb9fbaba819548956aa4034b00423901b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_variation_category_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>hidden</string>
                 <string>default</string>
+                <string>hidden</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_lines_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py
index a793302c4f5602133b6c40fd56dff1b25d6ad7e1..555cb2559d251e700c5e7bb7617f52c844a8621b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py
@@ -50,7 +50,7 @@ if matrixbox :
             % script.id)
       cell_range.append(category_cell_range)
 
-    cell_range = filter(lambda x: x != [], cell_range)
+    cell_range = [x for x in cell_range if x]
   while len(cell_range) < 3:
     cell_range.append([])
   return cell_range
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.py
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.py
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.py
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml
similarity index 97%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml
index 5d17c11bf3b41360bde1699faecd58657d4f1f76..50741a71ba93e3425c4b4d1a2aad2c0857580b26 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PaySheetModeLine_init</string> </value>
+            <value> <string>PaySheetModelLine_init</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_predicate_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_predicate_category_list.xml
index 8ad3381eff3c281e8f637462051a16d25df4a9d9..954037dbbf275938fcc617cde7806d1a8ece89bc 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_predicate_category_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>hidden</string>
                 <string>default</string>
+                <string>hidden</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_lines_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_price.xml
index a813688b32712c9f3bd0bc9e15931950a7afd778..6926f20c3e7e785a17dabb570cd55b022756b380 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_price.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_price.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>default</string>
+                <string>description</string>
                 <string>display_width</string>
+                <string>input_style</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -92,10 +92,18 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>The Ratio applied to the Base.</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_variation_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_variation_category_list.xml
index fba79a9dbc59a2af0a0df2b2387f8d62b24ce833..8327ae8eb9fbaba819548956aa4034b00423901b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_variation_category_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>hidden</string>
                 <string>default</string>
+                <string>hidden</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_lines_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/listbox_specialise_title_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/listbox_specialise_title_list.xml
index 723102c806ddb4de05e64974d17b4c321515dfe7..7abc374115b8ff7df407fca308acb07ca9becb0e 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/listbox_specialise_title_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/listbox_specialise_title_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>display_width</string>
                 <string>default</string>
+                <string>display_width</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml
similarity index 98%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml
index b803f690afe61180968be2db1c52961f33070a52..8b2b0424f334d713dbc32f005949236864eb0a0a 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml
@@ -113,7 +113,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>RatioSettings_view</string> </value>
+            <value> <string>PaySheetModelRatioLine_view</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_description.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_description.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_description.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_quantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_quantity.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_quantity.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_quantity.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_reference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_reference.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_reference.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_reference.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_title.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_title.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_title.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
index 27ef04bf0237fe43de985fe2c59bf41455252e7c..16f4d5de6c9c6359a78be9530a77bbf33d79b2c6 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>enabled</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -83,6 +83,10 @@
                     <key> <string>description</string> </key>
                     <value> <string>The absolute date at which payment is expected to be made.</string> </value>
                 </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_price_currency.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_price_currency.xml
index 7cb87d195921fb8a0eafd2ee388dad5a5fd7b063..2a7a4f7dbd4e93830dc041a8dad1f19d199f3418 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_price_currency.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_price_currency.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_variation_settings_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_variation_settings_category_list.xml
index 3eacdfefa4bb67a15a8d0cdbf4b44249ff4aab2b..6abdf54c264b964780e90eebb07896533d9a85c9 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_variation_settings_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_variation_settings_category_list.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_work_time_annotation_line_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_work_time_annotation_line_quantity_unit.xml
index 24bbe8fd5ffdaeb2fc3278c76c1ad383a6b583c9..6ee1755750445cce69083cbf31290fc0f0da6c05 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_work_time_annotation_line_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_work_time_annotation_line_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox.xml
index d9be36a989cf7b8947bcafceb9e9dd64c1fdc007..1bcc2aa61e468d0eb4de6f2f32eadc3a52b2bc55 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox.xml
@@ -11,11 +11,11 @@
             <value>
               <list>
                 <string>cell_portal_type</string>
+                <string>columns</string>
                 <string>editable_attributes</string>
+                <string>lines</string>
                 <string>title</string>
                 <string>update_cell_range</string>
-                <string>lines</string>
-                <string>columns</string>
               </list>
             </value>
         </item>
@@ -92,6 +92,12 @@
                     <key> <string>cell_portal_type</string> </key>
                     <value> <string>Pay Sheet Model Slice</string> </value>
                 </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>editable_attributes</string> </key>
                     <value>
@@ -115,6 +121,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_predicate_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_predicate_category_list.xml
index 8ad3381eff3c281e8f637462051a16d25df4a9d9..954037dbbf275938fcc617cde7806d1a8ece89bc 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_predicate_category_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>hidden</string>
                 <string>default</string>
+                <string>hidden</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_lines_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_max.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_max.xml
index 43544fc004fc114487f3396a1146448fa2e313fe..49ab46b96c07197d77969a0c5c2aa05242167889 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_max.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_max.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>default</string>
                 <string>display_width</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -98,6 +98,14 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
@@ -110,6 +118,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_min.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_min.xml
index 4b24544f375aba887b200a0e145679637478521d..8885ed14b47467326aae74ac6b28eea175811b66 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_min.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_min.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>default</string>
                 <string>display_width</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -98,6 +98,14 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
@@ -110,6 +118,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_variation_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_variation_category_list.xml
index fba79a9dbc59a2af0a0df2b2387f8d62b24ce833..8327ae8eb9fbaba819548956aa4034b00423901b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_variation_category_list.xml
@@ -10,9 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>hidden</string>
                 <string>default</string>
+                <string>hidden</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,12 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_lines_field</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.py
index 554b53328ca9cb13edc79c14bec30b9ecdef7e25..798d8f7a965078058c756ca0cf167eeebe6d1010 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.py
@@ -30,7 +30,6 @@ if not employer:
 if not quantity_unit:
   return redirect('The work duration unit must be defined')
 
-employer_obj = paysheet.getDestinationSectionValue()
 employee_obj = paysheet.getSourceSectionValue()
 
 if not employee_obj.getCareerGrade():
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
index 62c9a88b7a25f0e101c8ce20fde6da18b9341033..edcc5210576cdac6a596887b071a886b64fd4eae 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>portal_type_list=[], property_list=()</string> </value>
+            <value> <string>portal_type_list=(), property_list=()</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.py
index 44ddefdb76f8d586c5770fc4b80c3270482f8c33..d0522bd35686ef59f78c3e92cf6c5e680b9785f2 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.py
@@ -2,7 +2,6 @@
   this script is the conductor. All other scripts that permit to create a 
   paysheet are called here
 '''
-import pprint
 
 # Delete all objects in the paysheet
 id_list = []
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.xml
index 76d2b2ef74ace08a63eafe56181cb25ba847d3af..04a2212fba98aec2c46b0ae72e829d536b2959e1 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>listbox=[], **kw</string> </value>
+            <value> <string>listbox=(), **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.py
index c1b0c6a666a26c92c9948356061c40397423e026..9ccdd90583513ee2c224e7c50a5b19c7a20a9648 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.py
@@ -7,7 +7,6 @@
 """
 
 from Products.ERP5Type.Utils import cartesianProduct
-import pprint
 from Products.ERP5Type.Message import translateString
 
 def sortByIntIndex(a, b):
@@ -24,7 +23,7 @@ model_line_list = [x.getObject() for x in model_line_list \
 
 line_list = []
 object_dict_list = []
-id = 0
+id_ = 0
 
 for model_line in model_line_list:
   base_category_list = model_line.getVariationBaseCategoryList()
@@ -33,24 +32,19 @@ for model_line in model_line_list:
   base_application_list = ', '.join(translated_base_application_list)
   list_of_list = []
   for base_category in base_category_list:
-    list = model_line.getVariationCategoryList(base_category_list=\
-        base_category)
-    list_of_list.append(list)
+    list_of_list.append(model_line.getVariationCategoryList(base_category_list=\
+        base_category))
   cartesian_product = cartesianProduct(list_of_list)
 
-  previous_share = None
   object_dict = {}
 
   if cartesian_product == [[]]: 
     share_dict = {}
-    if 0:
-      share_dict[cell.getContributionShare()+'_price'] = 0
-      share_dict[cell.getContributionShare()+'_quantity'] = 0
     continue
 
-  for tuple in cartesian_product:
+  for tuple_ in cartesian_product:
     share_dict = {}
-    cell = model_line.getCell(*tuple)
+    cell = model_line.getCell(*tuple_)
     if cell is None:
       continue
 
@@ -71,7 +65,7 @@ for model_line in model_line_list:
     share_dict[cell.getContributionShare()+'_quantity'] = quantity
 
     tuple_dict = {}
-    for item in tuple:
+    for item in tuple_:
       # the dict key is the base category and value is the category path
       tuple_dict[item.split('/')[0]]=context.portal_categories.restrictedTraverse(item).getTitle()
       tuple_dict[item.split('/')[0]+'_relative_url']=item
@@ -92,8 +86,8 @@ for model_line in model_line_list:
       if tuple_dict.has_key('salary_range'):
         salary_range_title = tuple_dict['salary_range']
         salary_range_relative_url = tuple_dict['salary_range_relative_url']
-      new_uid = "new_%s" % id
-      id += 1
+      new_uid = "new_%s" % id_
+      id_ += 1
       object_dict[salary_range]={
                     'uid':new_uid,
                     'salary_range_title':salary_range_title,
@@ -139,14 +133,14 @@ def sortByIntIndexDescending(x, y):
 sortByDefaultSortMethod = sortByIntIndexAscending
 
 if kw.has_key('sort_on'):
-  list = kw['sort_on']
-  if list[0][0] == 'title' and list[0][1]=='ascending':
+  sort_on = kw['sort_on']
+  if sort_on[0][0] == 'title' and sort_on[0][1]=='ascending':
     line_list.sort(sortByTitleAscending)
-  elif list[0][0] == 'title' and list[0][1]=='descending':
+  elif sort_on[0][0] == 'title' and sort_on[0][1]=='descending':
     line_list.sort(sortByTitleDescending)
-  elif list[0][0] == 'int_index' and list[0][1]=='ascending':
+  elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='ascending':
     line_list.sort(sortByIntIndexAscending)
-  elif list[0][0] == 'int_index' and list[0][1]=='descending':
+  elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='descending':
     line_list.sort(sortByIntIndexDescending)
   else:
     line_list.sort(sortByDefaultSortMethod)
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.py
index 5df86c822a95a06ed73a841106183c987ce37443..47d910eb5768c8338900132e6fe0030f2f939f66 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.py
@@ -5,8 +5,8 @@
 line_list = context.PaySheetTransaction_getMovementList(sort_on=[('int_index',
                                                                   'ascending')])
 def addProperties(line, line_dict, property_list):
-  for property in property_list:
-    line_dict[property] = getattr(line, property, None)
+  for prop in property_list:
+    line_dict[prop] = getattr(line, prop, None)
   return line_dict
 
 line_dict_list = []
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.py
index 4e21b474c7b417b4698667145245ee8f2b5f9a47..e82aaca8407700adf2de5c12517e285991eaaa08 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.py
@@ -7,10 +7,9 @@
 
 
 from Products.ERP5Type.Utils import cartesianProduct
-import pprint
 from Products.ERP5Type.Message import translateString
 
-portal = context.getPortalObject();
+portal = context.getPortalObject()
 paysheet_line_list = context.contentValues(portal_type=('Pay Sheet Line', 'Pay Sheet Model Line'))
 if context.getPriceCurrencyValue() is not None:
   precision = context.getPriceCurrencyValue().getQuantityPrecision()
@@ -35,14 +34,11 @@ for paysheet_line in paysheet_line_list:
 
   list_of_list = []
   for base_category in base_category_list:
-    list = paysheet_line.getVariationCategoryList(base_category_list=\
-        base_category)
-    list_of_list.append(list)
+    list_of_list.append(
+      paysheet_line.getVariationCategoryList(base_category_list=\
+        base_category))
   cartesian_product = cartesianProduct(list_of_list)
 
-  previous_share = None
-  indice = 0
-
   if cartesian_product == [[]] or cartesian_product == []:
     params = {
                   'base':paysheet_line.getTotalPrice(),
@@ -56,7 +52,6 @@ for paysheet_line in paysheet_line_list:
 
   object_dict = {}
   for product in cartesian_product:
-    indice += 1
     share_dict = {}
     cell = paysheet_line.getCell(base_id='movement', *product)
     if cell is None:
@@ -80,14 +75,14 @@ for paysheet_line in paysheet_line_list:
 
     # we want to display as lines as a paysheet line as slices
     # this is easier to read
-    slice = cell.getSalaryRange()
-    if slice is None:
-      slice = 'no_slice'
-    if not object_dict.has_key(slice):
+    salary_range_slice = cell.getSalaryRange()
+    if salary_range_slice is None:
+      salary_range_slice = 'no_slice'
+    if not object_dict.has_key(salary_range_slice):
       slice_title = None
       if tuple_dict.has_key('salary_range'):
         slice_title=tuple_dict['salary_range']
-      object_dict[slice]={
+      object_dict[salary_range_slice]={
                     'slice':slice_title,
                     'base_name':base_name,
                     'base':base,
@@ -96,9 +91,9 @@ for paysheet_line in paysheet_line_list:
                     'service': service is not None and\
                                         service.getId() or '',
                     'causality': causality,}
-      object_dict[slice].update(share_dict)
+      object_dict[salary_range_slice].update(share_dict)
     else:
-      object_dict[slice].update(**share_dict)
+      object_dict[salary_range_slice].update(**share_dict)
 
   if not object_dict:
     # when the variation categories are set, but no cells.
@@ -120,8 +115,6 @@ for paysheet_line in paysheet_line_list:
     line_list.append(paysheet_line.asContext(**params))
     continue
 
-#  print pprint.pformat(object_dict)
-
   for object_key in paysheet_line.getSalaryRangeList():
     line_list.append(paysheet_line.asContext(**object_dict[object_key]))
   if object_dict.has_key('no_slice'):
@@ -145,14 +138,14 @@ def sortByIntIndexDescending(x, y):
 sortByDefaultSortMethod = sortByIntIndexAscending
 
 if kw.has_key('sort_on'):
-  list = kw['sort_on']
-  if list[0][0] == 'title' and list[0][1]=='ascending':
+  sort_on = kw['sort_on']
+  if sort_on[0][0] == 'title' and sort_on[0][1]=='ascending':
     line_list.sort(sortByTitleAscending)
-  elif list[0][0] == 'title' and list[0][1]=='descending':
+  elif sort_on[0][0] == 'title' and sort_on[0][1]=='descending':
     line_list.sort(sortByTitleDescending)
-  elif list[0][0] == 'int_index' and list[0][1]=='ascending':
+  elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='ascending':
     line_list.sort(sortByIntIndexAscending)
-  elif list[0][0] == 'int_index' and list[0][1]=='descending':
+  elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='descending':
     line_list.sort(sortByIntIndexDescending)
   else:
     line_list.sort(sortByDefaultSortMethod)
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py
index 91cb137ae95c50428f92929070d57f7f894503c5..18daacc37b16455460a6cb360d826676ccf66954 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py
@@ -1,5 +1,4 @@
 translateString = context.Base_translateString
-specialise_value = context.getSpecialiseValue()
 
 
 def getFieldAsString(field):
@@ -12,14 +11,6 @@ def getFieldAsLineList(field):
   text_list = text.split('\n')
   return [x for x in text_list if x]
 
-def getProductAndLineDesc(prod_desc, line_desc):
-  line_list = []
-  if line_desc:
-    line_list.extend(getFieldAsLineList(line_desc))
-  elif prod_desc:
-    line_list.extend(getFieldAsLineList(prod_desc))
-  return line_list
-
 def getOneLineAddress(text, region):
   text_list = [getFieldAsString(text)]
   if region:
@@ -117,7 +108,6 @@ def getSocialOrganisationValue():
 
 line_list = []
 total_price = 0.0
-total_vat = 0.0
 
 def unicodeDict(d):
   for k, v in d.items():
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.obj b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.bin
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.obj
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.bin
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml
similarity index 89%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml
index 20b3c9bd12cfe2ac8ea5ab4848827dba12a9e18d..f36e4aea34d4f8a0c6acd6ee020aa72c9570163d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>__name__</string> </key>
-            <value> <string>PaySheet_getODTStyleSheet</string> </value>
+            <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py
index edbc9c8b0bf440d61af7fef9b69eb16a701a22dd..99406bbbe0258ea8211f550e327a0cac259f6dd5 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py
@@ -8,7 +8,7 @@
 # are not in stock table due to the lack of source/destination definition
 
 if paysheet is None:
-    paysheet = context
+  paysheet = context
 
 # test the list parameters
 if base_contribution_list is None:
@@ -17,7 +17,7 @@ elif not (same_type(base_contribution_list, []) or
           same_type(base_contribution_list, ())):
   base_contribution_list = [base_contribution_list]
 
-portal = context.getPortalObject();
+portal = context.getPortalObject()
 portal_simulation = portal.portal_simulation
 
 base_amount = portal.portal_categories.base_amount
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.py
similarity index 80%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.py
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.py
index 0b92f8819be4ce2be9ebc9ecc6f79ece94b79c35..00dfd9f1d166beb01d1e39c57b3d3d0e2c9925b1 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.py
@@ -1,3 +1,4 @@
+# pylint:disable=redefined-builtin
 if target_language:
   container.REQUEST['AcceptLanguage'].set(target_language, 10)
 
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml
similarity index 96%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml
index 00c0386c61befd405de4489852c75f1cb9005458..6d5d3faedab493649927c274448447b18425a2fa 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PaySheet_printAsODT</string> </value>
+            <value> <string>PaySheetTransaction_printAsODT</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml
index b8b3b0e402c2d250337858e5a52cdb2791b31c5f..e5e1d5053a9d6c1cca24c8b12130024d2e6d28a0 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml
@@ -10,12 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
+                <string>display_width</string>
                 <string>editable</string>
                 <string>input_style</string>
-                <string>display_width</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -92,6 +92,10 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -108,6 +112,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
index 27ef04bf0237fe43de985fe2c59bf41455252e7c..16f4d5de6c9c6359a78be9530a77bbf33d79b2c6 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>enabled</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -83,6 +83,10 @@
                     <key> <string>description</string> </key>
                     <value> <string>The absolute date at which payment is expected to be made.</string> </value>
                 </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_price_currency.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_price_currency.xml
index 49056a4b16b2204643add2bc8f6d5d154c9bd1b0..bfc408f3f95eb1e99362dedfe304d74b3ebb37e4 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_price_currency.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_price_currency.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_work_time_annotation_line_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_work_time_annotation_line_quantity_unit.xml
index 24bbe8fd5ffdaeb2fc3278c76c1ad383a6b583c9..6ee1755750445cce69083cbf31290fc0f0da6c05 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_work_time_annotation_line_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_work_time_annotation_line_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml
index 8dd41ecd289deb8063ec3acfcc6ed218a7d8fa44..84a9319274fd4f5f2f5697bf47add6f3f1b8d2b3 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml
@@ -10,15 +10,15 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>stat_columns</string>
-                <string>editable_columns</string>
-                <string>stat_method</string>
-                <string>title</string>
-                <string>selection_name</string>
+                <string>anchor</string>
                 <string>columns</string>
+                <string>editable_columns</string>
                 <string>list_method</string>
-                <string>anchor</string>
                 <string>portal_types</string>
+                <string>selection_name</string>
+                <string>stat_columns</string>
+                <string>stat_method</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -155,6 +155,12 @@
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>portal_types</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>selection_name</string> </key>
                     <value> <string>pay_sheet_transaction_line_list_selection</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination.xml
index 8e11836a25d37dec8fe7b4ccea80f7a53ba061ea..1446aa0fde9ddce937adda75b89ea722debf3589 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_credit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_credit.xml
index 927dfe9eb34fea9723fb466c68d73328befad0ce..422277aeeb02b0d4dabd6cf4ce6dee1c586429ec 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_credit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_credit.xml
@@ -10,11 +10,11 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>display_width</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,10 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
@@ -103,6 +107,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_debit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_debit.xml
index 56c3b4214fa4fec3bc85cf0aebf6106de7e5c9d9..bf2d7adb08937cdbaaa17322a537f73537ff30f5 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_debit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_debit.xml
@@ -10,11 +10,11 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>css_class</string>
-                <string>input_style</string>
                 <string>display_width</string>
+                <string>input_style</string>
                 <string>precision</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,10 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_float_field</string> </value>
@@ -103,6 +107,10 @@
                     <key> <string>input_style</string> </key>
                     <value> <string>-1 234.5</string> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_destination_section.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_destination_section.xml
index 451e7c3bfd2c4b22ed691feffb8d0a5fae73383f..79af6884cedafdbe18d7bf3a775611556bff6d44 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_destination_section.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_destination_section.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_resource.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_resource.xml
index f2b408c7effdcc6154da2fd4a9ce40d8ec8ea2a0..42b9df2f1a8276b93c73d5292459e18c0f00e43f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_resource.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_resource.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox_quantity_unit.xml
index 91c3b77be6d23247cbaa8da4e18ada1b2d36a107..4ed071f1ed855887adb4918a5e21dc47520a1ba3 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox_quantity_unit.xml
@@ -11,9 +11,9 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>editable</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -96,6 +96,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_overtime_annotation_line_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_overtime_annotation_line_quantity_unit.xml
index ea4cddaed16b3ec91cc3625545c3b68ebc0d8546..c23393fc85c846bc776a06d245b55d3e793db100 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_overtime_annotation_line_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_overtime_annotation_line_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_work_time_annotation_line_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_work_time_annotation_line_quantity_unit.xml
index 24bbe8fd5ffdaeb2fc3278c76c1ad383a6b583c9..6ee1755750445cce69083cbf31290fc0f0da6c05 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_work_time_annotation_line_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_work_time_annotation_line_quantity_unit.xml
@@ -11,8 +11,8 @@
             <value>
               <list>
                 <string>description</string>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -91,6 +91,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
index 3087d466e794fffeccb890f174565890bb89a7ec..a322e4116da120b79b638352c83e3262a0481cc4 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
@@ -62,7 +62,7 @@ AAA=</string> </value>
         </item>
         <item>
             <key> <string>ooo_stylesheet</string> </key>
-            <value> <string>PaySheet_getODTStyleSheet</string> </value>
+            <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
         </item>
         <item>
             <key> <string>ooo_xml_file_id</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_price_currency.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_price_currency.xml
index d3ca6839e6b4fdadc191cc125a9b63446a736e01..f1d1a2fd908bdd71a02618748bf969cd3d78370e 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_price_currency.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_price_currency.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml
similarity index 96%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml
index ec9e692c899cd2ed227f4da12ca1b1680a2f16dd..995fb4df2b321fdea5c1e57f4b8fa5f6dce5c72f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml
@@ -35,7 +35,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>PaySheet_printAsODT</string> </value>
+            <value> <string>PaySheetTransaction_printAsODT</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -90,7 +90,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PaySheet_viewODTPrintDialog</string> </value>
+            <value> <string>PaySheetTransaction_viewODTPrintDialog</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml
similarity index 93%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml
index d3e6b034415716e1dc678dbd38df0f067d003cc0..e033d0be44bad4edf57c228486ef3456108f7c8a 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml
@@ -10,10 +10,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>description</string>
-                <string>title</string>
                 <string>default</string>
+                <string>description</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -86,6 +86,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>description</string> </key>
                     <value> <string>Printing format</string> </value>
@@ -98,6 +102,12 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewPayrollFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_international_form.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_international_form.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_international_form.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_international_form.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_target_language.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_target_language.xml
similarity index 100%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_target_language.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_target_language.xml
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view.xml
index f1fb2d4635293153c814a7794aa8af490ebb7fde..b39766f002b0006fef450dea530e924cc0308cce 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view.xml
@@ -82,7 +82,7 @@
                     <key> <string>right</string> </key>
                     <value>
                       <list>
-                        <string>my_validation_state_title</string>
+                        <string>my_translated_validation_state_title</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_validation_state_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_translated_validation_state_title.xml
similarity index 96%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_validation_state_title.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_translated_validation_state_title.xml
index a87f2106f3dbca48da0b922df96f79be2c1bb774..2095c7e19b216ca398b93da0c0ed3a9849e11ec6 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_validation_state_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_translated_validation_state_title.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_validation_state_title</string> </value>
+            <value> <string>my_translated_validation_state_title</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view.xml
index 4410d5d322046ffd02d3b2dd7444f570614d14a5..baa7728e11ba876e2c1ff5cdc0f3e448b9580827 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view.xml
@@ -82,7 +82,7 @@
                     <key> <string>right</string> </key>
                     <value>
                       <list>
-                        <string>my_validation_state_title</string>
+                        <string>my_translated_validation_state_title</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_validation_state_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_translated_validation_state_title.xml
similarity index 96%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_validation_state_title.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_translated_validation_state_title.xml
index a87f2106f3dbca48da0b922df96f79be2c1bb774..2095c7e19b216ca398b93da0c0ed3a9849e11ec6 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_validation_state_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_translated_validation_state_title.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_validation_state_title</string> </value>
+            <value> <string>my_translated_validation_state_title</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
index aa32c28aad2154670ae8861b000dc88b6ca53dfb..91657d5a0315e6bdb312e11a14edb1f64fe72736 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
@@ -4,10 +4,10 @@
 portal = context.getObject()
 organisation_module = portal.getDefaultModuleValue("Organisation")
 
-def getObjectOrRaise(module, id):
-  obj = getattr(module, id, None)
+def getObjectOrRaise(module, object_id):
+  obj = getattr(module, object_id, None)
   if obj is None:
-    raise AttributeError("%s doesn't have sub-object with id %s" % (module, id))
+    raise AttributeError("%s doesn't have sub-object with id %s" % (module, object_id))
   else:
     return obj
 
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary.xml
deleted file mode 100644
index d4568d0eca4b7d294a2899da2dac49f597832ea6..0000000000000000000000000000000000000000
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ERP5 Form" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value> <string>Base_edit</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>enctype</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <list>
-                <string>left</string>
-                <string>right</string>
-                <string>center</string>
-                <string>bottom</string>
-                <string>hidden</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>groups</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>bottom</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>center</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>left</string> </key>
-                    <value>
-                      <list>
-                        <string>my_reference</string>
-                      </list>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>right</string> </key>
-                    <value>
-                      <list>
-                        <string>my_quantity</string>
-                      </list>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>RatioSettings_viewFieldLibrary</string> </value>
-        </item>
-        <item>
-            <key> <string>method</string> </key>
-            <value> <string>POST</string> </value>
-        </item>
-        <item>
-            <key> <string>name</string> </key>
-            <value> <string>PaySheetTransaction_viewAnnotationLine</string> </value>
-        </item>
-        <item>
-            <key> <string>pt</string> </key>
-            <value> <string>form_view</string> </value>
-        </item>
-        <item>
-            <key> <string>row_length</string> </key>
-            <value> <int>4</int> </value>
-        </item>
-        <item>
-            <key> <string>stored_encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Ratio Settings</string> </value>
-        </item>
-        <item>
-            <key> <string>unicode_mode</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>update_action</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_quantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_quantity.xml
deleted file mode 100644
index 4c0119ba63837dd3a2e7da5802d04dd7f9256e42..0000000000000000000000000000000000000000
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_quantity.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list>
-                <string>title</string>
-                <string>description</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>my_quantity</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string>The Value for this ratio setting.</string> </value>
-                </item>
-                <item>
-                    <key> <string>editable_permission</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>editable_role</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>my_quantity</string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>not_viewable</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>read_only</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string>Click to edit the target</string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Ratio Setting Value</string> </value>
-                </item>
-                <item>
-                    <key> <string>viewable_permission</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>viewable_role</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_reference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_reference.xml
deleted file mode 100644
index 10eef4b461d1c605913940751ed67b6b175cc6a7..0000000000000000000000000000000000000000
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_reference.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list>
-                <string>title</string>
-                <string>description</string>
-                <string>required</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>my_reference</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string>The Reference for this Ratio. A ratio can be overriden by another one from another model, if the use the same reference.</string> </value>
-                </item>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>my_string_field</string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string>Click to edit the target</string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Reference</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
index b027689c5cb2c7a4ceacebe0702f4c6c631de0f5..7f12e44354bbae3050676f56fa20ff486805dc74 100644
--- a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
+++ b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
@@ -28,7 +28,6 @@
 ##############################################################################
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5ReportTestCase
 from erp5.component.test.testTradeModelLine import TestTradeModelLineMixin
-from AccessControl.SecurityManagement import newSecurityManager
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5Type.tests.utils import reindex
 from DateTime import DateTime
@@ -148,13 +147,6 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
 
     self.portal.business_process_module.manage_delObjects(list([x for x in self.portal.business_process_module.objectIds() if x != "erp5_default_business_process"]))
 
-  def login(self):
-    uf = self.getPortal().acl_users
-    uf._doAddUser('admin', '', ['Manager', 'Assignee', 'Assignor',
-                               'Associate', 'Auditor', 'Author'], [])
-    user = uf.getUserById('admin').__of__(uf)
-    newSecurityManager(None, user)
-
   @reindex
   def createCategories(self):
     """Create the categories for our test. """
@@ -328,10 +320,12 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
     )
     sequence.edit(model = model)
 
-  def addSlice(self, model, slice, min_value, max_value, base_id='cell'):
+  def addSlice(self, model, paysheet_model_slice, min_value, max_value, base_id='cell'):
     '''add a new slice in the model'''
-    slice_value = model.newCell(slice, portal_type='Pay Sheet Model Slice',
-        base_id=base_id)
+    slice_value = model.newCell(
+      paysheet_model_slice,
+      portal_type='Pay Sheet Model Slice',
+      base_id=base_id)
     slice_value.setQuantityRangeMax(max_value)
     slice_value.setQuantityRangeMin(min_value)
     return slice_value
@@ -588,7 +582,7 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
       expected_movement_to_delete_count, expected_movement_to_add_count):
     movement_dict = paysheet.updateAggregatedAmountList()
     movement_to_delete = movement_dict['movement_to_delete_list']
-    movement_to_add = movement_dict['movement_to_add_list']
+    # movement_to_add = movement_dict['movement_to_add_list']
     self.assertEqual(len(movement_to_delete),
         expected_movement_to_delete_count)
     #    self.assertEqual(len(movement_to_add), expected_movement_to_add_count)
@@ -1540,7 +1534,7 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
     portal_type_list = ['Pay Sheet Model Line',]
 
     # if no reference, we don't care about dates
-    sub_object_list = paysheet.getInheritedObjectValueList(portal_type_list)
+    paysheet.getInheritedObjectValueList(portal_type_list)
 
     self.assertEqual(len(paysheet.contentValues(\
         portal_type='Pay Sheet Line')), 0)
@@ -1607,8 +1601,6 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
     paysheet_with_date.PaySheetTransaction_applyModel()
     self.tic()
 
-    portal_type_list = ['Pay Sheet Model Line',]
-
     # check the paysheet contains no lines before calculation
     self.assertEqual(len(paysheet_with_date.contentValues(\
         portal_type='Pay Sheet Line')), 0)
@@ -1954,9 +1946,8 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
     form = getattr(here, report_section.getFormId())
     self.portal.REQUEST['here'] = here
     if form.has_field('listbox'):
-      result = form.listbox.get_value('default',
-                                      render_format='list',
-                                      REQUEST=self.portal.REQUEST)
+      form.listbox.get_value(
+        'default', render_format='list', REQUEST=self.portal.REQUEST)
       self.assertEqual(precision, self.portal.REQUEST.get('precision'))
     report_section.popReport(self.portal)
 
diff --git a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.xml b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.xml
index 51c737833220685f73aa2bc831d808cf14198885..70c78834f6850f1add2d40218406361348be9a4a 100644
--- a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.xml
+++ b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.xml
@@ -43,14 +43,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W:151,  2: Arguments number differs from overridden \'login\' method (arguments-differ)</string>
-                <string>W:331, 28: Redefining built-in \'slice\' (redefined-builtin)</string>
-                <string>W:591,  4: Unused variable \'movement_to_add\' (unused-variable)</string>
-                <string>W:1543,  4: Unused variable \'sub_object_list\' (unused-variable)</string>
-                <string>W:1610,  4: Unused variable \'portal_type_list\' (unused-variable)</string>
-                <string>W:1957,  6: Unused variable \'result\' (unused-variable)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_payroll/bt/skip_coding_style_test b/bt5/erp5_payroll/bt/skip_coding_style_test
deleted file mode 100644
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000
--- a/bt5/erp5_payroll/bt/skip_coding_style_test
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file