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

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Jul  9 13:25:45 2009
New Revision: 28038

URL: http://svn.erp5.org?rev=28038&view=rev
Log:
getEffectiveModel call was not good since the parameter changes. Update all calls

Modified:
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
    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_getOtherInformationsDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml?rev=28038&r1=28037&r2=28038&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] Thu Jul  9 13:25:45 2009
@@ -57,7 +57,9 @@
 request = context.REQUEST\n
 quantity_renderer = context.Base_viewFieldLibrary.my_money_quantity.render_pdf\n
 \n
-model = context.getSpecialiseValue().getEffectiveModel(context)\n
+model = context.getSpecialiseValue().getEffectiveModel(\\\n
+    start_date=context.getStartDate(),\n
+    stop_date=context.getStopDate())\n
 \n
 def getFieldAsString(field):\n
   return \', \'.join(getFieldAsLineList(field))\n

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=28038&r1=28037&r2=28038&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] Thu Jul  9 13:25:45 2009
@@ -59,27 +59,26 @@
   This script get year to date amount for the slice corresponding to slice_path\n
   of the model.\n
 \'\'\'\n
-\n
-\n
 portal = context.getPortalObject()\n
 accounting_module = portal.accounting_module\n
 \n
 from_date=DateTime(context.getStartDate().year(), 1, 1)\n
 to_date=context.getStartDate()\n
 \n
-search_params = \\\n
-  {\n
-   \'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\'    : [\'stopped\', \'delivered\'],\n
-  }\n
+search_params = {\n
+    \'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\'    : [\'stopped\', \'delivered\'],\n
+}\n
 \n
 paysheet_list = [r.getObject() for r in accounting_module.searchFolder(**search_params)]\n
 \n
 yearly_slice_amount = 0\n
 # get the slice value for this paysheet :\n
-model = context.getSpecialiseValue().getEffectiveModel(context)\n
+model = context.getSpecialiseValue().getEffectiveModel(\\\n
+    start_date=context.getStartDate(),\n
+    stop_date=context.getStopDate())\n
 slice = model.getCell(slice_path, paysheet=context)\n
 \n
 if slice is None:\n
@@ -99,7 +98,9 @@
 yearly_slice_amount += slice_amount\n
 \n
 for paysheet in paysheet_list :\n
-  model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)\n
+  model = paysheet.getSpecialiseValue().getEffectiveModel(\\\n
+      start_date=paysheet.getStartDate(),\n
+      stop_date=paysheet.getStopDate())\n
   if model is not None:\n
     slice = model.getCell(slice_path)\n
     plafond_max = slice.getQuantityRangeMax()\n

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=28038&r1=28037&r2=28038&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Thu Jul  9 13:25:45 2009
@@ -1,1 +1,1 @@
-104
+106