diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml index eb253da2fc95dc58d9873ed8b97e8ed2829ae283..6d5e84063ecf5539857d534e08cdc5c31b424b45 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml @@ -76,12 +76,12 @@ if tax_category_list != []:\n 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 @@ return {\'quantity\':quantity, \'price\':price}\n <string>_getiter_</string> <string>base</string> <string>_inplacevar_</string> - <string>salary_range_list</string> <string>len</string> + <string>salary_range_list</string> <string>salary_range</string> <string>model_slice_min</string> <string>model_slice_max</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml index 72be93570075c12683c63211e86838ec5de10e8c..81067e4458fd0ba730886c4651fc8b48afc97ba9 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml @@ -75,10 +75,8 @@ property_list = [ \'slice\',\n \'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 @@ for line in line_list: \n \'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 @@ return line_dict_list\n <string>line</string> <string>getattr</string> <string>None</string> + <string>round</string> <string>line_dict</string> </tuple> </value> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index fc72547e33638e38bf14b4f33418739eef2dcd3a..5ca234cb538117d188296311c2d9abaf364c847c 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -344 \ No newline at end of file +345 \ No newline at end of file