[Erp5-report] r18613 - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: SkinTemplateItem/portal_ski...

[nobody at svn.erp5.org]

Author: fabien
Date: Mon Jan  7 14:33:01 2008
New Revision: 18613

URL: http://svn.erp5.org?rev=18613&view=rev
Log:
the slice amount will not be used on PaySheet who don't have any model in the YearToDateSlice script.
This case must not appear very often. Just on the old PaySheet (before or during the Upgrade). During the upgrade, a default model is set on the Pay Sheets.

Modified:
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml?rev=18613&r1=18612&r2=18613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml Mon Jan  7 14:33:01 2008
@@ -84,7 +84,7 @@
    \'portal_type\'         : \'Pay Sheet Transaction\',\n
    \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
    \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
-#   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
+   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
   }\n
 \n
 paysheet_list = accounting_module.searchFolder(**search_params)\n
@@ -107,17 +107,18 @@
 \n
 for paysheet in paysheet_list :\n
   model = paysheet.getSpecialiseValue()\n
-  slice = model.getCell(slice_path)\n
-  plafond = slice.getQuantityRangeMax()\n
-  gross_salary=paysheet.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n
-      base_participation_list=(\'gross_salary\',), \n
-      category_list=\'tax_category/employee_share\')\n
-  slice_amount = 0\n
-  if gross_salary < plafond:\n
-    slice_amount = gross_salary\n
-  else:\n
-    slice_amount = plafond\n
-  yearly_slice_amount += slice_amount\n
+  if model is not None:\n
+    slice = model.getCell(slice_path)\n
+    plafond = slice.getQuantityRangeMax()\n
+    gross_salary=paysheet.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n
+        base_participation_list=(\'gross_salary\',), \n
+        category_list=\'tax_category/employee_share\')\n
+    slice_amount = 0\n
+    if gross_salary < plafond:\n
+      slice_amount = gross_salary\n
+    else:\n
+      slice_amount = plafond\n
+    yearly_slice_amount += slice_amount\n
 \n
 return yearly_slice_amount\n
 
@@ -184,6 +185,7 @@
                             <string>_inplacevar_</string>
                             <string>_getiter_</string>
                             <string>paysheet</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision?rev=18613&r1=18612&r2=18613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision Mon Jan  7 14:33:01 2008
@@ -1,1 +1,1 @@
-57
+59