Mustufa Rangwala (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-clean_hr_payroll_l10n_be-mra into
lp:openobject-addons.
Requested reviews:
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-clean_hr_payroll_l10n_be-mra/+merge/75490
hr_payroll_l10n_be:
Rename fields of contaract and employee object's and changes on views too.
Thanks,
Mustufa
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-clean_hr_payroll_l10n_be-mra/+merge/75490
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-clean_hr_payroll_l10n_be-mra.
=== modified file 'hr_payroll_l10n_be/__init__.py'
--- hr_payroll_l10n_be/__init__.py 2011-04-11 13:13:46 +0000
+++ hr_payroll_l10n_be/__init__.py 2011-09-15 07:20:29 +0000
@@ -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
=== modified file 'hr_payroll_l10n_be/__openerp__.py'
--- hr_payroll_l10n_be/__openerp__.py 2011-09-13 10:16:24 +0000
+++ hr_payroll_l10n_be/__openerp__.py 2011-09-15 07:20:29 +0000
@@ -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 @@
],
'installable': True
}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'hr_payroll_l10n_be/hr_payroll_l10n_be.py'
--- hr_payroll_l10n_be/hr_payroll_l10n_be.py 2011-09-13 08:01:44 +0000
+++ hr_payroll_l10n_be/hr_payroll_l10n_be.py 2011-09-15 07:20:29 +0000
@@ -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
=== modified file 'hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml'
--- hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml 2011-09-14 14:30:34 +0000
+++ hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml 2011-09-15 07:20:29 +0000
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<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="model">hr.contract</field>
<field name="type">form</field>
@@ -10,29 +11,29 @@
<field name="arch" type="xml">
<data>
<xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
- <field name="reim_travel"/>
- <field name="company_car_emp"/>
- <field name="mis_ex_onss"/>
- <field name="ch_value"/>
- <field name="advantage"/>
+ <field name="travel_reimbursement_amount"/>
+ <field name="car_company_amount"/>
+ <field name="misc_onss_deduction"/>
+ <field name="meal_voucher_amount"/>
+ <field name="misc_advantage_amount"/>
<separator string="Miscellaneous" colspan="2"/>
- <field name="suppl_net"/>
- <field name="retained_net"/>
+ <field name="additional_net_amount"/>
+ <field name="retained_net_amount"/>
</xpath>
<xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
<group colspan="2" col="2">
<separator string="by Worker" colspan="2"/>
- <field name="insurance"/>
- <field name="ch_worker"/>
- <field name="company_car_wkr"/>
+ <field name="insurance_employee_deduction"/>
+ <field name="meal_voucher_employee_deduction"/>
+ <field name="car_employee_deduction"/>
</group>
</xpath>
</data>
</field>
</record>
- <record id="view_employee_marital_required_form" model="ir.ui.view">
- <field name="name">hr.employee.employee.inherit.form</field>
+ <!-- <record id="view_employee_marital_required_form" model="ir.ui.view">
+ <field name="name">hr.employee.inherit.form</field>
<field name="model">hr.employee</field>
<field name="type">form</field>
<field name="priority">25</field>
@@ -41,31 +42,32 @@
<field name="marital" position="replace">
</field>
</field>
- </record>
+ </record> -->
- <record id="hr_contract_hr_hr_employee_view_for" model="ir.ui.view">
- <field name="name">hr.hr.employee.view.for</field>
+ <record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
+ <field name="name">hr.employee.inherit.form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="priority">30</field>
<field name="arch" type="xml">
<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"/>
- </xpath>
+ </xpath> -->
<xpath expr="/form/notebook/page/group/field[@name='gender']" position="before">
- <field name="resident" eval="False"/>
+ <field name="resident_bool" eval="False"/>
</xpath>
<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="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
+ <field name="spouse_fiscal_status" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/>
+ <field name="disabled_spouse_bool" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
</xpath>
<xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
- <field name="handicap_child"/>
- <field name="number_handicap" attrs="{'invisible':[('handicap_child','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
+ <field name="disabled_children_bool"/>
+ <field name="disabled_children_number" attrs="{'invisible':[('disabled_children_bool','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
</xpath>
</data>
</field>
</record>
+
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
