From aa56f4ae0c82f5ecdc84b552521a38ead3b2cd0e Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Thu, 12 Mar 2009 15:51:23 +0000
Subject: [PATCH] oups... a typo was in the previous commit
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26008 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...p.xml => base_csg_deductible_heure_supp.xml} | 17 +++++++++++++++--
..._pee.xml => base_csg_non_deductible_pee.xml} | 17 +++++++++++++++--
bt5/erp5_payroll_l10n_fr/bt/revision | 2 +-
bt5/erp5_payroll_l10n_fr/bt/template_path_list | 4 ++--
4 files changed, 33 insertions(+), 7 deletions(-)
rename bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/{base_csb_deductible_heure_supp.xml => base_csg_deductible_heure_supp.xml} (67%)
rename bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/{base_csb_non_deductible_pee.xml => base_csg_non_deductible_pee.xml} (67%)
diff --git a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_deductible_heure_supp.xml b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_deductible_heure_supp.xml
similarity index 67%
rename from bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_deductible_heure_supp.xml
rename to bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_deductible_heure_supp.xml
index 502f8d183f..6aa06e915b 100644
--- a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_deductible_heure_supp.xml
+++ b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_deductible_heure_supp.xml
@@ -13,10 +13,17 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>base_amount/base_csb_deductible_heure_supp</string>
+ <string>base_amount/base_csg_deductible_heure_supp</string>
+ <string>base_amount/base_csg_deductible_heure_supp</string>
</tuple>
</value>
</item>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
@@ -25,7 +32,13 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>base_csb_deductible_heure_supp</string> </value>
+ <value> <string>base_csg_deductible_heure_supp</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_non_deductible_pee.xml b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_non_deductible_pee.xml
similarity index 67%
rename from bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_non_deductible_pee.xml
rename to bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_non_deductible_pee.xml
index 5ed1f7386e..7f420d4a09 100644
--- a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csb_non_deductible_pee.xml
+++ b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_non_deductible_pee.xml
@@ -13,10 +13,17 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>base_amount/base_csb_non_deductible_pee</string>
+ <string>base_amount/base_csg_non_deductible_pee</string>
+ <string>base_amount/base_csg_non_deductible_pee</string>
</tuple>
</value>
</item>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
@@ -25,7 +32,13 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>base_csb_non_deductible_pee</string> </value>
+ <value> <string>base_csg_non_deductible_pee</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payroll_l10n_fr/bt/revision b/bt5/erp5_payroll_l10n_fr/bt/revision
index 69226f7293..27a37eb577 100644
--- a/bt5/erp5_payroll_l10n_fr/bt/revision
+++ b/bt5/erp5_payroll_l10n_fr/bt/revision
@@ -1 +1 @@
-92
\ No newline at end of file
+93
\ No newline at end of file
diff --git a/bt5/erp5_payroll_l10n_fr/bt/template_path_list b/bt5/erp5_payroll_l10n_fr/bt/template_path_list
index 7dc31771aa..e32decc8e4 100644
--- a/bt5/erp5_payroll_l10n_fr/bt/template_path_list
+++ b/bt5/erp5_payroll_l10n_fr/bt/template_path_list
@@ -1,7 +1,7 @@
-portal_categories/base_amount/base_csb_deductible_heure_supp
-portal_categories/base_amount/base_csb_non_deductible_pee
portal_categories/base_amount/base_csg
+portal_categories/base_amount/base_csg_deductible_heure_supp
portal_categories/base_amount/base_csg_non_deductible
+portal_categories/base_amount/base_csg_non_deductible_pee
portal_categories/base_amount/base_forfait_social
portal_categories/base_amount/salaire_net_imposable
portal_categories/salary_range/france
--
2.30.9