2009-03-10 fabien

* rename salaire_net_imposabe base_amount into taxable_net_pay
* add a macro used to display localised information in a part of the payslip
* increment version number because of the new style of the payslip

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25934 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/taxable_net_pay.xml

@@ -13,7 +13,8 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>base_amount/salaire_net_imposable</string>
+                <string>base_amount/taxable_net_pay</string>
+                <string>base_amount/taxable_net_pay</string>
               </tuple>
             </value>
         </item>
@@ -31,7 +32,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>salaire_net_imposable</string> </value>
+            <value> <string>taxable_net_pay</string> </value>
         </item>
         <item>
             <key> <string>int_index</string> </key>
@@ -49,7 +50,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Salaire net imposable</string> </value>
+            <value> <string>Taxable Net Pay</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml

@@ -83,7 +83,7 @@ model = context.getSpecialiseValue()\n
 slice = model.getCell(slice_path)\n
 \n
 if not slice:\n
-  return None\n
+  return 0.0\n
 \n
 plafond = slice.getQuantityRangeMax()\n
 \n
@@ -165,13 +165,13 @@ return yearly_slice_amount\n
                             <string>yearly_slice_amount</string>
                             <string>model</string>
                             <string>slice</string>
-                            <string>None</string>
                             <string>plafond</string>
                             <string>gross_salary</string>
                             <string>slice_amount</string>
                             <string>_inplacevar_</string>
                             <string>_getiter_</string>
                             <string>paysheet</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_payroll_l10n_fr/bt/change_log

+2009-03-10 fabien
+* rename salaire_net_imposabe base_amount into taxable_net_pay
+* add a macro used to display localised information in a part of the payslip
+* increment version number because of the new style of the payslip
+
 2009-01-28 fabien
 * add salaire_net_imposable base_amount category
 

bt5/erp5_payroll_l10n_fr/bt/revision

-79
+84
\ No newline at end of file

bt5/erp5_payroll_l10n_fr/bt/template_path_list

 portal_categories/base_amount/base_csg
-portal_categories/base_amount/salaire_net_imposable
+portal_categories/base_amount/taxable_net_pay
 portal_categories/salary_range/france
 portal_categories/salary_range/france/tranche_1
 portal_categories/salary_range/france/tranche_2

bt5/erp5_payroll_l10n_fr/bt/version

-0.1
+0.2
\ No newline at end of file