From 2f4347a365866cf06a348c59c31f0f7e0946bf6f Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 15 Sep 2010 11:02:58 +0530
Subject: [PATCH] [Fix] hr_contract,hr_payroll :  fix an error of type_id in
 yml and demo data

bzr revid: vir@tinyerp.com-20100915053258-sew40oyi4wo0y0tg
---
 addons/hr_contract/test/test_hr_contract.yml | 1 +
 addons/hr_payroll/hr_payroll_demo.xml        | 1 +
 addons/hr_payroll/hr_payroll_view.xml        | 3 +++
 addons/hr_payroll/test/payment_advice.yml    | 1 +
 addons/hr_payroll/test/payroll_register.yml  | 1 +
 addons/hr_payroll/test/payslip.yml           | 1 +
 6 files changed, 8 insertions(+)

diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
index 95ebae702ed..e5ecc57f144 100644
--- a/addons/hr_contract/test/test_hr_contract.yml
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -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
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index b0c843e0c95..f68cd2796a3 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -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"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index d85acbcb2e1..fbc307a928f 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -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"/>
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index a2a9c3d5dbe..a571cf63272 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -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
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index f5772602db4..b8935fb287c 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -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
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 6c0f60ef7dd..705270d7c82 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -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