From 7046c84d8744e4a6d613d7cc459a3726e20fbc9b Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 13 Sep 2011 09:59:06 +0200 Subject: [PATCH] [IMP] hr_payroll_l10n_be: replaced tabs with 4 spaces and corrected identation on xml files bzr revid: qdp-launchpad@openerp.com-20110913075906-bk8zt2x3xry9141e --- addons/hr_payroll_l10n_be/__openerp__.py | 6 +- .../hr_payroll_l10n_be/hr_payroll_l10n_be.py | 32 +- .../hr_payroll_l10n_be_data.xml | 619 ++++++++---------- .../hr_payroll_l10n_be_view.xml | 94 ++- 4 files changed, 349 insertions(+), 402 deletions(-) diff --git a/addons/hr_payroll_l10n_be/__openerp__.py b/addons/hr_payroll_l10n_be/__openerp__.py index c428da765d5..6bfbd13e8c4 100644 --- a/addons/hr_payroll_l10n_be/__openerp__.py +++ b/addons/hr_payroll_l10n_be/__openerp__.py @@ -43,9 +43,9 @@ Belgian Payroll system. 'active': False, 'demo_xml': [], 'update_xml':[ - 'hr_payroll_l10n_be_view.xml', - 'hr_payroll_l10n_be_data.xml', - 'data/hr.salary.rule.csv', + 'hr_payroll_l10n_be_view.xml', + 'hr_payroll_l10n_be_data.xml', + 'data/hr.salary.rule.csv', ], 'installable': True } 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 0dd0fcf5ac3..27b1801657e 100644 --- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py +++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py @@ -39,18 +39,18 @@ class hr_contract_be(osv.osv): _description = 'Add for belgium users' _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)), -# 'vol_tax':fields.float('Voluntary tax ', digits=(16,2)), -# 'horaire_effectif': fields.many2one('resource.calendar','Actual Work', help="Hours of work means the actual working time elapsing between the beginning and end of the workday, regardless of where it runs, excluding the stop work devoted to meals, breaks and, more generally, any interruptions between 2 sequences of work that are not actually worked since the employee can go freely about his personal affairs"), + '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)), +# 'vol_tax':fields.float('Voluntary tax ', digits=(16,2)), +# 'horaire_effectif': fields.many2one('resource.calendar','Actual Work', help="Hours of work means the actual working time elapsing between the beginning and end of the workday, regardless of where it runs, excluding the stop work devoted to meals, breaks and, more generally, any interruptions between 2 sequences of work that are not actually worked since the employee can go freely about his personal affairs"), } hr_contract_be() @@ -60,10 +60,10 @@ class hr_employee_be(osv.osv): _inherit = 'hr.employee' _description = 'add for all Belgian users' _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"), + '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'), + 'resident':fields.boolean('Nonresident', help="if recipient lives in a foreign country"), + 'number_handicap':fields.integer('Number of disabled children'), } hr_employee_be() 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 2c0040eddbd..16340f39e1a 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 @@ -1,351 +1,306 @@ - - Premium pay 108% Worker - MAJ - + + Premium pay 108% Worker + MAJ + + + Employee Salary + NON-MAJ + + + Office National Securite Sociale + ONSS + + + + Precompte Professionnel Bareme 2011 + P.P. + + + + Company car + C.C. + + + + Child Allowance Belgium + Ch.A + + + + Disabled Spouse + Sp.handicap + + - - - Employee Salary - NON-MAJ - - - - Office National Securite Sociale - ONSS - - - - - - Precompte Professionnel Bareme 2011 - P.P. - - - - - Company car - C.C. - - - - - Child Allowance Belgium - Ch.A - - - - - - Disabled Spouse - Sp.handicap - - - - - - - Premium pay 108% Worker - SALARY - none - code - result = contract.wage * 1.08 - - - - - Salary Employee - SALARY - none - code - result = contract.wage * 1 - - - - - Office National de Sécurité Sociale - ONSS - 41 - none - percentage - SALARY - -13.07 - - - - - - - Precompte Professionnel Bareme 2011 - P.P - 120 - fix - none - - - - - - - - Precompte Professionnel - B.I. - fix - 120 - python - - - result = (((employee.marital=='single') or (employee.marital=='married' and employee.statut_fiscal=='with income')) and (employee.resident!=True)) - - - - - - Precompte Professionnel - B.II - fix - 120 - python - - result = ((employee.marital=='married' and employee.statut_fiscal=='without income') and (employee.resident!=True)) - - - - - - Precompte Professionnel - B.III - fix - 120 - python - result = employee.resident==True - - - - - - Child Allowance Belgium - Child.Allowance - 140 - fix - none - - - - - - - Child Allowance Belgium - Ch.A - fix - 141 - The recipient of income is an isolated or spouse beneficiary's income has also + + + Premium pay 108% Worker + SALARY + none + code + result = contract.wage * 1.08 + + + + Salary Employee + SALARY + none + code + result = contract.wage * 1 + + + + Office National de Sécurité Sociale + ONSS + 41 + none + percentage + SALARY + -13.07 + + + + Precompte Professionnel Bareme 2011 + P.P + 120 + fix + none + + + + + + Precompte Professionnel + B.I. + fix + 120 + python + + result = (((employee.marital=='single') or (employee.marital=='married' and employee.statut_fiscal=='with income')) and (employee.resident!=True)) + + + + + Precompte Professionnel + B.II + fix + 120 + python + + result = ((employee.marital=='married' and employee.statut_fiscal=='without income') and (employee.resident!=True)) + + + + + Precompte Professionnel + B.III + fix + 120 + python + result = employee.resident==True + + + + + Child Allowance Belgium + Child.Allowance + 140 + fix + none + + + + + Child Allowance Belgium + Ch.A + fix + 141 + The recipient of income is an isolated or spouse beneficiary's income has also earned income (Schedule I / II scale) A. When the gross monthly earnings do not exceed € 7,500, the withholding tax is determined according to the Schedule I. The following reductions are then deducted from the payroll tax determined in accordance with this schedule: a) Reduction for dependent children - python - result = bool(employee.children) - + python + result = bool(employee.children) + + + + + Child Allowance for the Disabled Belgium + Ch.Handicap + fix + 143 + "Disabled child" means: - - - - Child Allowance for the Disabled Belgium - Ch.Handicap - fix - 143 - "Disabled child" means: - - the child reaches at least 66% of failure or reduced physical or mental capacity - the head of one or more conditions; + the child reaches at least 66% of failure or reduced physical or mental capacity + the head of one or more conditions; - the child that is established, regardless of age, that due to developments and recognized - before age 65 + the child that is established, regardless of age, that due to developments and recognized + before age 65 python result = bool(employee.number_handicap) - - - - - Disabled Spouse Allowance - Sp.handicap - fix - 145 - 31 - python - result = employee.handicap==True - - - - - - Company Car - car - fix - 15 - none - - - - - - Company car - - car 1 - 15 - python - result = bool(contract.company_car_wkr) - code - result = contract.company_car_wkr - - - - - Retenue Company car - - car 2 - 160 - python - result = contract.company_car_wkr - code - result = -contract.company_car_wkr - - - - - Check Value Meal - Ch.M. - fix - 165 - none - - - - - - - Check Value Meal, Company Part - Ch.M. - fix - 165 - code - result = -contract.ch_value - python - result = bool(contract.ch_value) - - - - - - Retain on Check Value Meal - - Meal Check - fix - 165 - python - result = bool(contract.ch_worker) - code - result = -contract.ch_worker - - - - - Reimbursement of travel expenses - Tr.E - fix - 65 - python - result = bool(contract.reim_travel) - code - result = contract.reim_travel - - - - - Miscellaneous exempt ONSS - M.ONSS - fix - 165 - python - result = bool(contract.mis_ex_onss) - code - result = -contract.mis_ex_onss - - - - - Insurance - Ins - fix - 165 - python - result = bool(contract.insurance) - code - result = -contract.insurance - - - - - - Benefits of various nature - Ben - fix - 10 - python - result = bool(contract.advantage) - code - result = contract.advantage - - - - - Net Supplement - Net.S - fix - 185 - python - result = bool(contract.suppl_net) - code - result = -contract.suppl_net - - - - - Net retained - Net.R - fix - 190 - python - result = bool(contract.retained_net) - code - result = contract.retained_net - - - - - - - C.P.218 - Belgian Employee - - - - - - - - C.P.219 - Belgian Worker - - - + + + + Disabled Spouse Allowance + Sp.handicap + fix + 145 + 31 + python + result = employee.handicap==True + + + + Company Car + car + fix + 15 + none + + + + + Company car + + car 1 + 15 + python + result = bool(contract.company_car_wkr) + code + result = contract.company_car_wkr + + + + Retenue Company car + + car 2 + 160 + python + result = contract.company_car_wkr + code + result = -contract.company_car_wkr + + + + Check Value Meal + Ch.M. + fix + 165 + none + + + + + + Check Value Meal, Company Part + Ch.M. + fix + 165 + code + result = -contract.ch_value + python + result = bool(contract.ch_value) + + + + + Retain on Check Value Meal + + Meal Check + 165 + python + result = bool(contract.ch_worker) + fix + result = -contract.ch_worker + worked_days.WORK100.number_of_days + + + + Reimbursement of travel expenses + Tr.E + fix + 65 + python + result = bool(contract.reim_travel) + code + result = contract.reim_travel + + + + Miscellaneous exempt ONSS + M.ONSS + fix + 165 + python + result = bool(contract.mis_ex_onss) + code + result = -contract.mis_ex_onss + + + + Insurance + Ins + fix + 165 + python + result = bool(contract.insurance) + code + result = -contract.insurance + + + + Benefits of various nature + Ben + fix + 10 + python + result = bool(contract.advantage) + code + result = contract.advantage + + + + Net Supplement + Net.S + fix + 185 + python + result = bool(contract.suppl_net) + code + result = -contract.suppl_net + + + + Net retained + Net.R + fix + 190 + python + result = bool(contract.retained_net) + code + result = contract.retained_net + + + C.P.218 + Belgian Employee + + + + + + C.P.219 + Belgian Worker + + + 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 fa14cb45b04..2b5264dbc96 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 @@ -5,90 +5,82 @@ hr.contract.form.inherit hr.contract form - 20 + 20 - - + - - - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - + - + hr.employee.employee.inherit.form hr.employee form - 25 + 25 - - - hr.contract.struc - hr.contract - - form - - - - - + + hr.contract.struc + hr.contract + + form + + + + + hr.hr.employee.view.for hr.employee - 30 - + 30 + - + - - - + + - - - - - - - - + + + + + + + +