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

[Fix] hr_contract,hr_payroll : fix an error of type_id in yml and demo data 

bzr revid: vir@tinyerp.com-20100915053258-sew40oyi4wo0y0tg
This commit is contained in:
Vir (Open ERP) 2010-09-15 11:02:58 +05:30
parent e75ddc34f9
commit 2f4347a365
6 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr_contract/test/test_hr_contract.yml
View File

@ -46,4 +46,5 @@
name: contract1
wage: 1.0
wage_type_id: hr_contract_wage_type_monthlygrosswage0
type_id: hr_contract_type_emp
working_hours: resource.timesheet_group1

1
addons/hr_payroll/hr_payroll_demo.xml
View File

@ -71,6 +71,7 @@
<record id="hr_contract_firstcontract1" model="hr.contract">
<field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
<field name="name">First Contract</field>
<field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
<field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
<field name="struct_id" ref="hr_payroll.structure_001"/>
<field name="employee_id" ref="hr_employee_bonamy0"/>

3
addons/hr_payroll/hr_payroll_view.xml
View File

@ -239,6 +239,9 @@
<field name="date_end" select="1"/>
<field name="working_hours"/>
<field name="working_days_per_week" select="1"/>
<separator colspan="2" string="Trial Period"/>
<field name="trial_date_start" />
<field name="trial_date_end" />
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>

1
addons/hr_payroll/test/payment_advice.yml
View File

@ -16,6 +16,7 @@
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
employee_account: account.a_recv

1
addons/hr_payroll/test/payroll_register.yml
View File

@ -16,6 +16,7 @@
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
employee_account: account.a_recv

1
addons/hr_payroll/test/payslip.yml
View File

@ -25,6 +25,7 @@
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
employee_account: account.a_recv