diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml index a7a254c490ef066f259354f4de18a44072115cc8..973ecca519fff353caeb9a09c9326c0062fce502 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml @@ -61,7 +61,7 @@ paysheet = context\n # copy categories\n category_list = [\n \'destination_section\', \'source_section\', \'source_payment\',\n - \'destination_payment\', \'price_currency\', \'ressource\',\n + \'destination_payment\', \'price_currency\',\n ]\n new_category_dict = {}\n \n @@ -88,6 +88,11 @@ for category in category_list:\n if v:\n new_category_dict[category] = v\n \n +# copy the price_currency into the ressource :\n +price_currency = getPropertyFromModel(model, category)\n +if price_currency:\n + new_category_dict[\'resource\'] = price_currency\n +\n def copyPaymentCondition(paysheet, model):\n filter_dict = {\'portal_type\': \'Payment Condition\'}\n to_copy = model.contentIds(filter=filter_dict)\n @@ -172,6 +177,7 @@ if not batch_mode:\n <string>category</string> <string>v</string> <string>_write_</string> + <string>price_currency</string> <string>copyPaymentCondition</string> <string>filter_dict</string> <string>list</string> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 52f6c1a7a0e6648b65c77f6cfff32f6b5034ee55..0a1b63de8b7729fb88b737257363f50fa7dd4e03 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -352 \ No newline at end of file +353 \ No newline at end of file