From ec3f16b3d1f6a91893f6f74c39dbca34984c0852 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Mon, 23 Oct 2006 16:22:53 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10888 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../salary_range/france/fixed/gross.xml | 130 ++++++++++++++++++ .../salary_range/france/fixed/gross/base.xml | 126 +++++++++++++++++ .../france/variable/salaire_brut.xml | 2 +- .../france/variable/salaire_brut_crds.xml | 2 +- .../france/variable/salaire_brut_csg.xml | 2 +- .../france/variable/salaire_plafonne.xml | 2 +- .../variable/salaire_plafonne_syntec.xml | 2 +- .../france/variable/tranche_b.xml | 8 ++ .../portal_categories/tax_category/gross.xml | 124 +++++++++++++++++ .../tax_category/gross/employee_share.xml | 114 +++++++++++++++ .../tax_category/gross/employer_share.xml | 114 +++++++++++++++ 11 files changed, 621 insertions(+), 5 deletions(-) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross/base.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employee_share.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employer_share.xml diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross.xml new file mode 100644 index 0000000000..a3a2631ea0 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross.xml @@ -0,0 +1,130 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>salary_range/france/fixed/gross</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>gross</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Salaire Brut</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross/base.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross/base.xml new file mode 100644 index 0000000000..f8e4b4897d --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/fixed/gross/base.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>salary_range/france/fixed/gross/base</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>base</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Salaire de Base</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut.xml index 3400a8cbd9..08fed776eb 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut.xml @@ -64,7 +64,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Salaire brut</string> </value> + <value> <string>Salaire Brut</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_crds.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_crds.xml index a57cbf2777..ded45c168c 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_crds.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_crds.xml @@ -72,7 +72,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Salaire brut CRDS</string> </value> + <value> <string>Salaire Brut CRDS</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_csg.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_csg.xml index c66ffb6f99..4458fb9e43 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_csg.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_brut_csg.xml @@ -64,7 +64,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Salaire brut CSG</string> </value> + <value> <string>Salaire Brut CSG</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne.xml index c44ad91d8e..45c55736bc 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne.xml @@ -64,7 +64,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Salaire plafonn\xc3\xa9</string> </value> + <value> <string>Salaire Plafonn\xc3\xa9</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne_syntec.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne_syntec.xml index 1049842a0f..1ce66846ac 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne_syntec.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/salaire_plafonne_syntec.xml @@ -72,7 +72,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Salaire plafonn\xc3\xa9 SYNTEC</string> </value> + <value> <string>Salaire Plafonn\xc3\xa9 SYNTEC</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/tranche_b.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/tranche_b.xml index b81e8f437a..5172c4ea48 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/tranche_b.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france/variable/tranche_b.xml @@ -42,6 +42,14 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>salary_range/france/variable/tranche_b</string> + </tuple> + </value> + </item> <item> <key> <string>codification</string> </key> <value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross.xml new file mode 100644 index 0000000000..e092573b2a --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross.xml @@ -0,0 +1,124 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>tax_category/gross</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>gross</string> </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Salaire Brut</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employee_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employee_share.xml new file mode 100644 index 0000000000..4523e3fe75 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employee_share.xml @@ -0,0 +1,114 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>tax_category/gross/employee_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>employee_share</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employee Share</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employer_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employer_share.xml new file mode 100644 index 0000000000..95653c260e --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/gross/employer_share.xml @@ -0,0 +1,114 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>tax_category/gross/employer_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>employer_share</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employer Share</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> -- 2.30.9