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

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Jan 29 10:33:45 2009
New Revision: 25359

URL: http://svn.erp5.org?rev=25359&view=rev
Log:
check for the slices only if there is a salary_range category defined on the cell, else quantity=base_application. This permit to use negative amount in the paysheet wtih line wich have no slices

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=25359&r1=25358&r2=25359&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml [utf8] Thu Jan 29 10:33:45 2009
@@ -78,8 +78,7 @@
 \n
 if base_amount_dict:\n
   # get the application amount for this cell\n
-  model_line = cell.getParentValue()\n
-  for base in model_line.getBaseApplicationList():\n
+  for base in cell.getBaseApplicationList():\n
     if base_amount_dict.has_key(base):\n
       base_application += base_amount_dict[base][tax_category]\n
 \n
@@ -87,7 +86,7 @@
 salary_range_list = cell.getVariationCategoryList(\\\n
     base_category_list=\'salary_range\')\n
 if len(salary_range_list):\n
-  salary_range = salary_range_list[0] # a slice can have only one salary_range\n
+  salary_range = salary_range_list[0] # a cell can have only one salary_range\n
                                       # category\n
 else:\n
   salary_range = None\n
@@ -104,14 +103,16 @@
     model_slice_min = cell.getQuantityRangeMin()\n
     model_slice_max = cell.getQuantityRangeMax()\n
 \n
-\n
-if not quantity and base_application-model_slice_min>0:\n
-  if base_application <= model_slice_max:\n
-    quantity = base_application-model_slice_min\n
-  elif model_slice_max:\n
-    quantity = model_slice_max-model_slice_min\n
-  else:\n
-    quantity = base_application\n
+  if not quantity and base_application-model_slice_min>0:\n
+    if base_application <= model_slice_max:\n
+      quantity = base_application-model_slice_min\n
+    elif model_slice_max:\n
+      quantity = model_slice_max-model_slice_min\n
+    else:\n
+      quantity = base_application\n
+\n
+else:\n
+  quantity = base_application\n
 \n
 return {\'quantity\':quantity, \'price\':price}\n
 

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25359&r1=25358&r2=25359&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Thu Jan 29 10:33:45 2009
@@ -1,1 +1,1 @@
-343
+344