diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml index e47c1d2e72c727ba9f436201b62db5bcd637fd13..6d98e4c5e88e0fd5dfe75703433107678a3fc0d2 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml @@ -140,6 +140,7 @@ for service in paysheet_services:\n , \'employer_share\': None\n , \'employee_share\': None\n , \'base\' : None\n + , \'description\' : None\n }\n \n \n @@ -190,6 +191,7 @@ for line in updated_listbox:\n employee_share = line[\'employee_share\']\n employer_share = line[\'employer_share\']\n base = line[\'base\']\n + description = line[\'description\']\n if salary_range not in [None, \'\'] and \\\n service_id not in [None, \'\'] and \\\n base not in [None, \'\'] and \\\n @@ -201,6 +203,7 @@ for line in updated_listbox:\n new_dict = { \'employer_share\': employer_share\n , \'employee_share\': employee_share\n , \'base\' : base\n + , \'description\' : description\n }\n update_kw[line_uid] = new_dict\n \n @@ -264,6 +267,7 @@ for (preview_line_id, preview_line_item) in pre_calculation.items():\n , salary_range = salary_range\n , salary_range_title = context.portal_categories.resolveCategory(salary_range).getTitleOrId()\n , tax_category = preview_line_item[\'tax_categories\']\n + , description = preview_line_item[\'description\']\n )\n preview_line_list.append(o)\n \n @@ -365,6 +369,7 @@ return preview_line_list\n <string>employee_share</string> <string>employer_share</string> <string>base</string> + <string>description</string> <string>salary_range_id</string> <string>line_uid</string> <string>new_dict</string> diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index 7801ca415ff9458bd6c79c03e1062e8252adc622..6162e86e1bae1dbe2a2d84dc05e28d5788cad44d 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,7 +1,8 @@ 2006-10-25 Kevin * Do not define base category twice. * New portal types and forms dedicated to Payroll Service. -* Migration of all old service to the new Payroll Servicetype. +* Migration of all old service to the new Payroll Service type. +* Take care of description on preview update. 2006-10-24 Kevin * So much things changed since the 0.1 version. Bump version to 0.2. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 27a37eb577dd83f8d4da502a4c1cacd0d7dbcb83..90be1cdd8eeee919ebb35a1efddcfa95776fb98a 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -93 \ No newline at end of file +95 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version index f4778493c50025c6ab147a1fec7486ef0c706792..373f8c6f0736a76e3ee364924ec58066832441d9 100644 --- a/bt5/erp5_payroll/bt/version +++ b/bt5/erp5_payroll/bt/version @@ -1 +1 @@ -0.2.2 \ No newline at end of file +0.2.3 \ No newline at end of file