From a5e36ec929a4758bb75853cfa36caa3b99d3a29f Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 12:35:13 +0530 Subject: [PATCH] [FIX] hr_payroll_l10n_be: change data file as per rename in fields names bzr revid: mra@tinyerp.com-20110916070513-v3oo3fhfcnk6dpfo --- .../hr_payroll_l10n_be_data.xml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml index c57e0a9118e..55448d40d2f 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml @@ -175,9 +175,9 @@ CAR 1 15 python - result = bool(contract.company_car_wkr) + result = bool(contract.car_employee_deduction) code - result = contract.company_car_wkr + result = contract.car_employee_deduction @@ -186,9 +186,9 @@ CAR 2 160 python - result = contract.company_car_wkr + result = contract.car_employee_deduction code - result = -contract.company_car_wkr + result = -contract.car_employee_deduction @@ -197,9 +197,9 @@ CAR 3 160 python - result = bool(contract.company_car_emp) + result = bool(contract.car_company_amount) code - result = -contract.company_car_emp + result = -contract.car_company_amount @@ -219,9 +219,9 @@ fix 165 code - result = -(contract.ch_value - contract.ch_worker) * worked_days.WORK100.number_of_days + result = -(contract.meal_voucher_amount - contract.meal_voucher_employee_deduction) * worked_days.WORK100.number_of_days python - result = bool(contract.ch_value) + result = bool(contract.meal_voucher_amount) @@ -231,10 +231,10 @@ Meal Check 165 python - result = bool(contract.ch_worker) + result = bool(contract.meal_voucher_employee_deduction) percentage -100.0 - contract.ch_worker + contract.meal_voucher_employee_deduction worked_days.WORK100.number_of_days @@ -245,8 +245,8 @@ code 65 python - result = bool(contract.reim_travel) - result = contract.reim_travel + result = bool(contract.travel_reimbursement_amount) + result = contract.travel_reimbursement_amount @@ -255,8 +255,8 @@ code 165 python - result = bool(contract.mis_ex_onss) - result = -contract.mis_ex_onss + result = bool(contract.misc_onss_deduction) + result = -contract.misc_onss_deduction @@ -265,8 +265,8 @@ code 165 python - result = bool(contract.insurance) - result = -contract.insurance + result = bool(contract.insurance_employee_deduction) + result = -contract.insurance_employee_deduction @@ -275,8 +275,8 @@ code 10 python - result = bool(contract.advantage) - result = contract.advantage + result = bool(contract.misc_advantage_amount) + result = contract.misc_advantage_amount @@ -285,8 +285,8 @@ code 185 python - result = bool(contract.suppl_net) - result = contract.suppl_net + result = bool(contract.additional_net_amount) + result = contract.additional_net_amount @@ -295,8 +295,8 @@ code 190 python - result = bool(contract.retained_net) - result = -contract.retained_net + result = bool(contract.retained_net_amount) + result = -contract.retained_net_amount C.P.218