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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun  2 14:53:05 2008
New Revision: 21266

URL: http://svn.erp5.org?rev=21266&view=rev
Log:
If a model line is editable, the default script should returns user-supplied values unconditionally

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

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml?rev=21266&r1=21265&r2=21266&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml Mon Jun  2 14:53:05 2008
@@ -68,6 +68,16 @@
             <value> <string encoding="cdata"><![CDATA[
 
 precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
+\n
+quantity = cell.getQuantity() or 0\n
+price = cell.getPrice() or 0\n
+\n
+model_line = cell.getParentValue()\n
+\n
+if model_line.isEditable():\n
+  return dict(quantity=quantity,\n
+              price=price)\n
+\n
 base_application = 0\n
 tax_category_list = cell.getVariationCategoryList(base_category_list= \\\n
     \'tax_category\')\n
@@ -82,8 +92,6 @@
   for base in model_line.getBaseAmountList(base=1):\n
     if base_amount_dict.has_key(base):\n
       base_application += base_amount_dict[base][tax_category]\n
-quantity = cell.getQuantity() or 0\n
-price = cell.getPrice() or 0\n
 \n
 \n
 salary_range_list = cell.getVariationCategoryList(\\\n
@@ -171,17 +179,18 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>precision</string>
+                            <string>quantity</string>
+                            <string>price</string>
+                            <string>model_line</string>
+                            <string>dict</string>
                             <string>base_application</string>
                             <string>tax_category_list</string>
                             <string>_getitem_</string>
                             <string>tax_category</string>
                             <string>None</string>
-                            <string>model_line</string>
                             <string>_getiter_</string>
                             <string>base</string>
                             <string>_inplacevar_</string>
-                            <string>quantity</string>
-                            <string>price</string>
                             <string>salary_range_list</string>
                             <string>len</string>
                             <string>salary_range</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21266&r1=21265&r2=21266&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Mon Jun  2 14:53:05 2008
@@ -1,1 +1,1 @@
-242
+245