From 7dd4850e97e12e038ab575f1092c5803cbcad043 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Mon, 27 Nov 2006 13:12:35 +0000
Subject: [PATCH] Add "prevoyance" payroll service and related organisation.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11493 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Payroll%20Service/view.xml   |   2 +-
 .../portal_categories/destination_region.xml  |   6 -
 .../portal_categories/salary_range.xml        | 405 ++++--------------
 .../portal_categories/tax_category.xml        | 395 ++++-------------
 .../payroll_service_module.xml                |   6 +-
 .../organisation_module/generali.xml          | 144 +++++++
 .../organisation_module/henner.xml            |   4 +-
 .../payroll_service_module/argic.xml          |   4 +-
 .../payroll_service_module/prevoyance.xml     | 167 ++++++++
 .../taxe_prevoyance.xml                       | 167 ++++++++
 .../default_pay_sheet_transaction_rule.xml    |   6 +-
 .../movement_0_4.xml                          | 124 +-----
 .../movement_0_5.xml                          |   4 +
 .../movement_0_6.xml                          |   8 +-
 .../movement_0_7.xml                          | 128 +++++-
 .../expense.xml                               |   0
 .../payable.xml                               |   0
 .../movement_1_4.xml                          |  42 +-
 .../{movement_1_7 => movement_1_4}/1.xml      |   0
 .../movement_1_4/payable.xml                  |   6 +-
 .../movement_1_5.xml                          |   4 +
 .../movement_1_6.xml                          |   8 +-
 .../movement_1_6/payable.xml                  |   3 +-
 .../movement_1_7.xml                          |  46 +-
 .../movement_1_7/payable.xml                  |   5 +-
 ...nsactionModule_viewPayrollReportDialog.xml |   2 +-
 .../PaySheetTransaction_getDetails.xml        |  27 --
 .../PaySheetTransaction_initializePreview.xml |  29 +-
 .../PaySheetTransaction_postCalculation.xml   |  29 +-
 ...ransaction_preCalculation_l10n_fr_2005.xml |  27 --
 ...ransaction_preCalculation_l10n_fr_2006.xml | 132 +++---
 .../PaySheetTransaction_zGetDetailedTotal.xml |   6 +-
 ...etTransaction_zGetTotalDestinationList.xml |   2 +-
 .../PayrollService_view/my_description.xml    |   6 +
 .../PayrollService_view/my_product_line.xml   |   6 +
 .../PayrollService_view/my_quantity_unit.xml  |   6 +
 .../PayrollService_view/my_title.xml          |   6 +
 .../PayrollService_view/validation_state.xml  |   6 +
 bt5/erp5_payroll/bt/change_log                |   3 +
 bt5/erp5_payroll/bt/revision                  |   2 +-
 bt5/erp5_payroll/bt/template_path_list        |   1 +
 bt5/erp5_payroll/bt/version                   |   2 +-
 42 files changed, 988 insertions(+), 988 deletions(-)
 create mode 100644 bt5/erp5_payroll/PathTemplateItem/organisation_module/generali.xml
 create mode 100644 bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml
 create mode 100644 bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml
 rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_0_4 => movement_0_7}/expense.xml (100%)
 rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_0_4 => movement_0_7}/payable.xml (100%)
 rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_1_7 => movement_1_4}/1.xml (100%)

diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml
index 9c62d26819..1c8759461c 100644
--- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml
+++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml
index 7256069ff4..e885f22d29 100644
--- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml
+++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml
@@ -30,12 +30,6 @@
               <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>
diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml
index 3acca4f73a..2a2e9bcd10 100644
--- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml
+++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -378,11 +69,27 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -393,6 +100,74 @@
             <key> <string>id</string> </key>
             <value> <string>salary_range</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -405,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml
index 6eba6abf02..279a1def6e 100644
--- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml
+++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -382,11 +73,27 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -397,6 +104,12 @@
             <key> <string>id</string> </key>
             <value> <string>tax_category</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -405,6 +118,58 @@
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -417,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml b/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml
index 765c488762..b0a349287b 100644
--- a/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml
+++ b/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml
@@ -300,9 +300,8 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
+  <permission type='list'>
    <name>Add Z MySQL Deferred Database Connections</name>
-   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -547,9 +546,8 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
+  <permission type='list'>
    <name>Manage Translation Services</name>
-   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage Vocabulary</name>
diff --git a/bt5/erp5_payroll/PathTemplateItem/organisation_module/generali.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/generali.xml
new file mode 100644
index 0000000000..3337e1ba71
--- /dev/null
+++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/generali.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.Organisation</string>
+          <string>Organisation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Access_contents_information_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_View_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <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>description</string> </key>
+            <value> <string>Vu comme un prestataire de service social dans le cadre du module de feuilles de paie</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>generali</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Organisation</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Generali Assurances</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/organisation_module/henner.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/henner.xml
index 52ea52510c..06aafd7d07 100644
--- a/bt5/erp5_payroll/PathTemplateItem/organisation_module/henner.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/henner.xml
@@ -86,7 +86,7 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>role/administration</string>
+                <string>role/client</string>
               </tuple>
             </value>
         </item>
@@ -108,7 +108,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Henner - GMC</string> </value>
+            <value> <string>Henner</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml
index b81c5a6519..edd59c993b 100644
--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/argic.xml
@@ -80,13 +80,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
+                <string>salary_range/france/variable/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>salary_range/france/variable/tranche_b</string>
+                <string>source/organisation_module/483</string>
                 <string>salary_range/france/variable/tranche_c</string>
                 <string>tax_category/argic/employer_share</string>
-                <string>source/organisation_module/483</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml
new file mode 100644
index 0000000000..1232582764
--- /dev/null
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.Resource</string>
+          <string>Resource</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Access_contents_information_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_View_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <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/variable/tranche_a</string>
+                <string>tax_category/syntec_insurance/employee_share</string>
+                <string>product_line/social_service/mutual_insurance</string>
+                <string>quantity_unit/time/month</string>
+                <string>source/organisation_module/generali</string>
+                <string>salary_range/france/variable/tranche_b</string>
+                <string>tax_category/syntec_insurance/employer_share</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>"Service Social" rendu par Generali \xc3\xa0 un employeur. La facture de ce service est vu comme une cotisation sociale dans une feuille de paie.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>prevoyance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Payroll Service</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Prevoyance</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_list</string> </key>
+            <value>
+              <tuple>
+                <string>tax_category</string>
+                <string>salary_range</string>
+              </tuple>
+            </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/payroll_service_module/taxe_prevoyance.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml
new file mode 100644
index 0000000000..e4dfff4d86
--- /dev/null
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.Resource</string>
+          <string>Resource</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Access_contents_information_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_View_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <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/social/employer_share</string>
+                <string>product_line/social_service</string>
+                <string>quantity_unit/time/month</string>
+                <string>source/organisation_module/urssaf</string>
+                <string>salary_range/france/variable</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>taxe_prevoyance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Payroll Service</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Taxe Prevoyance</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_list</string> </key>
+            <value>
+              <tuple>
+                <string>tax_category</string>
+                <string>salary_range</string>
+              </tuple>
+            </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_rules/default_pay_sheet_transaction_rule.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml
index 83aa5ba2b8..f4ba461496 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml
@@ -309,7 +309,7 @@
               <dictionary>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/4</string> </key>
-                    <value> <int>4</int> </value>
+                    <value> <int>7</int> </value>
                 </item>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/5</string> </key>
@@ -317,7 +317,7 @@
                 </item>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/6</string> </key>
-                    <value> <int>7</int> </value>
+                    <value> <int>6</int> </value>
                 </item>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/7</string> </key>
@@ -325,7 +325,7 @@
                 </item>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/8</string> </key>
-                    <value> <int>6</int> </value>
+                    <value> <int>4</int> </value>
                 </item>
                 <item>
                     <key> <string>portal_rules/default_pay_sheet_transaction_rule/copy2_of_4</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml
index eaa2069a07..2aa192b23c 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml
@@ -54,27 +54,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>resource/currency_module/EUR</string>
-                <string>source_section/organisation_module/nexedi</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>movement_0_4</string> </value>
@@ -83,10 +68,6 @@
             <key> <string>isIndexable</string> </key>
             <value> <int>1</int> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>2</string> </value>
-        </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
             <value>
@@ -118,7 +99,7 @@
                 <string>tax_category/syntec_insurance/employer_share</string>
                 <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/unemployment/employer_share</string>
-                <string>product_line/social_service/state_insurance</string>
+                <string>product_line/addendum/remboursement_frais</string>
               </tuple>
             </value>
         </item>
@@ -132,107 +113,6 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Accounting Rule Cell</string> </value>
         </item>
-        <item>
-            <key> <string>start_date</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="DateTime" module="DateTime.DateTime"/>
-                </klass>
-                <tuple>
-                  <none/>
-                </tuple>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Wed</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38444.9166667</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>5</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Wednesday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1144188000000</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Wed.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>am</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>12</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1144188000.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>GMT+2</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.916666666664</float> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -241,7 +121,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employer Share * URSSAF</string> </value>
+            <value> <string>Employer Share * Frais</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml
index 77558752b0..11bc5b7e6f 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml
@@ -64,6 +64,10 @@
             <key> <string>id</string> </key>
             <value> <string>movement_0_5</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
             <value>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml
index ed939b3fdb..095b7fc4f4 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml
@@ -64,6 +64,10 @@
             <key> <string>id</string> </key>
             <value> <string>movement_0_6</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
             <value>
@@ -95,7 +99,7 @@
                 <string>tax_category/syntec_insurance/employer_share</string>
                 <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/unemployment/employer_share</string>
-                <string>product_line/addendum/remboursement_frais</string>
+                <string>product_line/addendum/acompte</string>
               </tuple>
             </value>
         </item>
@@ -117,7 +121,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employer Share * Frais</string> </value>
+            <value> <string>Employer Share * Acompte</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml
index 161219a89f..ab05a145a3 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml
@@ -54,16 +54,39 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>resource/currency_module/EUR</string>
+                <string>source_section/organisation_module/nexedi</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>movement_0_7</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>2</string> </value>
+        </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
             <value>
@@ -95,7 +118,7 @@
                 <string>tax_category/syntec_insurance/employer_share</string>
                 <string>tax_category/taxes/employer_share</string>
                 <string>tax_category/unemployment/employer_share</string>
-                <string>product_line/addendum/acompte</string>
+                <string>product_line/social_service/state_insurance</string>
               </tuple>
             </value>
         </item>
@@ -109,6 +132,107 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Accounting Rule Cell</string> </value>
         </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_aday</string> </key>
+                        <value> <string>Wed</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_amon</string> </key>
+                        <value> <string>Apr</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_d</string> </key>
+                        <value> <float>38444.9166667</float> </value>
+                    </item>
+                    <item>
+                        <key> <string>_day</string> </key>
+                        <value> <int>5</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_dayoffset</string> </key>
+                        <value> <int>3</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_fday</string> </key>
+                        <value> <string>Wednesday</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_fmon</string> </key>
+                        <value> <string>April</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_hour</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_millis</string> </key>
+                        <value> <long>1144188000000</long> </value>
+                    </item>
+                    <item>
+                        <key> <string>_minute</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_month</string> </key>
+                        <value> <int>4</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_nearsec</string> </key>
+                        <value> <float>0.0</float> </value>
+                    </item>
+                    <item>
+                        <key> <string>_pday</string> </key>
+                        <value> <string>Wed.</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_pm</string> </key>
+                        <value> <string>am</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_pmhour</string> </key>
+                        <value> <int>12</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>_pmon</string> </key>
+                        <value> <string>Apr.</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_second</string> </key>
+                        <value> <float>0.0</float> </value>
+                    </item>
+                    <item>
+                        <key> <string>_t</string> </key>
+                        <value> <float>1144188000.0</float> </value>
+                    </item>
+                    <item>
+                        <key> <string>_tz</string> </key>
+                        <value> <string>GMT+2</string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_year</string> </key>
+                        <value> <int>2006</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>time</string> </key>
+                        <value> <float>0.916666666664</float> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -117,7 +241,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employer Share * Acompte</string> </value>
+            <value> <string>Employer Share * URSSAF</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7/expense.xml
similarity index 100%
rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4/expense.xml
rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7/expense.xml
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7/payable.xml
similarity index 100%
rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4/payable.xml
rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7/payable.xml
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml
index e4785d0d33..0ef5626cee 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml
@@ -58,11 +58,17 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>resource/currency_module/EUR</string>
+                <string>resource/currency_module/eur</string>
                 <string>source_section/organisation_module/nexedi</string>
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>contributors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -85,7 +91,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>2</string> </value>
+            <value> <string>1</string> </value>
         </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
@@ -118,7 +124,7 @@
                 <string>tax_category/supplementary_pension/employee_share</string>
                 <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
-                <string>product_line/social_service/state_insurance</string>
+                <string>product_line/addendum/remboursement_frais</string>
               </tuple>
             </value>
         </item>
@@ -146,31 +152,31 @@
                   <dictionary>
                     <item>
                         <key> <string>_aday</string> </key>
-                        <value> <string>Wed</string> </value>
+                        <value> <string>Thu</string> </value>
                     </item>
                     <item>
                         <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
+                        <value> <string>Oct</string> </value>
                     </item>
                     <item>
                         <key> <string>_d</string> </key>
-                        <value> <float>38451.9166667</float> </value>
+                        <value> <float>38649.1666667</float> </value>
                     </item>
                     <item>
                         <key> <string>_day</string> </key>
-                        <value> <int>12</int> </value>
+                        <value> <int>26</int> </value>
                     </item>
                     <item>
                         <key> <string>_dayoffset</string> </key>
-                        <value> <int>3</int> </value>
+                        <value> <int>4</int> </value>
                     </item>
                     <item>
                         <key> <string>_fday</string> </key>
-                        <value> <string>Wednesday</string> </value>
+                        <value> <string>Thursday</string> </value>
                     </item>
                     <item>
                         <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
+                        <value> <string>October</string> </value>
                     </item>
                     <item>
                         <key> <string>_hour</string> </key>
@@ -178,7 +184,7 @@
                     </item>
                     <item>
                         <key> <string>_millis</string> </key>
-                        <value> <long>1144792800000</long> </value>
+                        <value> <long>1161835200000</long> </value>
                     </item>
                     <item>
                         <key> <string>_minute</string> </key>
@@ -186,7 +192,7 @@
                     </item>
                     <item>
                         <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
+                        <value> <int>10</int> </value>
                     </item>
                     <item>
                         <key> <string>_nearsec</string> </key>
@@ -194,7 +200,7 @@
                     </item>
                     <item>
                         <key> <string>_pday</string> </key>
-                        <value> <string>Wed.</string> </value>
+                        <value> <string>Thu.</string> </value>
                     </item>
                     <item>
                         <key> <string>_pm</string> </key>
@@ -206,7 +212,7 @@
                     </item>
                     <item>
                         <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
+                        <value> <string>Oct.</string> </value>
                     </item>
                     <item>
                         <key> <string>_second</string> </key>
@@ -214,11 +220,11 @@
                     </item>
                     <item>
                         <key> <string>_t</string> </key>
-                        <value> <float>1144792800.0</float> </value>
+                        <value> <float>1161835200.0</float> </value>
                     </item>
                     <item>
                         <key> <string>_tz</string> </key>
-                        <value> <string>GMT+2</string> </value>
+                        <value> <string>GMT-4</string> </value>
                     </item>
                     <item>
                         <key> <string>_year</string> </key>
@@ -226,7 +232,7 @@
                     </item>
                     <item>
                         <key> <string>time</string> </key>
-                        <value> <float>0.916666666664</float> </value>
+                        <value> <float>0.166666666664</float> </value>
                     </item>
                   </dictionary>
                 </state>
@@ -241,7 +247,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employee Share * URSSAF</string> </value>
+            <value> <string>Employee Share * Frais</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/1.xml
similarity index 100%
rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml
rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/1.xml
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/payable.xml
index 0f8794dcaf..b4875ef195 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/payable.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/payable.xml
@@ -40,8 +40,8 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>source/account_module/securite_sociale</string>
-                <string>destination/account_module/creances_sociales</string>
+                <string>source/account_module/dette_fournisseur</string>
+                <string>destination/account_module/creance_client</string>
               </tuple>
             </value>
         </item>
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>quantity</string> </key>
-            <value> <float>-1.0</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml
index 8a1cf2b2c6..58ea1968bf 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml
@@ -85,6 +85,10 @@
             <key> <string>id</string> </key>
             <value> <string>movement_1_5</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml
index 80c03dae41..dadc473ea2 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml
@@ -85,6 +85,10 @@
             <key> <string>id</string> </key>
             <value> <string>movement_1_6</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
@@ -120,7 +124,7 @@
                 <string>tax_category/supplementary_pension/employee_share</string>
                 <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
-                <string>product_line/addendum/remboursement_frais</string>
+                <string>product_line/addendum/acompte</string>
               </tuple>
             </value>
         </item>
@@ -243,7 +247,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employee Share * Frais</string> </value>
+            <value> <string>Employee Share * Acompte</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml
index b4875ef195..e6d7cbdf78 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml
@@ -40,8 +40,7 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>source/account_module/dette_fournisseur</string>
-                <string>destination/account_module/creance_client</string>
+                <string>source/account_module/104</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml
index 14460035d0..c6007d1041 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml
@@ -58,17 +58,11 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>resource/currency_module/eur</string>
+                <string>resource/currency_module/EUR</string>
                 <string>source_section/organisation_module/nexedi</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>contributors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -85,9 +79,13 @@
             <key> <string>id</string> </key>
             <value> <string>movement_1_7</string> </value>
         </item>
+        <item>
+            <key> <string>isIndexable</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>2</string> </value>
         </item>
         <item>
             <key> <string>mapped_value_property_list</string> </key>
@@ -120,7 +118,7 @@
                 <string>tax_category/supplementary_pension/employee_share</string>
                 <string>tax_category/syntec_insurance/employee_share</string>
                 <string>tax_category/unemployment/employee_share</string>
-                <string>product_line/addendum/acompte</string>
+                <string>product_line/social_service/state_insurance</string>
               </tuple>
             </value>
         </item>
@@ -148,31 +146,31 @@
                   <dictionary>
                     <item>
                         <key> <string>_aday</string> </key>
-                        <value> <string>Thu</string> </value>
+                        <value> <string>Wed</string> </value>
                     </item>
                     <item>
                         <key> <string>_amon</string> </key>
-                        <value> <string>Oct</string> </value>
+                        <value> <string>Apr</string> </value>
                     </item>
                     <item>
                         <key> <string>_d</string> </key>
-                        <value> <float>38649.1666667</float> </value>
+                        <value> <float>38451.9166667</float> </value>
                     </item>
                     <item>
                         <key> <string>_day</string> </key>
-                        <value> <int>26</int> </value>
+                        <value> <int>12</int> </value>
                     </item>
                     <item>
                         <key> <string>_dayoffset</string> </key>
-                        <value> <int>4</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>_fday</string> </key>
-                        <value> <string>Thursday</string> </value>
+                        <value> <string>Wednesday</string> </value>
                     </item>
                     <item>
                         <key> <string>_fmon</string> </key>
-                        <value> <string>October</string> </value>
+                        <value> <string>April</string> </value>
                     </item>
                     <item>
                         <key> <string>_hour</string> </key>
@@ -180,7 +178,7 @@
                     </item>
                     <item>
                         <key> <string>_millis</string> </key>
-                        <value> <long>1161835200000</long> </value>
+                        <value> <long>1144792800000</long> </value>
                     </item>
                     <item>
                         <key> <string>_minute</string> </key>
@@ -188,7 +186,7 @@
                     </item>
                     <item>
                         <key> <string>_month</string> </key>
-                        <value> <int>10</int> </value>
+                        <value> <int>4</int> </value>
                     </item>
                     <item>
                         <key> <string>_nearsec</string> </key>
@@ -196,7 +194,7 @@
                     </item>
                     <item>
                         <key> <string>_pday</string> </key>
-                        <value> <string>Thu.</string> </value>
+                        <value> <string>Wed.</string> </value>
                     </item>
                     <item>
                         <key> <string>_pm</string> </key>
@@ -208,7 +206,7 @@
                     </item>
                     <item>
                         <key> <string>_pmon</string> </key>
-                        <value> <string>Oct.</string> </value>
+                        <value> <string>Apr.</string> </value>
                     </item>
                     <item>
                         <key> <string>_second</string> </key>
@@ -216,11 +214,11 @@
                     </item>
                     <item>
                         <key> <string>_t</string> </key>
-                        <value> <float>1161835200.0</float> </value>
+                        <value> <float>1144792800.0</float> </value>
                     </item>
                     <item>
                         <key> <string>_tz</string> </key>
-                        <value> <string>GMT-4</string> </value>
+                        <value> <string>GMT+2</string> </value>
                     </item>
                     <item>
                         <key> <string>_year</string> </key>
@@ -228,7 +226,7 @@
                     </item>
                     <item>
                         <key> <string>time</string> </key>
-                        <value> <float>0.166666666664</float> </value>
+                        <value> <float>0.916666666664</float> </value>
                     </item>
                   </dictionary>
                 </state>
@@ -243,7 +241,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employee Share * Acompte</string> </value>
+            <value> <string>Employee Share * URSSAF</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml
index e6d7cbdf78..0f8794dcaf 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml
@@ -40,7 +40,8 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>source/account_module/104</string>
+                <string>source/account_module/securite_sociale</string>
+                <string>destination/account_module/creances_sociales</string>
               </tuple>
             </value>
         </item>
@@ -54,7 +55,7 @@
         </item>
         <item>
             <key> <string>quantity</string> </key>
-            <value> <float>1.0</float> </value>
+            <value> <float>-1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml
index 62a6632df8..fc284cde43 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml
@@ -70,7 +70,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_report_year</string>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
index 5c404c84d9..82638268f0 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
@@ -486,12 +486,6 @@ return details\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_dav_writelocks</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -639,25 +633,4 @@ return details\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml
index 7247944206..35278f578d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml
@@ -224,7 +224,7 @@ year    = \'2006\'\n
 script_name = \'_\'.join([ "PaySheetTransaction_preCalculation_l10n"\n
                        , country\n
                        , year\n
-                       ])\n
+])\n
 calculation_method = getattr(context, script_name)\n
 pre_calculation = calculation_method(gross_salary=new_gross_salary)\n
 \n
@@ -282,12 +282,6 @@ return preview_line_list\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_dav_writelocks</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -413,25 +407,4 @@ return preview_line_list\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml
index 497cf8b5c9..c57048346c 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml
@@ -141,7 +141,7 @@ def createPaySheetItem(title=\'\', res=\'\', dest_org=\'\', desc=\'\', cells=[])
 # Set the title of the paysheet if empty\n
 months = [ \'january\', \'february\', \'march\', \'april\', \'may\', \'june\', \'july\'\n
          , \'august\', \'september\', \'october\', \'november\', \'december\'\n
-         ]\n
+]\n
 if context.getTitle() in (\'\', None):\n
   new_title = \'%s %s\' % ( N_(\'Salary\')\n
                         , context.getDestinationSectionValue().getTitle()\n
@@ -281,12 +281,6 @@ if not(kw.has_key(\'skip_redirect\') and kw[\'skip_redirect\'] == True):\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_dav_writelocks</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -396,25 +390,4 @@ if not(kw.has_key(\'skip_redirect\') and kw[\'skip_redirect\'] == True):\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml
index c11eb427a3..2faa9720ba 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml
@@ -531,12 +531,6 @@ return default\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_dav_writelocks</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -662,25 +656,4 @@ return default\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
index 41c6b2e794..4feadebf8d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
@@ -80,6 +80,10 @@
 \n
 kw = {}\n
 \n
+# Get Precision\n
+precision = context.getResourceValue().getQuantityPrecision()\n
+r_ = lambda x: context.Base_getRoundValue(x, precision)\n
+\n
 \n
 ##########################\n
 # This part of the script define usefull variables to help us calculate dynamic rates and contributions.\n
@@ -96,8 +100,8 @@ company  = paysheet.getSourceSectionValue()\n
 if gross_salary == None:\n
   gross_salary = abs(paysheet.getGrossSalary())\n
 \n
-start_date   = paysheet.getStartDate()\n
-stop_date    = paysheet.getStopDate()\n
+start_date = paysheet.getStartDate()\n
+stop_date  = paysheet.getStopDate()\n
 \n
 # Each year, look at http://www.urssaf.fr to complete the table\n
 ceiling_salary_list = { 2003: 2432.0\n
@@ -139,8 +143,8 @@ salary_slices = {}\n
 #       This is why there is a problem for people who have changing gross salary over the year.\n
 #       That\'s why accountants must do manual regulations in those cases.\n
 slice_a_value = ceiling_salary\n
-slice_b_value = ceiling_salary * 4\n
-slice_c_value = ceiling_salary * 8\n
+slice_b_value = r_(ceiling_salary * 4)\n
+slice_c_value = r_(ceiling_salary * 8)\n
 if gross_salary < slice_a_value:\n
   salary_slices[\'A\'] = gross_salary\n
 else:\n
@@ -156,7 +160,7 @@ else:\n
 \n
 # "Number" slice type\n
 slice_1_value = ceiling_salary\n
-slice_2_value = ceiling_salary * 3\n
+slice_2_value = r_(ceiling_salary * 3)\n
 if gross_salary < slice_1_value:\n
   salary_slices[\'1\'] = gross_salary\n
 else:\n
@@ -186,7 +190,7 @@ else:\n
 #   , \'base\'          : contribution_base_in_currency\n
 #   }\n
 # Rates and base must be floats.\n
-# Be carefull: Rates are not in percents !\n
+# Rates are expressed in percents during the decision process but normalized at the end of that script.\n
 ##########################\n
 \n
 # Sickness insurance = Assurance maladie\n
@@ -251,7 +255,7 @@ kw[\'lodging_helps/salaire_plafonne\'] = \\\n
 , \'base\'          : limited_salary\n
 }\n
 \n
-# Solidarity day = Journ\xe9e de Solidarit\xe9\n
+# Solidarity day = Journee de Solidaritee\n
 kw[\'solidarity_day/salaire_brut\'] = \\\n
 { \'employer_share\': 0.30\n
 , \'employee_share\': None\n
@@ -272,18 +276,6 @@ kw[\'solidarity_day/salaire_brut\'] = \\\n
 #   , \'base\'          : gross_salary\n
 #   }\n
 \n
-# CSG\n
-kw[\'csg_deductible/salaire_brut_csg\'] = \\\n
-{ \'employer_share\': None\n
-, \'employee_share\': 5.10\n
-, \'base\'          : 0.97 * gross_salary\n
-}\n
-kw[\'csg_non_deductible/salaire_brut_csg\'] = \\\n
-{ \'employer_share\': None\n
-, \'employee_share\': 2.9\n
-, \'base\'          : 0.97 * gross_salary\n
-}\n
-\n
 # CRDS\n
 # kw[\'crds/salaire_brut_crds\'] = \\\n
 # { \'employer_share\': None\n
@@ -463,13 +455,21 @@ if executive and not salary_slices.has_key(\'B\') and not salary_slices.has_key(
 # , \'base\'          : gross_salary\n
 # }\n
 \n
-# Syntec convention\n
-# TODO: We can\'t take the decision based on the CollectiveAgreementTitle since each\n
-#       employee has the right to choose if they want benefit from the insurance or not.\n
-#       We can use instead the social_contract property of the (near-)future HR-related stuff.\n
+# CSG base salary is hard to calculate because it add "mutuelle" and "prevoyance" employer share\n
+#   contribution to the base salary and reduce it to 97%.\n
+CSG_BASE_RATE = 0.97\n
+csg_base_salary = gross_salary\n
+\n
+# Syntec convention insurances\n
+# TODO: We should use the social_contract property of the (near-)future HR-related stuff to\n
+#         define collective conventions the employee belong to. Same to add custom paysheet\n
+#         calculation which depend of the employment contract between the employee and the\n
+#         employer.\n
 col_agr = employee.getCareerCollectiveAgreementTitle()\n
 if col_agr not in (None, \'\') and \'syntec\' in col_agr.lower():\n
-  # set the syntec rate according to the employee marital status\n
+  insurrances_base = 0.0\n
+  # Add "mutuelle" and "prevoyance" employer share to csg_base_salary when required\n
+  # Set the syntec rate according to the employee marital status\n
   syntec_rate = 0.96\n
   if employee.getMaritalStatusId() == \'married\':\n
     syntec_rate *= 2\n
@@ -478,8 +478,47 @@ if col_agr not in (None, \'\') and \'syntec\' in col_agr.lower():\n
   , \'employee_share\': syntec_rate\n
   , \'base\'          : ceiling_salary\n
   }\n
+  insurrances_base += r_(ceiling_salary * (syntec_rate / 100.0))\n
+  # Prevoyance insurance (part of SYNTEC requirements)\n
+  if salary_slices.has_key(\'A\'):\n
+    RATE = 0.70\n
+    BASE = salary_slices[\'A\']\n
+    kw[\'prevoyance/tranche_a\'] = \\\n
+    { \'employer_share\': RATE\n
+    , \'employee_share\': None\n
+    , \'base\'          : BASE\n
+    }\n
+    insurrances_base += r_(BASE * (RATE / 100.0))\n
+  if salary_slices.has_key(\'B\'):\n
+    RATE = 0.54\n
+    BASE = salary_slices[\'B\']\n
+    kw[\'prevoyance/tranche_b\'] = \\\n
+    { \'employer_share\': RATE\n
+    , \'employee_share\': RATE\n
+    , \'base\'          : BASE\n
+    }\n
+    insurrances_base += r_(BASE * (RATE / 100.0))\n
+  # Final tax on the contribution (!)\n
+  kw[\'taxe_prevoyance/variable\'] = \\\n
+  { \'employer_share\': 8.0\n
+  , \'employee_share\': None\n
+  , \'base\'          : insurrances_base\n
+  }\n
+  csg_base_salary += insurrances_base\n
+\n
+# CSG\n
+kw[\'csg_deductible/salaire_brut_csg\'] = \\\n
+{ \'employer_share\': None\n
+, \'employee_share\': 5.10\n
+, \'base\'          : CSG_BASE_RATE * csg_base_salary\n
+}\n
+kw[\'csg_non_deductible/salaire_brut_csg\'] = \\\n
+{ \'employer_share\': None\n
+, \'employee_share\': 2.9\n
+, \'base\'          : CSG_BASE_RATE * csg_base_salary\n
+}\n
 \n
-# Also add a brand new line for "Reduction Fillon", a negative contribution.\n
+# Also add a brand new line for "Reduction Fillon", a "negative" contribution.\n
 # This tax can be calculated automaticcaly.\n
 # Because of lack of time we just let the accountant do the work.\n
 # See coresponding service description for more details.\n
@@ -543,6 +582,10 @@ for line_key in kw.keys():\n
      line_key.endswith(\'/forfait\'):\n
     # Defensive programming: be sure conventions are respected\n
     kw[line_key][\'base\'] = 1.0\n
+    # Round values\n
+    for (key, value) in kw[line_key].items():\n
+      if key in [\'employee_share\', \'employer_share\'] and value != None:\n
+        kw[line_key][key] = r_(kw[line_key][key])\n
   # \'Variable\' contributions\n
   else:\n
     # All rates in this script are written in percents, we must convert them in pure floats.\n
@@ -551,6 +594,9 @@ for line_key in kw.keys():\n
       if share_value not in [\'\', None]:\n
         # Fix percents\n
         kw[line_key][share_type] = share_value / 100.0\n
+    # Round base\n
+    if line[\'base\'] not in [\'\', None]:\n
+      kw[line_key][\'base\'] = r_(line[\'base\'])\n
 \n
 return kw\n
 
@@ -563,12 +609,6 @@ return kw\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_dav_writelocks</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -613,6 +653,8 @@ return kw\n
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>precision</string>
+                            <string>r_</string>
                             <string>paysheet</string>
                             <string>paysheet_type</string>
                             <string>employee</string>
@@ -651,11 +693,18 @@ return kw\n
                             <string>employee_share_rate</string>
                             <string>employer_share_rate</string>
                             <string>comp_date</string>
+                            <string>CSG_BASE_RATE</string>
+                            <string>csg_base_salary</string>
                             <string>col_agr</string>
+                            <string>insurrances_base</string>
                             <string>syntec_rate</string>
+                            <string>RATE</string>
+                            <string>BASE</string>
                             <string>_getiter_</string>
                             <string>line_key</string>
                             <string>line</string>
+                            <string>key</string>
+                            <string>value</string>
                             <string>share_type</string>
                             <string>share_value</string>
                           </tuple>
@@ -687,25 +736,4 @@ return kw\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetDetailedTotal.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetDetailedTotal.xml
index 0e7afb719a..3e837da29f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetDetailedTotal.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetDetailedTotal.xml
@@ -72,9 +72,9 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>start_date</string>
-<string>stop_date</string>
-<string>tax_category</string>
+                            <string>start_date</string>
+                            <string>stop_date</string>
+                            <string>tax_category</string>
                           </list>
                         </value>
                     </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetTotalDestinationList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetTotalDestinationList.xml
index 68283a5013..d22d0a1ba3 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetTotalDestinationList.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_zGetTotalDestinationList.xml
@@ -45,7 +45,7 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>year</string>
+                            <string>year</string>
                           </list>
                         </value>
                     </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml
index 6434e7afb8..d9db35fdab 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_description</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_product_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_product_line.xml
index dbb0393e4f..05e96dc6ac 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_product_line.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_product_line.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_product_line</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_quantity_unit.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_quantity_unit.xml
index 43cf0c3de4..c8bc7333fb 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_quantity_unit.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_quantity_unit.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_quantity_unit</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_title.xml
index b8600d9da5..bad5783f13 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_title.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/validation_state.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/validation_state.xml
index 48a2c1c7c1..0a140c36d2 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/validation_state.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/validation_state.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>validation_state</string> </value>
diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log
index 41fd7181b6..fa4f436ddb 100644
--- a/bt5/erp5_payroll/bt/change_log
+++ b/bt5/erp5_payroll/bt/change_log
@@ -1,3 +1,6 @@
+2006-11-24 Kevin
+* Add "prevoyance" payroll service and related organisation.
+
 2006-10-27 Kevin
 * Calculate yearly sums.
 
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index b9c6c007cc..d55f9f7457 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-131
\ No newline at end of file
+136
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_path_list b/bt5/erp5_payroll/bt/template_path_list
index b6bcdd4bcf..7dffee7cb3 100644
--- a/bt5/erp5_payroll/bt/template_path_list
+++ b/bt5/erp5_payroll/bt/template_path_list
@@ -4,6 +4,7 @@ organisation_module/agirc
 organisation_module/arrco
 organisation_module/assedic
 organisation_module/etat
+organisation_module/generali
 organisation_module/henner
 organisation_module/urssaf
 payroll_service_module/**
diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version
index f8112ebd44..25cd22b69c 100644
--- a/bt5/erp5_payroll/bt/version
+++ b/bt5/erp5_payroll/bt/version
@@ -1 +1 @@
-0.2.11
\ No newline at end of file
+0.2.12
\ No newline at end of file
-- 
2.30.9