[Erp5-report] r21665 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun 17 18:01:00 2008
New Revision: 21665

URL: http://svn.erp5.org?rev=21665&view=rev
Log:
note about base_amount / base_application & base_contribution changes

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml?rev=21665&r1=21664&r2=21665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml Tue Jun 17 18:01:00 2008
@@ -65,11 +65,17 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>\'\'\'\n
+            <value> <string encoding="cdata"><![CDATA[
+
+\'\'\'\n
   return the amount composed by all amount of paysheet line wich category of\n
   category_list parameter is in variation_category_list of the PaySheet line \n
   and wich payroll service has a base_participation in the \n
   base_participation_list\n
+\n
+XXX this script needs refactoring, no need to get the base amount on the resource.\n
+It is now stored on the movement: see http://svn.erp5.org/?view=rev&revision=21660\n
+\n
 \'\'\'\n
 \n
 # test the list parameters\n
@@ -100,12 +106,18 @@
           for category in category_list:\n
             if category in pay_sheet_line.getVariationCategoryList():\n
               cell = pay_sheet_line.getCell(slice, category)\n
+              if cell is None:\n
+                context.log((pay_sheet_line, slice, category))\n
+                continue\n
               total_price = cell.getQuantity() * cell.getPrice()\n
               amount += total_price\n
       else:\n
         for category in category_list:\n
           if category in pay_sheet_line.getVariationCategoryList():\n
             cell = pay_sheet_line.getCell(category)\n
+            if cell is None:\n
+              context.log((pay_sheet_line, slice, category))\n
+              continue\n
             total_price = cell.getQuantity() * cell.getPrice()\n
             amount += total_price\n
         \n
@@ -114,7 +126,9 @@
 \n
 amount = round(amount, precision)\n
 return amount\n
-</string> </value>
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21665&r1=21664&r2=21665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Tue Jun 17 18:01:00 2008
@@ -1,1 +1,1 @@
-299
+300