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

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Mar 17 13:58:06 2009
New Revision: 26070

URL: http://svn.erp5.org?rev=26070&view=rev
Log:
update some scripts :
- typo
- fix some problems in PaySheetTransaction_getYearToDateSlice

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=26070&r1=26069&r2=26070&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] Tue Mar 17 13:58:06 2009
@@ -164,7 +164,7 @@
   if date:\n
     if paysheet.getProperty(\'default_payment_condition_payment_mode_title\'):\n
       return \'%s: %s\' % (translateString(\'Payment\'),\n
-          translateString(\'${payment_mode} at ${payment_date}\', \n
+          translateString(\'${payment_mode} at ${payment_date}\',\n
             mapping = {\'payment_mode\': paysheet.getProperty(\'default_payment_condition_payment_mode_title\'),\n
                        \'payment_date\':date}))\n
     else:\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=26070&r1=26069&r2=26070&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] Tue Mar 17 13:58:06 2009
@@ -68,48 +68,50 @@
 to_date=context.getStartDate()\n
 \n
 search_params = \\\n
-  { \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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
+   \'simulation_state\'    : [\'stopped\', \'delivered\'],\n
   }\n
 \n
-paysheet_list = accounting_module.searchFolder(**search_params)\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
-slice = model.getCell(slice_path)\n
-\n
-if not slice:\n
+slice = model.getCell(slice_path, paysheet=context)\n
+\n
+if slice is None:\n
   return 0.0\n
 \n
-plafond = slice.getQuantityRangeMax()\n
-\n
-gross_salary = context.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n
-    base_participation_list=(\'gross_salary\',),\n
-    category_list=\'tax_category/employee_share\')\n
-\n
-if gross_salary < plafond:\n
-  slice_amount = gross_salary\n
+plafond_max = slice.getQuantityRangeMax()\n
+plafond_min = slice.getQuantityRangeMin()\n
+\n
+gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
+    base_contribution=\'base_contribution/base_amount/gross_salary\',\n
+    tax_category=\'tax_category/employee_share\')\n
+\n
+if gross_salary < plafond_max:\n
+  slice_amount = gross_salary - plafond_min\n
 else:\n
-  slice_amount = plafond\n
+  slice_amount = plafond_max - plafond_min\n
 yearly_slice_amount += slice_amount\n
 \n
 for paysheet in paysheet_list :\n
   model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)\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
+    plafond_max = slice.getQuantityRangeMax()\n
+    plafond_min = slice.getQuantityRangeMin()\n
+    gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
+        base_contribution=\'base_contribution/base_amount/gross_salary\',\n
+        tax_category=\'tax_category/employee_share\')\n
     slice_amount = 0\n
-    if gross_salary < plafond:\n
-      slice_amount = gross_salary\n
+    if gross_salary < plafond_max:\n
+      slice_amount = gross_salary - plafond_min\n
     else:\n
-      slice_amount = plafond\n
+      slice_amount = plafond_max - plafond_min\n
     yearly_slice_amount += slice_amount\n
 \n
 return yearly_slice_amount\n
@@ -160,18 +162,22 @@
                             <string>from_date</string>
                             <string>to_date</string>
                             <string>search_params</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
                             <string>_apply_</string>
+                            <string>r</string>
                             <string>paysheet_list</string>
                             <string>yearly_slice_amount</string>
                             <string>model</string>
                             <string>slice</string>
-                            <string>plafond</string>
+                            <string>None</string>
+                            <string>plafond_max</string>
+                            <string>plafond_min</string>
                             <string>gross_salary</string>
                             <string>slice_amount</string>
                             <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=26070&r1=26069&r2=26070&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Tue Mar 17 13:58:06 2009
@@ -1,1 +1,1 @@
-96
+99