Update automatic accounting of Pay Sheets to support multi gross salary lines and addendum.

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

bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml

@@ -87,8 +87,9 @@
             <value>
               <tuple>
                 <string>salary_range/france/fixed/addendum</string>
-                <string>quantity_unit/time/month</string>
                 <string>tax_category/addendum/employee_share</string>
+                <string>quantity_unit/time/month</string>
+                <string>product_line/salary</string>
               </tuple>
             </value>
         </item>

bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml

@@ -86,9 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>quantity_unit/time/month</string>
                 <string>salary_range/france/fixed/addendum</string>
                 <string>tax_category/addendum/employee_share</string>
+                <string>quantity_unit/time/month</string>
+                <string>product_line/salary</string>
               </tuple>
             </value>
         </item>

bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml

@@ -86,9 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>quantity_unit/time/month</string>
                 <string>salary_range/france/fixed/addendum</string>
                 <string>tax_category/addendum/employee_share</string>
+                <string>quantity_unit/time/month</string>
+                <string>product_line/salary</string>
               </tuple>
             </value>
         </item>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/2.xml

@@ -75,14 +75,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
               </tuple>
             </value>
         </item>
@@ -103,7 +104,7 @@
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/3.xml

@@ -74,13 +74,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
               </tuple>
             </value>
@@ -102,7 +104,7 @@
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_0.xml

@@ -105,14 +105,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/tax</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_1.xml

@@ -105,14 +105,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/social_service/retirement_plan</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_2.xml

@@ -99,14 +99,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/social_service/unemployment_insurance</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_3.xml

@@ -105,14 +105,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/social_service/mutual_insurance</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml

@@ -105,14 +105,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/social_service/state_insurance</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml

@@ -105,14 +105,15 @@
             <value>
               <tuple>
                 <string>tax_category/ags/employer_share</string>
+                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/argic/employer_share</string>
+                <string>tax_category/gross/employer_share</string>
                 <string>tax_category/life_insurance/employer_share</string>
-                <string>tax_category/unemployment/employer_share</string>
-                <string>tax_category/syntec_insurance/employer_share</string>
-                <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/social/employer_share</string>
-                <string>tax_category/argic/employer_share</string>
                 <string>tax_category/supplementary_pension/employer_share</string>
-                <string>tax_category/apec/employer_share</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+                <string>tax_category/taxes/employer_share</string>
+                <string>tax_category/unemployment/employer_share</string>
                 <string>product_line/salary</string>
               </tuple>
             </value>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_0.xml

@@ -85,13 +85,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/tax</string>
               </tuple>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1.xml

@@ -104,13 +104,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/social_service/retirement_plan</string>
               </tuple>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2.xml

@@ -104,13 +104,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/social_service/unemployment_insurance</string>
               </tuple>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3.xml

@@ -104,13 +104,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/social_service/mutual_insurance</string>
               </tuple>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml

@@ -104,13 +104,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/social_service/state_insurance</string>
               </tuple>

bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml

@@ -104,13 +104,15 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
+                <string>tax_category/addendum/employee_share</string>
                 <string>tax_category/apec/employee_share</string>
+                <string>tax_category/argic/employee_share</string>
                 <string>tax_category/crds/employee_share</string>
                 <string>tax_category/csg/employee_share</string>
-                <string>tax_category/argic/employee_share</string>
-                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>tax_category/gross/employee_share</string>
                 <string>tax_category/social/employee_share</string>
                 <string>tax_category/supplementary_pension/employee_share</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>product_line/salary</string>
               </tuple>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList.xml

@@ -129,7 +129,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>sale_invoice_list</string> </value>
+            <value> <string>PaySheetTransaction_viewAccountingLineList</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -145,7 +145,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Sale Invoice Transaction</string> </value>
+            <value> <string>Pay Sheet Transaction</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

bt5/erp5_payroll/bt/change_log

@@ -2,6 +2,7 @@
 * Support dynamic update of gross salary calculation on pay sheet preview.
 * Support addendum on paysheets.
 * Update Pay Sheet PDF rendering to show addendum.
+* Update automatic accounting of Pay Sheets to support multi gross salary lines and addendum.
 
 2006-10-23 Kevin
 * Change category structure to support additional lines beside base salary to constitute the gross salary. Now the gross salary can be composed of several lines, variable or fixed.

bt5/erp5_payroll/bt/revision

-73
+76
\ No newline at end of file

bt5/erp5_payroll/bt/version

-0.1.16
+0.1.17
\ No newline at end of file