odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged dev3 branch with cleaning of l10n_be_hr_payroll module (field names and demo) 

bzr revid: qdp-launchpad@openerp.com-20111010114658-690hvsh7le9epvxg
This commit is contained in:
Quentin (OpenERP) 2011-10-10 13:46:58 +02:00
parent c4296a85ac 7ee136e088
commit e37228bf37
7 changed files with 93 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_be_hr_payroll/__init__.py
View File

@ -19,3 +19,5 @@
# #
############################################################################## ##############################################################################
import l10n_be_hr_payroll import l10n_be_hr_payroll
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/l10n_be_hr_payroll/__openerp__.py
View File

@ -22,7 +22,7 @@
'name': 'Belgian Payroll Rules', 'name': 'Belgian Payroll Rules',
'category': 'Localization/Payroll', 'category': 'Localization/Payroll',
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'depends': ['hr_payroll','hr_contract'], 'depends': ['hr_payroll'],
'version': '1.0', 'version': '1.0',
'description': """ 'description': """
Belgian Payroll Rules Belgian Payroll Rules
@ -50,3 +50,5 @@ Belgian Payroll Rules
], ],
'installable': True 'installable': True
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

20
addons/l10n_be_hr_payroll/data/hr.salary.rule.csv
View File

@ -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", 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", 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", 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.disabled_children_number",

1 id amount_select condition_range_min condition_range_max amount_percentage amount_fix name category_id sequence code parent_rule_id/id condition_select condition_range amount_percentage_base
1422 1418 fix 9 9 1452 Child Allowance Belgium Child Allowance Belgium 142 Ch.A hr_payroll_rules_child range employee.children
1423 1419 fix 10 10 1673 Child Allowance Belgium Child Allowance Belgium 142 Ch.A hr_payroll_rules_child range employee.children
1424
1425 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 employee.disabled_children_number
1426 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 employee.disabled_children_number
1427 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 employee.disabled_children_number
1428 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 employee.disabled_children_number
1429 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 employee.disabled_children_number
1430 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 employee.disabled_children_number
1431 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 employee.disabled_children_number
1432 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 employee.disabled_children_number
1433 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 employee.disabled_children_number
1434 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 employee.disabled_children_number

35
addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
View File

@ -20,32 +20,37 @@
############################################################################## ##############################################################################
from osv import fields, osv from osv import fields, osv
import decimal_precision as dp
class hr_contract_be(osv.osv): class hr_contract_be(osv.osv):
_inherit = 'hr.contract' _inherit = 'hr.contract'
_columns = { _columns = {
'reim_travel':fields.float('Reimbursement of travel expenses', digits=(16,2)), 'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')),
'company_car_emp':fields.float('Company car employer', digits=(16,2)), 'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')),
'company_car_wkr':fields.float('Company Car Deduction for Worker', digits=(16,2)), 'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')),
'mis_ex_onss':fields.float('Miscellaneous exempt ONSS ', digits=(16,2)), 'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')),
'ch_value':fields.float('Check Value Meal ', digits=(16,2)), 'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')),
'ch_worker':fields.float('Check Value Meal - by worker ', digits=(16,2)), 'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')),
'insurance':fields.float('Insurance Group - by worker ', digits=(16,2)), 'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')),
'advantage':fields.float('Benefits of various nature ', digits=(16,2)), 'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')),
'suppl_net':fields.float('Net supplements', digits=(16,2)), 'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')),
'retained_net':fields.float('Net retained ', digits=(16,2)), 'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')),
} }
hr_contract_be() hr_contract_be()
class hr_employee_be(osv.osv): class hr_employee_be(osv.osv):
_inherit = 'hr.employee' _inherit = 'hr.employee'
_columns = { _columns = {
'statut_fiscal':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'), 'spouse_fiscal_status': 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"), 'disabled_spouse_bool': 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"), 'disabled_children_bool': 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"), 'resident_bool': fields.boolean('Nonresident', help="if recipient lives in a foreign country"),
'number_handicap':fields.integer('Number of disabled children'), 'disabled_children_number': fields.integer('Number of disabled children'),
} }
hr_employee_be() hr_employee_be()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

56
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
View File

@ -35,7 +35,7 @@
<field name="parent_id" ref="hr_payroll.DED"/> <field name="parent_id" ref="hr_payroll.DED"/>
</record> </record>
<!-- HR SALAR RULES--> <!-- HR SALARY RULES-->
<record id="hr_payroll_rules_maj" model="hr.salary.rule"> <record id="hr_payroll_rules_maj" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_salary"/> <field name="category_id" ref="hr_payroll_head_salary"/>
<field name="name">Premium pay 108% Worker</field> <field name="name">Premium pay 108% Worker</field>
@ -81,7 +81,7 @@
<field name="sequence">120</field> <field name="sequence">120</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
<field name="condition_python">result = (((employee.marital=='single') or (employee.marital=='married' and employee.statut_fiscal=='with income')) and (employee.resident!=True))</field> <field name="condition_python">result = (((employee.marital=='single') or (employee.marital=='married' and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))</field>
</record> </record>
<record id="hr_payroll_rules_baremeII" model="hr.salary.rule"> <record id="hr_payroll_rules_baremeII" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_pp"/> <field name="category_id" ref="hr_payroll_head_pp"/>
@ -92,7 +92,7 @@
<field name="sequence">120</field> <field name="sequence">120</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
<field name="condition_python">result = ((employee.marital=='married' and employee.statut_fiscal=='without income') and (employee.resident!=True))</field> <field name="condition_python">result = ((employee.marital=='married' and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))</field>
</record> </record>
<record id="hr_payroll_rules_baremeIII" model="hr.salary.rule"> <record id="hr_payroll_rules_baremeIII" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_pp"/> <field name="category_id" ref="hr_payroll_head_pp"/>
@ -102,7 +102,7 @@
<field name="amount_select">fix</field> <field name="amount_select">fix</field>
<field name="sequence">120</field> <field name="sequence">120</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = employee.resident==True</field> <field name="condition_python">result = employee.resident_bool==True</field>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
</record> </record>
<record id="hr_payroll_rules_child_alw" model="hr.salary.rule"> <record id="hr_payroll_rules_child_alw" model="hr.salary.rule">
@ -147,7 +147,7 @@
the child that is established, regardless of age, that due to developments and recognized the child that is established, regardless of age, that due to developments and recognized
before age 65</field> before age 65</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(employee.number_handicap)</field> <field name="condition_python">result = bool(employee.disabled_children_number)</field>
</record> </record>
<record id="hr_payroll_rules_spouse_handicap" model="hr.salary.rule"> <record id="hr_payroll_rules_spouse_handicap" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_div_net"/> <field name="category_id" ref="hr_payroll_head_div_net"/>
@ -157,7 +157,7 @@
<field name="sequence">145</field> <field name="sequence">145</field>
<field name="amount_fix">31</field> <field name="amount_fix">31</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = employee.handicap==True</field> <field name="condition_python">result = employee.disabled_spouse_bool==True</field>
</record> </record>
<record id="hr_payroll_rules_company_car_parent" model="hr.salary.rule"> <record id="hr_payroll_rules_company_car_parent" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_div_impos"/> <field name="category_id" ref="hr_payroll_head_div_impos"/>
@ -175,9 +175,9 @@
<field name="code">CAR 1</field> <field name="code">CAR 1</field>
<field name="sequence">15</field> <field name="sequence">15</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.company_car_wkr)</field> <field name="condition_python">result = bool(contract.car_employee_deduction)</field>
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="amount_python_compute">result = contract.company_car_wkr</field> <field name="amount_python_compute">result = contract.car_employee_deduction</field>
</record> </record>
<record id="hr_payroll_rules_company_car_2" model="hr.salary.rule"> <record id="hr_payroll_rules_company_car_2" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_div_net"/> <field name="category_id" ref="hr_payroll_head_div_net"/>
@ -186,9 +186,9 @@
<field name="code">CAR 2</field> <field name="code">CAR 2</field>
<field name="sequence">160</field> <field name="sequence">160</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = contract.company_car_wkr</field> <field name="condition_python">result = contract.car_employee_deduction</field>
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="amount_python_compute">result = -contract.company_car_wkr</field> <field name="amount_python_compute">result = -contract.car_employee_deduction</field>
</record> </record>
<record id="hr_payroll_rules_company_car_emp" model="hr.salary.rule"> <record id="hr_payroll_rules_company_car_emp" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.COMP"/> <field name="category_id" ref="hr_payroll.COMP"/>
@ -197,9 +197,9 @@
<field name="code">CAR 3</field> <field name="code">CAR 3</field>
<field name="sequence">160</field> <field name="sequence">160</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.company_car_emp)</field> <field name="condition_python">result = bool(contract.car_company_amount)</field>
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="amount_python_compute">result = -contract.company_car_emp</field> <field name="amount_python_compute">result = -contract.car_company_amount</field>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
</record> </record>
<record id="hr_payroll_rules_parent_ch" model="hr.salary.rule"> <record id="hr_payroll_rules_parent_ch" model="hr.salary.rule">
@ -219,9 +219,9 @@
<field name="amount_select">fix</field> <field name="amount_select">fix</field>
<field name="sequence">165</field> <field name="sequence">165</field>
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="amount_python_compute">result = -(contract.ch_value - contract.ch_worker) * worked_days.WORK100.number_of_days</field> <field name="amount_python_compute">result = -(contract.meal_voucher_amount - contract.meal_voucher_employee_deduction) * worked_days.WORK100.number_of_days</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.ch_value)</field> <field name="condition_python">result = bool(contract.meal_voucher_amount)</field>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
</record> </record>
<record id="hr_payroll_rules_ch_worker" model="hr.salary.rule"> <record id="hr_payroll_rules_ch_worker" model="hr.salary.rule">
@ -231,10 +231,10 @@
<field name="code">Meal Check</field> <field name="code">Meal Check</field>
<field name="sequence">165</field> <field name="sequence">165</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.ch_worker)</field> <field name="condition_python">result = bool(contract.meal_voucher_employee_deduction)</field>
<field name="amount_select">percentage</field> <field name="amount_select">percentage</field>
<field name="amount_percentage">-100.0</field> <field name="amount_percentage">-100.0</field>
<field name="amount_percentage_base">contract.ch_worker</field> <field name="amount_percentage_base">contract.meal_voucher_employee_deduction</field>
<field name="quantity">worked_days.WORK100.number_of_days</field> <field name="quantity">worked_days.WORK100.number_of_days</field>
<field name="appears_on_payslip" eval="True"/> <field name="appears_on_payslip" eval="True"/>
</record> </record>
@ -245,8 +245,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">65</field> <field name="sequence">65</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.reim_travel)</field> <field name="condition_python">result = bool(contract.travel_reimbursement_amount)</field>
<field name="amount_python_compute">result = contract.reim_travel</field> <field name="amount_python_compute">result = contract.travel_reimbursement_amount</field>
</record> </record>
<record id="hr_payroll_rules_mis_ex_onss" model="hr.salary.rule"> <record id="hr_payroll_rules_mis_ex_onss" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.DED"/> <field name="category_id" ref="hr_payroll.DED"/>
@ -255,8 +255,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">165</field> <field name="sequence">165</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.mis_ex_onss)</field> <field name="condition_python">result = bool(contract.misc_onss_deduction)</field>
<field name="amount_python_compute">result = -contract.mis_ex_onss</field> <field name="amount_python_compute">result = -contract.misc_onss_deduction</field>
</record> </record>
<record id="hr_payroll_rules_insurance" model="hr.salary.rule"> <record id="hr_payroll_rules_insurance" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.DED"/> <field name="category_id" ref="hr_payroll.DED"/>
@ -265,8 +265,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">165</field> <field name="sequence">165</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.insurance)</field> <field name="condition_python">result = bool(contract.insurance_employee_deduction)</field>
<field name="amount_pyton_compute">result = -contract.insurance</field> <field name="amount_pyton_compute">result = -contract.insurance_employee_deduction</field>
</record> </record>
<record id="hr_payroll_rules_advantage" model="hr.salary.rule"> <record id="hr_payroll_rules_advantage" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.ALW"/> <field name="category_id" ref="hr_payroll.ALW"/>
@ -275,8 +275,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">10</field> <field name="sequence">10</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.advantage)</field> <field name="condition_python">result = bool(contract.misc_advantage_amount)</field>
<field name="amount_python_compute">result = contract.advantage</field> <field name="amount_python_compute">result = contract.misc_advantage_amount</field>
</record> </record>
<record id="hr_payroll_rules_suppl_net" model="hr.salary.rule"> <record id="hr_payroll_rules_suppl_net" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_div_net"/> <field name="category_id" ref="hr_payroll_head_div_net"/>
@ -285,8 +285,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">185</field> <field name="sequence">185</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.suppl_net)</field> <field name="condition_python">result = bool(contract.additional_net_amount)</field>
<field name="amount_python_compute">result = contract.suppl_net</field> <field name="amount_python_compute">result = contract.additional_net_amount</field>
</record> </record>
<record id="hr_payroll_rules_retained_net" model="hr.salary.rule"> <record id="hr_payroll_rules_retained_net" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll_head_div_net"/> <field name="category_id" ref="hr_payroll_head_div_net"/>
@ -295,8 +295,8 @@
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="sequence">190</field> <field name="sequence">190</field>
<field name="condition_select">python</field> <field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.retained_net)</field> <field name="condition_python">result = bool(contract.retained_net_amount)</field>
<field name="amount_python_compute">result = -contract.retained_net</field> <field name="amount_python_compute">result = -contract.retained_net_amount</field>
</record> </record>
<record id="hr_payroll_salary_structure_employee" model="hr.payroll.structure"> <record id="hr_payroll_salary_structure_employee" model="hr.payroll.structure">
<field name="code">C.P.218</field> <field name="code">C.P.218</field>

10
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
View File

@ -7,11 +7,11 @@
<field name="name">Bonamy's Contract (Belgium payroll C.P. 218)</field> <field name="name">Bonamy's Contract (Belgium payroll C.P. 218)</field>
<field name="struct_id" ref="hr_payroll_salary_structure_employee"/> <field name="struct_id" ref="hr_payroll_salary_structure_employee"/>
<field eval="2500.0" name="wage"/> <field eval="2500.0" name="wage"/>
<field eval="6.0" name="ch_value"/> <field eval="6.0" name="meal_voucher_amount"/>
<field eval="1.09" name="ch_worker"/> <field eval="1.09" name="meal_voucher_employee_deduction"/>
<field eval="250.0" name="company_car_emp"/> <field eval="250.0" name="car_company_amount"/>
<field eval="110" name="company_car_wkr"/> <field eval="110" name="car_employee_deduction"/>
<field eval="50.0" name="suppl_net"/> <field eval="50.0" name="additional_net_amount"/>
<field name="working_hours" ref="resource.timesheet_group1"/> <field name="working_hours" ref="resource.timesheet_group1"/>
</record> </record>

48
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="hr_contract_form_inherit" model="ir.ui.view">
<record id="hr_contract_form_l10n_be_inherit" model="ir.ui.view">
<field name="name">hr.contract.form.inherit</field> <field name="name">hr.contract.form.inherit</field>
<field name="model">hr.contract</field> <field name="model">hr.contract</field>
<field name="type">form</field> <field name="type">form</field>
@ -10,29 +11,29 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after"> <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
<field name="reim_travel"/> <field name="travel_reimbursement_amount"/>
<field name="company_car_emp"/> <field name="car_company_amount"/>
<field name="mis_ex_onss"/> <field name="misc_onss_deduction"/>
<field name="ch_value"/> <field name="meal_voucher_amount"/>
<field name="advantage"/> <field name="misc_advantage_amount"/>
<separator string="Miscellaneous" colspan="2"/> <separator string="Miscellaneous" colspan="2"/>
<field name="suppl_net"/> <field name="additional_net_amount"/>
<field name="retained_net"/> <field name="retained_net_amount"/>
</xpath> </xpath>
<xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after"> <xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="by Worker" colspan="2"/> <separator string="by Worker" colspan="2"/>
<field name="insurance"/> <field name="insurance_employee_deduction"/>
<field name="ch_worker"/> <field name="meal_voucher_employee_deduction"/>
<field name="company_car_wkr"/> <field name="car_employee_deduction"/>
</group> </group>
</xpath> </xpath>
</data> </data>
</field> </field>
</record> </record>
<record id="view_employee_marital_required_form" model="ir.ui.view"> <!-- <record id="view_employee_marital_required_form" model="ir.ui.view">
<field name="name">hr.employee.employee.inherit.form</field> <field name="name">hr.employee.inherit.form</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
<field name="type">form</field> <field name="type">form</field>
<field name="priority">25</field> <field name="priority">25</field>
@ -41,31 +42,32 @@
<field name="marital" position="replace"> <field name="marital" position="replace">
</field> </field>
</field> </field>
</record> </record> -->
<record id="hr_contract_hr_hr_employee_view_for" model="ir.ui.view"> <record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
<field name="name">hr.hr.employee.view.for</field> <field name="name">hr.employee.inherit.form</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="priority">30</field> <field name="priority">30</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after"> <!-- <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
<field name="marital" required="True"/> <field name="marital" required="True"/>
</xpath> </xpath> -->
<xpath expr="/form/notebook/page/group/field[@name='gender']" position="before"> <xpath expr="/form/notebook/page/group/field[@name='gender']" position="before">
<field name="resident" eval="False"/> <field name="resident_bool" eval="False"/>
</xpath> </xpath>
<xpath expr="/form/notebook/page/group/field[@name='marital']" position="after"> <xpath expr="/form/notebook/page/group/field[@name='marital']" position="after">
<field name="statut_fiscal" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/> <field name="spouse_fiscal_status" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/>
<field name="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/> <field name="disabled_spouse_bool" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
</xpath> </xpath>
<xpath expr="/form/notebook/page/group/field[@name='children']" position="after"> <xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
<field name="handicap_child"/> <field name="disabled_children_bool"/>
<field name="number_handicap" attrs="{'invisible':[('handicap_child','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/> <field name="disabled_children_number" attrs="{'invisible':[('disabled_children_bool','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
</xpath> </xpath>
</data> </data>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>