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

[nobody at svn.erp5.org]

Author: fabien
Date: Mon Mar 16 17:30:25 2009
New Revision: 26054

URL: http://svn.erp5.org?rev=26054&view=rev
Log:
use new method from PaySheetModel class

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=26054&r1=26053&r2=26054&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] Mon Mar 16 17:30:25 2009
@@ -57,17 +57,7 @@
 request = context.REQUEST\n
 quantity_renderer = context.Base_viewFieldLibrary.my_money_quantity.render_pdf\n
 \n
-model = context.getSpecialiseValue()\n
-def getPropertyFromModel(model, property_name):\n
-  """Get a property from the paysheet model, or from a specialised model.\n
-  """\n
-  v = model.getProperty(property_name)\n
-  if v:\n
-    return v\n
-  for specialised_model in model.getSpecialiseValueList():\n
-    v = getPropertyFromModel(specialised_model, property_name)\n
-    if v:\n
-      return v\n
+model = context.getSpecialiseValue().getEffectiveModel(context)\n
 \n
 def getFieldAsString(field):\n
   return \', \'.join(getFieldAsLineList(field))\n
@@ -211,9 +201,6 @@
     base_contribution=\'base_contribution/base_amount/overtime\', \\\n
     tax_category=\'tax_category/employee_share\') or 0\n
 \n
-salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
-    base_contribution=\'base_contribution/base_amount/salaire_net_imposable\',\n
-    tax_category=\'tax_category/employee_share\')\n
 year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
     paysheet=context, base_contribution_list=\'salaire_net_imposable\') + salaire_net_imposable\n
 \n
@@ -247,7 +234,7 @@
   \'price_currency\': getPriceCurrencyId(context.getPriceCurrencyReference() or \'\'),\n
   \'year\': str(context.getStartDate() is not None and context.getStartDate().year() or \'\'),\n
   \'description\': getFieldAsLineList(context.getDescription() or\n
-                 getPropertyFromModel(model, \'description\') or \'\'),\n
+                 model.getModelIneritanceEffectiveProperty(context, \'description\') or \'\'),\n
   \'year_to_date_gross_salary\': year_to_date_gross_salary,\n
   \'year_to_date_slice_a\': year_to_date_slice_a,\n
   \'year_to_date_worked_hour_count\': year_to_date_worked_hour_count,\n
@@ -306,7 +293,6 @@
                             <string>request</string>
                             <string>quantity_renderer</string>
                             <string>model</string>
-                            <string>getPropertyFromModel</string>
                             <string>getFieldAsLineList</string>
                             <string>getFieldAsString</string>
                             <string>getSocialCodeId</string>

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=26054&r1=26053&r2=26054&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] Mon Mar 16 17:30:25 2009
@@ -79,7 +79,7 @@
 \n
 yearly_slice_amount = 0\n
 # get the slice value for this paysheet :\n
-model = context.getSpecialiseValue()\n
+model = context.getSpecialiseValue().getEffectiveModel(context)\n
 slice = model.getCell(slice_path)\n
 \n
 if not slice:\n
@@ -98,7 +98,7 @@
 yearly_slice_amount += slice_amount\n
 \n
 for paysheet in paysheet_list :\n
-  model = paysheet.getSpecialiseValue()\n
+  model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)\n
   if model is not None:\n
     slice = model.getCell(slice_path)\n
     plafond = 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=26054&r1=26053&r2=26054&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Mon Mar 16 17:30:25 2009
@@ -1,1 +1,1 @@
-93
+96