[Erp5-report] r10890 - /erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Oct 23 18:28:52 2006
New Revision: 10890

URL: http://svn.erp5.org?rev=10890&view=rev
Log:
Adapt payroll services list to the new categories.

Modified:
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/fngs.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/labour.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/unemployment_insurance.xml

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml Mon Oct 23 18:28:52 2006
@@ -86,10 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employer_share</string>
+                <string>salary_range/france/fixed/gross</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/fngs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/fngs.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/fngs.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/fngs.xml Mon Oct 23 18:28:52 2006
@@ -86,12 +86,12 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/tranche_a</string>
                 <string>tax_category/unemployment/employer_share</string>
                 <string>quantity_unit/time/month</string>
                 <string>product_line/social_service/unemployment_insurance</string>
                 <string>source/organisation_module/assedic</string>
-                <string>salary_range/france/salaire_brut</string>
+                <string>salary_range/france/variable/salaire_brut</string>
+                <string>salary_range/france/variable/tranche_a</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml Mon Oct 23 18:28:52 2006
@@ -86,10 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employer_share</string>
+                <string>salary_range/france/fixed/gross</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/labour.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/labour.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/labour.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/labour.xml Mon Oct 23 18:28:52 2006
@@ -86,11 +86,11 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
-                <string>tax_category/salaire_base/employer_share</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employee_share</string>
+                <string>salary_range/france/fixed/gross/base</string>
+                <string>tax_category/gross/employee_share</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml Mon Oct 23 18:28:52 2006
@@ -86,10 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employer_share</string>
+                <string>salary_range/france/fixed/gross</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml Mon Oct 23 18:28:52 2006
@@ -86,10 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employer_share</string>
+                <string>salary_range/france/fixed/gross</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml Mon Oct 23 18:28:52 2006
@@ -86,10 +86,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>salary_range/france/fixed/base</string>
                 <string>product_line/salary</string>
                 <string>quantity_unit/time/month</string>
-                <string>tax_category/salaire_base/employer_share</string>
+                <string>salary_range/france/fixed/gross</string>
+                <string>tax_category/gross/employer_share</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/unemployment_insurance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/unemployment_insurance.xml?rev=10890&r1=10889&r2=10890&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/unemployment_insurance.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/unemployment_insurance.xml Mon Oct 23 18:28:52 2006
@@ -86,14 +86,14 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
+                <string>salary_range/france/variable/salaire_brut</string>
                 <string>tax_category/unemployment/employee_share</string>
                 <string>source/organisation_module/assedic</string>
-                <string>quantity_unit/unit</string>
                 <string>product_line/social_service/unemployment_insurance</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>tax_category/unemployment/employer_share</string>
+                <string>quantity_unit/time/month</string>
               </tuple>
             </value>
         </item>