[Erp5-report] r10786 - /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payr...

[nobody at svn.erp5.org]

Author: kevin
Date: Tue Oct 17 18:22:02 2006
New Revision: 10786

URL: http://svn.erp5.org?rev=10786&view=rev
Log:
Update some contributions

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml

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=10786&r1=10785&r2=10786&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 Tue Oct 17 18:22:02 2006
@@ -477,18 +477,26 @@
   , \'base\'          : ceiling_salary\n
   }\n
 \n
-# Add blank lines for wickness holding (= retenue maladie) and pay bonus (= primes).\n
+# Add blank lines for:\n
+#   * wickness holding (= retenue maladie)\n
+#   * pay bonus (= primes)\n
+#   * non-working days (= absences)\n
 # Thanks to this, the accountant has the freedom to add the missing amount of money\n
 #   that this script can\'t guess.\n
-default[\'retenue_maladie/salaire_brut\'] = \\\n
+default[\'retenue_maladie/forfait\'] = \\\n
 { \'employer_rate\' : None\n
 , \'employee_rate\' : None\n
-, \'base\'          : gross_salary\n
-}\n
-default[\'primes/salaire_brut\'] = \\\n
+, \'base\'          : 100.0\n
+}\n
+default[\'primes/forfait\'] = \\\n
 { \'employer_rate\' : None\n
 , \'employee_rate\' : None\n
-, \'base\'          : gross_salary\n
+, \'base\'          : 100.0\n
+}\n
+default[\'absences/forfait\'] = \\\n
+{ \'employer_rate\' : None\n
+, \'employee_rate\' : None\n
+, \'base\'          : 100.0\n
 }\n
 \n
 # Also add a brand new line for "Reduction Fillon", a negative contribution.\n
@@ -520,6 +528,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>