[Erp5-report] r10988 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/payroll_service_mo...

[nobody at svn.erp5.org]

Author: kevin
Date: Fri Oct 27 15:17:10 2006
New Revision: 10988

URL: http://svn.erp5.org?rev=10988&view=rev
Log:
Fix french taxes calculation.

Modified:
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml?rev=10988&r1=10987&r2=10988&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/solidarity_day.xml Fri Oct 27 15:17:10 2006
@@ -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>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml?rev=10988&r1=10987&r2=10988&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml Fri Oct 27 15:17:10 2006
@@ -411,16 +411,17 @@
 #   }\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

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=10988&r1=10987&r2=10988&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Oct 27 15:17:10 2006
@@ -1,1 +1,1 @@
-130
+131