Separate fixed contribution and variable ones using intermediate category.

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

Separate fixed contribution and variable ones using intermediate category.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10867 20353a03-c40f-0410-a6d1-a30d3c3de9de
31f6761e · Kevin Deldycke · b00d3458 · 31f6761e · 31f6761e · 31f6761e
Commit 31f6761e authored 18 years ago by Kevin Deldycke
20 changed files
--- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml
+++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml
@@ -379,7 +379,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>fallback_base_category</string> </key>
@@ -393,7 +395,9 @@
        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>uid</string> </key>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml
@@ -86,10 +86,10 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/forfait</string>
+                <string>salary_range/france/fixed/base</string>
                <string>product_line/salary</string>
                <string>quantity_unit/time/month</string>
-                <string>tax_category/absences/employer_share</string>
+                <string>tax_category/salaire_base/employer_share</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff.xml
@@ -86,14 +86,14 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_1</string>
+                <string>salary_range/france/variable/tranche_1</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/483</string>
-                <string>salary_range/france/tranche_2</string>
-                <string>salary_range/france/tranche_a</string>
-                <string>salary_range/france/tranche_b</string>
+                <string>salary_range/france/variable/tranche_2</string>
+                <string>salary_range/france/variable/tranche_a</string>
+                <string>salary_range/france/variable/tranche_b</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff_tranche_a.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff_tranche_a.xml
@@ -86,12 +86,12 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_1</string>
+                <string>salary_range/france/variable/tranche_1</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/arrco</string>
-                <string>salary_range/france/tranche_a</string>
+                <string>salary_range/france/variable/tranche_a</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff_tranche_b.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agff_tranche_b.xml
@@ -86,12 +86,12 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_b</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/483</string>
-                <string>salary_range/france/tranche_2</string>
+                <string>salary_range/france/variable/tranche_2</string>
+                <string>salary_range/france/variable/tranche_b</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agirc.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/agirc.xml
@@ -86,12 +86,12 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_b</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>source/organisation_module/agirc</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
-                <string>salary_range/france/tranche_c</string>
+                <string>salary_range/france/variable/tranche_b</string>
+                <string>salary_range/france/variable/tranche_c</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/ags.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/ags.xml
@@ -87,11 +87,11 @@
            <value>
              <tuple>
                <string>tax_category/ags/employer_share</string>
-                <string>salary_range/france/tranche_a</string>
-                <string>salary_range/france/tranche_b</string>
                <string>source/organisation_module/assedic</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/unemployment_insurance</string>
+                <string>salary_range/france/variable/tranche_a</string>
+                <string>salary_range/france/variable/tranche_b</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/apec.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/apec.xml
@@ -86,12 +86,12 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_b</string>
                <string>tax_category/apec/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/483</string>
-                <string>salary_range/france/forfait</string>
+                <string>salary_range/france/fixed/forfait</string>
+                <string>salary_range/france/variable/tranche_b</string>
                <string>tax_category/apec/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml
@@ -80,12 +80,12 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_b</string>
                <string>tax_category/argic/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/483</string>
-                <string>salary_range/france/tranche_c</string>
+                <string>salary_range/france/variable/tranche_b</string>
+                <string>salary_range/france/variable/tranche_c</string>
                <string>tax_category/argic/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/arrco.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/arrco.xml
@@ -86,13 +86,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_a</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>source/organisation_module/arrco</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
-                <string>salary_range/france/tranche_1</string>
-                <string>salary_range/france/tranche_2</string>
+                <string>salary_range/france/variable/tranche_1</string>
+                <string>salary_range/france/variable/tranche_2</string>
+                <string>salary_range/france/variable/tranche_a</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/cavcic.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/cavcic.xml
@@ -80,11 +80,11 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/forfait</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>source/organisation_module/483</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>quantity_unit/time/month</string>
+                <string>salary_range/france/fixed/forfait</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/cet.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/cet.xml
@@ -86,14 +86,14 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/tranche_a</string>
                <string>tax_category/supplementary_pension/employee_share</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/retirement_plan</string>
                <string>source/organisation_module/483</string>
-                <string>salary_range/france/salaire_brut</string>
-                <string>salary_range/france/tranche_b</string>
-                <string>salary_range/france/tranche_c</string>
+                <string>salary_range/france/variable/salaire_brut</string>
+                <string>salary_range/france/variable/tranche_a</string>
+                <string>salary_range/france/variable/tranche_b</string>
+                <string>salary_range/france/variable/tranche_c</string>
                <string>tax_category/supplementary_pension/employer_share</string>
              </tuple>
            </value>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/construction.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/construction.xml
@@ -87,10 +87,10 @@
            <value>
              <tuple>
                <string>tax_category/taxes/employer_share</string>
-                <string>salary_range/france/salaire_brut</string>
                <string>source/organisation_module/etat</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/tax</string>
+                <string>salary_range/france/variable/salaire_brut</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/courses_tax.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/courses_tax.xml
@@ -87,10 +87,10 @@
            <value>
              <tuple>
                <string>tax_category/taxes/employer_share</string>
-                <string>salary_range/france/salaire_brut</string>
                <string>source/organisation_module/etat</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/tax</string>
+                <string>salary_range/france/variable/salaire_brut</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/crds.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/crds.xml
@@ -86,7 +86,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/salaire_brut_crds</string>
+                <string>salary_range/france/variable/salaire_brut_crds</string>
                <string>source/organisation_module/urssaf</string>
                <string>tax_category/crds/employee_share</string>
                <string>quantity_unit/time/month</string>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/csg_deductible.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/csg_deductible.xml
@@ -86,11 +86,11 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/salaire_brut_csg</string>
-                <string>source/organisation_module/urssaf</string>
                <string>tax_category/csg/employee_share</string>
+                <string>source/organisation_module/urssaf</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/state_insurance</string>
+                <string>salary_range/france/variable/salaire_brut_csg</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/csg_non_deductible.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/csg_non_deductible.xml
@@ -86,11 +86,11 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/salaire_brut_csg</string>
-                <string>source/organisation_module/urssaf</string>
                <string>tax_category/csg/employee_share</string>
+                <string>source/organisation_module/urssaf</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/state_insurance</string>
+                <string>salary_range/france/variable/salaire_brut_csg</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/family_benefits.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/family_benefits.xml
@@ -87,10 +87,10 @@
            <value>
              <tuple>
                <string>tax_category/social/employer_share</string>
-                <string>salary_range/france/salaire_brut</string>
                <string>source/organisation_module/urssaf</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/state_insurance</string>
+                <string>salary_range/france/variable/salaire_brut</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml
@@ -86,10 +86,10 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>salary_range/france/forfait</string>
+                <string>salary_range/france/fixed/base</string>
                <string>product_line/salary</string>
                <string>quantity_unit/time/month</string>
-                <string>tax_category/iccp/employer_share</string>
+                <string>tax_category/salaire_base/employer_share</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/industrial_accident.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/industrial_accident.xml
@@ -87,10 +87,10 @@
            <value>
              <tuple>
                <string>tax_category/social/employer_share</string>
-                <string>salary_range/france/salaire_brut</string>
                <string>source/organisation_module/urssaf</string>
                <string>quantity_unit/time/month</string>
                <string>product_line/social_service/state_insurance</string>
+                <string>salary_range/france/variable/salaire_brut</string>
              </tuple>
            </value>
        </item>