Commit 2a172b22 authored by Kevin Deldycke's avatar Kevin Deldycke

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
parent 00908491
...@@ -87,8 +87,9 @@ ...@@ -87,8 +87,9 @@
<value> <value>
<tuple> <tuple>
<string>salary_range/france/fixed/addendum</string> <string>salary_range/france/fixed/addendum</string>
<string>quantity_unit/time/month</string>
<string>tax_category/addendum/employee_share</string> <string>tax_category/addendum/employee_share</string>
<string>quantity_unit/time/month</string>
<string>product_line/salary</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -86,9 +86,10 @@ ...@@ -86,9 +86,10 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>quantity_unit/time/month</string>
<string>salary_range/france/fixed/addendum</string> <string>salary_range/france/fixed/addendum</string>
<string>tax_category/addendum/employee_share</string> <string>tax_category/addendum/employee_share</string>
<string>quantity_unit/time/month</string>
<string>product_line/salary</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -86,9 +86,10 @@ ...@@ -86,9 +86,10 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>quantity_unit/time/month</string>
<string>salary_range/france/fixed/addendum</string> <string>salary_range/france/fixed/addendum</string>
<string>tax_category/addendum/employee_share</string> <string>tax_category/addendum/employee_share</string>
<string>quantity_unit/time/month</string>
<string>product_line/salary</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -75,14 +75,15 @@ ...@@ -75,14 +75,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> </tuple>
</value> </value>
</item> </item>
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
<item> <item>
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<none/> <tuple/>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -74,13 +74,15 @@ ...@@ -74,13 +74,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
</tuple> </tuple>
</value> </value>
...@@ -102,7 +104,7 @@ ...@@ -102,7 +104,7 @@
<item> <item>
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<none/> <tuple/>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -105,14 +105,15 @@ ...@@ -105,14 +105,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/tax</string>
</tuple> </tuple>
</value> </value>
......
...@@ -105,14 +105,15 @@ ...@@ -105,14 +105,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/social_service/retirement_plan</string>
</tuple> </tuple>
</value> </value>
......
...@@ -99,14 +99,15 @@ ...@@ -99,14 +99,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/social_service/unemployment_insurance</string>
</tuple> </tuple>
</value> </value>
......
...@@ -105,14 +105,15 @@ ...@@ -105,14 +105,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/social_service/mutual_insurance</string>
</tuple> </tuple>
</value> </value>
......
...@@ -105,14 +105,15 @@ ...@@ -105,14 +105,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/social_service/state_insurance</string>
</tuple> </tuple>
</value> </value>
......
...@@ -105,14 +105,15 @@ ...@@ -105,14 +105,15 @@
<value> <value>
<tuple> <tuple>
<string>tax_category/ags/employer_share</string> <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/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/social/employer_share</string>
<string>tax_category/argic/employer_share</string>
<string>tax_category/supplementary_pension/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> <string>product_line/salary</string>
</tuple> </tuple>
</value> </value>
......
...@@ -85,13 +85,15 @@ ...@@ -85,13 +85,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/tax</string> <string>product_line/tax</string>
</tuple> </tuple>
......
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/social_service/retirement_plan</string> <string>product_line/social_service/retirement_plan</string>
</tuple> </tuple>
......
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/social_service/unemployment_insurance</string> <string>product_line/social_service/unemployment_insurance</string>
</tuple> </tuple>
......
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/social_service/mutual_insurance</string> <string>product_line/social_service/mutual_insurance</string>
</tuple> </tuple>
......
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/social_service/state_insurance</string> <string>product_line/social_service/state_insurance</string>
</tuple> </tuple>
......
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
<key> <string>membership_criterion_category</string> </key> <key> <string>membership_criterion_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/addendum/employee_share</string>
<string>tax_category/apec/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/crds/employee_share</string>
<string>tax_category/csg/employee_share</string> <string>tax_category/csg/employee_share</string>
<string>tax_category/argic/employee_share</string> <string>tax_category/gross/employee_share</string>
<string>tax_category/syntec_insurance/employee_share</string>
<string>tax_category/social/employee_share</string> <string>tax_category/social/employee_share</string>
<string>tax_category/supplementary_pension/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>tax_category/unemployment/employee_share</string>
<string>product_line/salary</string> <string>product_line/salary</string>
</tuple> </tuple>
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</item> </item>
<item> <item>
<key> <string>name</string> </key> <key> <string>name</string> </key>
<value> <string>sale_invoice_list</string> </value> <value> <string>PaySheetTransaction_viewAccountingLineList</string> </value>
</item> </item>
<item> <item>
<key> <string>pt</string> </key> <key> <string>pt</string> </key>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Sale Invoice Transaction</string> </value> <value> <string>Pay Sheet Transaction</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode_mode</string> </key> <key> <string>unicode_mode</string> </key>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* Support dynamic update of gross salary calculation on pay sheet preview. * Support dynamic update of gross salary calculation on pay sheet preview.
* Support addendum on paysheets. * Support addendum on paysheets.
* Update Pay Sheet PDF rendering to show addendum. * 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 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. * 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.
......
73 76
\ No newline at end of file \ No newline at end of file
0.1.16 0.1.17
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment