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

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Jan 29 11:22:21 2009
New Revision: 25363

URL: http://svn.erp5.org?rev=25363&view=rev
Log:
correct some problems :

* if there is no base_application category so the base_application is the quantity defined in the cell
* round the total_price using currency precision

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.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=25363&r1=25362&r2=25363&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 11:22:21 2009
@@ -76,12 +76,12 @@
 else:\n
   tax_category = None\n
 \n
-if base_amount_dict:\n
-  # get the application amount for this cell\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
+# get the application amount for this cell\n
+for base in cell.getBaseApplicationList():\n
+  if base_amount_dict.has_key(base):\n
+    base_application += base_amount_dict[base][tax_category]\n
+if not len(cell.getBaseApplicationList()):\n
+  base_application = quantity\n
 \n
 salary_range_list = cell.getVariationCategoryList(\\\n
     base_category_list=\'salary_range\')\n
@@ -170,8 +170,8 @@
                             <string>_getiter_</string>
                             <string>base</string>
                             <string>_inplacevar_</string>
+                            <string>len</string>
                             <string>salary_range_list</string>
-                            <string>len</string>
                             <string>salary_range</string>
                             <string>model_slice_min</string>
                             <string>model_slice_max</string>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml?rev=25363&r1=25362&r2=25363&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] Thu Jan 29 11:22:21 2009
@@ -75,10 +75,8 @@
                   \'base\',\n
                   \'employer_share_price\',\n
                   \'employer_share_quantity\',\n
-                  \'employer_share_total_price\',\n
                   \'employee_share_price\',\n
                   \'employee_share_quantity\',\n
-                  \'employee_share_total_price\',\n
                   \'causality\',\n
                 ]\n
 for line in line_list: \n
@@ -88,7 +86,9 @@
       \'group\'  : line.getSourceSectionTitle(),\n
       \'source_section_title\': line.getSourceSectionTitle(),\n
       \'title\'  : line.getTitle(),\n
-      \'payroll_service\' : getattr(line, \'payroll_service\', None)\n
+      \'payroll_service\' : getattr(line, \'payroll_service\', None),\n
+      \'employer_share_total_price\' : round(getattr(line, \'employer_share_total_price\', 0), precision) or None,\n
+      \'employee_share_total_price\' : round(getattr(line, \'employee_share_total_price\', 0), precision) or None\n
       }\n
 \n
   addProperties(line=line, line_dict=line_dict, property_list=property_list)\n
@@ -145,6 +145,7 @@
                             <string>line</string>
                             <string>getattr</string>
                             <string>None</string>
+                            <string>round</string>
                             <string>line_dict</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25363&r1=25362&r2=25363&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Thu Jan 29 11:22:21 2009
@@ -1,1 +1,1 @@
-344
+345