diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/hr_contract/hr_contract_data.xml | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/hr_contract/hr_contract_data.xml')
| -rw-r--r-- | addons/hr_contract/hr_contract_data.xml | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml index 6e7aca57d67..97200910188 100644 --- a/addons/hr_contract/hr_contract_data.xml +++ b/addons/hr_contract/hr_contract_data.xml @@ -1,43 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> - - <!-- Contract Period Names --> - <record id="hr_contract_wage_type_period_daily" model="hr.contract.wage.type.period"> - <field name="name">daily</field> - </record> - <record id="hr_contract_wage_type_period_weekly" model="hr.contract.wage.type.period"> - <field name="name">weekly</field> - </record> - <record id="hr_contract_wage_type_period_monthly" model="hr.contract.wage.type.period"> - <field name="name">monthly</field> - </record> - - <!-- Contract Wage Types --> - <record id="hr_contract_monthly_gross" model="hr.contract.wage.type"> - <field name="name">Monthly Gross Wage</field> - <field name="type">gross</field> - <field name="period_id" ref="hr_contract_wage_type_period_monthly"/> - </record> - <record id="hr_contract_monthly_net" model="hr.contract.wage.type"> - <field name="name">Monthly Net Wage</field> - <field name="type">net</field> - <field name="period_id" ref="hr_contract_wage_type_period_monthly"/> - </record> - - <!-- Contract Types --> + <!-- Contract Types --> <record id="hr_contract_type_emp" model="hr.contract.type"> <field name="name">Employee</field> - </record> - + </record> + <record id="hr_contract_type_wrkr" model="hr.contract.type"> <field name="name">Worker</field> - </record> - + </record> + <record id="hr_contract_type_sub" model="hr.contract.type"> <field name="name">Subcontractor</field> - </record> - + </record> + </data> </openerp> |