[Erp5-report] r31558 aurel - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: PathTemplateItem/port...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jan 4 13:58:30 CET 2010


Author: aurel
Date: Mon Jan  4 13:58:29 2010
New Revision: 31558

URL: http://svn.erp5.org?rev=31558&view=rev
Log:
2010-01-04 aurel
Update the bt to use the new structure of the base amount category :

- update local part of the base amount category

- update odt reports to use the new category structure

Added:
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_registered_skin_selection_list
Modified:
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,107 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </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>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>fr</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>French Specific Payroll Amounts</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,107 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </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>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>base</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>csg_deductible</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base CSG déductible</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>csg_deductible_heures_supp</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>2</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base CSG déductible heures supplémentaires</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>csg_non_deductible</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>4</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base CSG non déductible</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>csg_non_deductible_pee</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base CSG non déductible PEE</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>prevoyance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>7</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base prévoyance</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>reduc_patronales</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>6</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base réduction patronales</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml?rev=31558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1261004400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>reduc_salariales</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>5</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Base réduction salariales</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -64,25 +64,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </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>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -90,13 +78,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -64,25 +64,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </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>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -90,13 +78,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -56,25 +56,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </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>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -82,13 +70,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -64,25 +64,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </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>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -90,13 +78,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -64,25 +64,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </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>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -90,13 +78,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -114,8 +114,9 @@
   return s\n
 \n
 salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-    base_contribution=\'base_contribution/base_amount/payroll/earning/salary/taxable_net_salary\',\n
+    base_contribution=\'base_contribution/base_amount/payroll/base/income_tax\',\n
     contribution_share=\'contribution_share/employee\')\n
+\n
 def getTaxableNetPayId(salaire_net_imposable):\n
   s = \'\'\n
   if salaire_net_imposable:\n
@@ -176,10 +177,10 @@
   return \'\'\n
 \n
 gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-    base_contribution=\'base_contribution/base_amount/payroll/earning/salary/gross_salary\',\n
+    base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
     contribution_share=\'contribution_share/employee\')\n
 year_to_date_gross_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
-    paysheet=context, base_contribution_list=\'payroll/earning/salary/gross_salary\') + gross_salary\n
+    paysheet=context, base_contribution_list=\'payroll/report/salary/gross\') + gross_salary\n
 \n
 year_to_date_slice_a = context.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n
 \n
@@ -196,13 +197,13 @@
     context.PaySheetTransaction_getYearToDateOvertimeHours() or 0\n
 \n
 year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
-    paysheet=context, base_contribution_list=\'payroll/earning/salary/overtime\') + \\\n
+    paysheet=context, base_contribution_list=\'payroll/report/overtime\') + \\\n
     context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-    base_contribution=\'base_contribution/base_amount/payroll/earning/salary/overtime\', \\\n
+    base_contribution=\'base_contribution/base_amount/payroll/report/overtime\', \\\n
     contribution_share=\'contribution_share/employee\') or 0\n
 \n
 year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
-    paysheet=context, base_contribution_list=\'payroll/earning/salary/net_salary\') + salaire_net_imposable\n
+    paysheet=context, base_contribution_list=\'payroll/report/salary/net\') + salaire_net_imposable\n
 \n
 def unicodeDict(d):\n
   for k, v in d.items():\n

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] Mon Jan  4 13:58:29 2010
@@ -88,7 +88,7 @@
 plafond_min = slice.getQuantityRangeMin()\n
 \n
 gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-    base_contribution=\'base_contribution/base_amount/gross_salary\',\n
+    base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
     contribution_share=\'contribution_share/employee\')\n
 \n
 if gross_salary < plafond_max:\n
@@ -106,7 +106,7 @@
     plafond_max = slice.getQuantityRangeMax()\n
     plafond_min = slice.getQuantityRangeMin()\n
     gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-        base_contribution=\'base_contribution/base_amount/gross_salary\',\n
+        base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
         contribution_share=\'contribution_share/employee\')\n
     slice_amount = 0\n
     if gross_salary < plafond_max:\n

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log [utf8] Mon Jan  4 13:58:29 2010
@@ -1,3 +1,6 @@
+2010-01-04 aurel
+Update the bt to use the new structure of the base amount category
+
 2009-09-01 yusuke
 * tax_category category is renamed to contribution_share category
 

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Mon Jan  4 13:58:29 2010
@@ -1,1 +1,1 @@
-113
+116

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list?rev=31558&r1=31557&r2=31558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list [utf8] Mon Jan  4 13:58:29 2010
@@ -1,9 +1,5 @@
-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/base_amount/payroll/l10n/fr
+portal_categories/base_amount/payroll/l10n/fr/**
 portal_categories/salary_range/france
 portal_categories/salary_range/france/tranche_1
 portal_categories/salary_range/france/tranche_2

Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_registered_skin_selection_list?rev=31558&view=auto
==============================================================================
    (empty)




More information about the Erp5-report mailing list