From 13b4deaa7fd079d3a839864148188016e1eb523b Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Fri, 27 Oct 2006 13:17:10 +0000
Subject: [PATCH] Fix french taxes calculation.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10988 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../payroll_service_module/solidarity_day.xml |  1 +
 ...ransaction_preCalculation_l10n_fr_2006.xml | 21 ++++++++++---------
 bt5/erp5_payroll/bt/revision                  |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml
index 9ace25e669..324694c987 100644
--- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml
@@ -84,6 +84,7 @@
                 <string>tax_category/social/employer_share</string>
                 <string>quantity_unit/time/month</string>
                 <string>product_line/social_service/state_insurance</string>
+                <string>source/organisation_module/urssaf</string>
               </tuple>
             </value>
         </item>
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 0111bb98c4..41c6b2e794 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
@@ -411,16 +411,17 @@ if executive:\n
 #   }\n
 \n
 # APEC forfaitaire\n
-# This contribution is due for March only\n
-comp_date = DateTime(start_date.year(), 3, 31)\n
-while comp_date < comp_date:\n
-  comp_date = DateTime(comp_date.year() + 1, 3, 31)\n
-if executive and start_date <= comp_date <= stop_date:\n
-  kw[\'apec/forfait\'] = \\\n
-  { \'employer_share\': 3.72\n
-  , \'employee_share\': 2.49\n
-  , \'base\'          : 1.0\n
-  }\n
+if executive:\n
+  # This contribution is due for March only\n
+  comp_date = DateTime(start_date.year(), 3, 31)\n
+  while comp_date < comp_date:\n
+    comp_date = DateTime(comp_date.year() + 1, 3, 31)\n
+  if start_date <= comp_date <= stop_date:\n
+    kw[\'apec/forfait\'] = \\\n
+    { \'employer_share\': 3.72\n
+    , \'employee_share\': 2.49\n
+    , \'base\'          : 1.0\n
+    }\n
   if salary_slices.has_key(\'B\'):\n
     kw[\'apec/tranche_b\'] = \\\n
     { \'employer_share\': 0.036\n
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index 8306ec157b..b9c6c007cc 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-130
\ No newline at end of file
+131
\ No newline at end of file
-- 
2.30.9