From dd89fa507a8ae1cd0628a1d92d971bf882afcb8d Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Thu, 15 Sep 2011 12:38:36 +0530 Subject: [PATCH 1/8] [IMP] hr_payroll_l10n_be: improve field names and its views bzr revid: mra@tinyerp.com-20110915070836-bolruglfrs66nzvk --- addons/hr_payroll_l10n_be/__init__.py | 4 +- .../hr_payroll_l10n_be/hr_payroll_l10n_be.py | 46 ++++++++---------- .../hr_payroll_l10n_be_view.xml | 48 ++++++++++--------- 3 files changed, 48 insertions(+), 50 deletions(-) diff --git a/addons/hr_payroll_l10n_be/__init__.py b/addons/hr_payroll_l10n_be/__init__.py index 61db034b52c..6cd8d361545 100644 --- a/addons/hr_payroll_l10n_be/__init__.py +++ b/addons/hr_payroll_l10n_be/__init__.py @@ -19,5 +19,5 @@ # ############################################################################## import hr_payroll_l10n_be -import hr_contract -import hr_payroll + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py index 3c98e99cd71..5771bc1cd4c 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py @@ -20,44 +20,40 @@ # ############################################################################## -import time -from datetime import date -from datetime import datetime -from datetime import timedelta - -import netsvc from osv import fields, osv -import tools -from tools.translate import _ import decimal_precision as dp - - class hr_contract_be(osv.osv): _inherit = 'hr.contract' + _description = 'HR Contract' _columns = { - 'reim_travel':fields.float('Reimbursement of travel expenses', digits=(16,2)), - 'company_car_emp':fields.float('Company car employer', digits=(16,2)), - 'company_car_wkr':fields.float('Company Car Deduction for Worker', digits=(16,2)), - 'mis_ex_onss':fields.float('Miscellaneous exempt ONSS ', digits=(16,2)), - 'ch_value':fields.float('Check Value Meal ', digits=(16,2)), - 'ch_worker':fields.float('Check Value Meal - by worker ', digits=(16,2)), - 'insurance':fields.float('Insurance Group - by worker ', digits=(16,2)), - 'advantage':fields.float('Benefits of various nature ', digits=(16,2)), - 'suppl_net':fields.float('Net supplements', digits=(16,2)), - 'retained_net':fields.float('Net retained ', digits=(16,2)), + 'travel_reimbursement_amount':fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')), + 'car_company_amount':fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')), + 'car_employee_deduction':fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')), + 'misc_onss_deduction':fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')), + 'meal_voucher_amount':fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')), + 'meal_voucher_employee_deduction':fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')), + 'insurance_employee_deduction':fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')), + 'misc_advantage_amount':fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')), + 'additional_net_amount':fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')), + 'retained_net_amount':fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')), } + hr_contract_be() class hr_employee_be(osv.osv): _inherit = 'hr.employee' + _description = 'Employee' _columns = { - 'statut_fiscal':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), - 'handicap':fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"), - 'handicap_child':fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"), - 'resident':fields.boolean('Nonresident', help="if recipient lives in a foreign country"), - 'number_handicap':fields.integer('Number of disabled children'), + 'spouse_fiscal_status':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), + 'disabled_spouse_bool':fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"), + 'disabled_children_bool':fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"), + 'resident_bool':fields.boolean('Nonresident', help="if recipient lives in a foreign country"), + 'disabled_children_number':fields.integer('Number of disabled children'), } + hr_employee_be() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml index c4dca86166d..9135499f7bc 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml @@ -1,7 +1,8 @@ - + + hr.contract.form.inherit hr.contract form @@ -10,29 +11,29 @@ - - - - - + + + + + - - + + - - - + + + - - hr.employee.employee.inherit.form + - - hr.hr.employee.view.for + + hr.employee.inherit.form hr.employee 30 - + - + - - + + - - + + + From b6694222637f54d8e15174c3eb06a3eb910768cb Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Thu, 15 Sep 2011 12:46:41 +0530 Subject: [PATCH 2/8] [REF] bzr revid: mra@tinyerp.com-20110915071641-jlm4gq9ex0u8ljbc --- addons/hr_payroll_l10n_be/__openerp__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_payroll_l10n_be/__openerp__.py b/addons/hr_payroll_l10n_be/__openerp__.py index b9f887f3ff8..1dfb504dc2d 100644 --- a/addons/hr_payroll_l10n_be/__openerp__.py +++ b/addons/hr_payroll_l10n_be/__openerp__.py @@ -23,7 +23,7 @@ 'category': 'payroll', 'init_xml':[], 'author': 'OpenERP', - 'depends': ['hr_payroll','hr_contract'], + 'depends': ['hr_payroll'], 'version': '1.0', 'description': """ Belgian Payroll system. @@ -51,3 +51,5 @@ Belgian Payroll system. ], 'installable': True } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fee12ec43f1b51dab357cd3dde21fe73be56f0ff Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 12:06:52 +0530 Subject: [PATCH 3/8] [FIX] hr_payroll_l10n_be: Change the field name on demo file too + remove _description from class bzr revid: mra@tinyerp.com-20110916063652-cpkgel58l2z7feuk --- addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py | 2 -- addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py index 5771bc1cd4c..c9756adada3 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py @@ -25,7 +25,6 @@ import decimal_precision as dp class hr_contract_be(osv.osv): _inherit = 'hr.contract' - _description = 'HR Contract' _columns = { 'travel_reimbursement_amount':fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')), @@ -44,7 +43,6 @@ hr_contract_be() class hr_employee_be(osv.osv): _inherit = 'hr.employee' - _description = 'Employee' _columns = { 'spouse_fiscal_status':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml index c9e284f8e9b..5e3170ca24e 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml @@ -7,11 +7,11 @@ Bonamy's Contract (Belgium payroll C.P. 218) - - - - - + + + + + From a5e36ec929a4758bb75853cfa36caa3b99d3a29f Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 12:35:13 +0530 Subject: [PATCH 4/8] [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 From 704e10866641f08fb6709922fb98004f0816191b Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 13:00:12 +0530 Subject: [PATCH 5/8] [REF] change data file as per change in employee obj field names bzr revid: mra@tinyerp.com-20110916073012-xn9ilhk6gn9ml3gk --- addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 55448d40d2f..a32e59ee1e1 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 @@ -81,7 +81,7 @@ 120 python - result = (((employee.marital=='single') or (employee.marital=='married' and employee.statut_fiscal=='with income')) and (employee.resident!=True)) + result = (((employee.marital=='single') or (employee.marital=='married' and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True)) @@ -92,7 +92,7 @@ 120 python - result = ((employee.marital=='married' and employee.statut_fiscal=='without income') and (employee.resident!=True)) + result = ((employee.marital=='married' and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True)) @@ -102,7 +102,7 @@ fix 120 python - result = employee.resident==True + result = employee.resident_bool==True @@ -147,7 +147,7 @@ the child that is established, regardless of age, that due to developments and recognized before age 65 python - result = bool(employee.number_handicap) + result = bool(employee.disabled_children_number) @@ -157,7 +157,7 @@ 145 31 python - result = employee.handicap==True + result = employee.disabled_spouse_bool==True From 3d38c943df32a1f922c9993c275d243fa970fe2d Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 14:12:21 +0530 Subject: [PATCH 6/8] [REF] bzr revid: mra@tinyerp.com-20110916084221-d3f6bxvldj5xi0ye --- addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a32e59ee1e1..8c2d5406354 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 @@ -35,7 +35,7 @@ - + Premium pay 108% Worker From 61f25380bf472202e440a364ef535406361aff5b Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 14:33:34 +0530 Subject: [PATCH 7/8] [FIX] bzr revid: mra@tinyerp.com-20110916090334-5v6npyosefd7b00z --- .../data/hr.salary.rule.csv | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv b/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv index a73749674a9..6351ccc31af 100644 --- a/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv +++ b/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv @@ -1422,13 +1422,13 @@ 1418,"fix",9,9,,1452,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children", 1419,"fix",10,10,,1673,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children", ,,,,,,,,,,,,, -1420,"fix",1,1,,85,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1421,"fix",2,2,,418,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1422,"fix",3,3,,817,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1423,"fix",4,4,,1231,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1424,"fix",5,5,,1673,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1425,"fix",6,6,,2115,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1426,"fix",7,7,,2557,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1427,"fix",8,8,,2999,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1428,"fix",9,9,,3441,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", -1429,"fix",10,10,,3883,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap", +1420,"fix",1,1,,85,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1421,"fix",2,2,,418,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1422,"fix",3,3,,817,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1423,"fix",4,4,,1231,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1424,"fix",5,5,,1673,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1425,"fix",6,6,,2115,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1426,"fix",7,7,,2557,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1427,"fix",8,8,,2999,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1428,"fix",9,9,,3441,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", +1429,"fix",10,10,,3883,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number", From 7ee136e0886d43e14a83779d33d2f0fefd65b59f Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 16 Sep 2011 15:18:30 +0530 Subject: [PATCH 8/8] [REF] bzr revid: mra@tinyerp.com-20110916094830-t8v1heof774zjxsq --- .../hr_payroll_l10n_be/hr_payroll_l10n_be.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py index c9756adada3..014787f850e 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py @@ -27,16 +27,16 @@ class hr_contract_be(osv.osv): _inherit = 'hr.contract' _columns = { - 'travel_reimbursement_amount':fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')), - 'car_company_amount':fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')), - 'car_employee_deduction':fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')), - 'misc_onss_deduction':fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')), - 'meal_voucher_amount':fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')), - 'meal_voucher_employee_deduction':fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')), - 'insurance_employee_deduction':fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')), - 'misc_advantage_amount':fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')), - 'additional_net_amount':fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')), - 'retained_net_amount':fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')), + 'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')), + 'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')), + 'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')), + 'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')), + 'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')), + 'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')), + 'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')), + 'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')), + 'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')), + 'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')), } hr_contract_be() @@ -45,11 +45,11 @@ class hr_employee_be(osv.osv): _inherit = 'hr.employee' _columns = { - 'spouse_fiscal_status':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), - 'disabled_spouse_bool':fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"), - 'disabled_children_bool':fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"), - 'resident_bool':fields.boolean('Nonresident', help="if recipient lives in a foreign country"), - 'disabled_children_number':fields.integer('Number of disabled children'), + 'spouse_fiscal_status': fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), + 'disabled_spouse_bool': fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"), + 'disabled_children_bool': fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"), + 'resident_bool': fields.boolean('Nonresident', help="if recipient lives in a foreign country"), + 'disabled_children_number': fields.integer('Number of disabled children'), } hr_employee_be()