From a79f6fe7a561b6b95990bb0d4574e7d1e7d0732a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 8 Apr 2011 19:31:29 +0200
Subject: [PATCH] [FIX] hr_contract, hr_payroll: fixed installation errors due
 to previous commit

bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb
---
 addons/hr_contract/test/test_hr_contract.yml |  2 +-
 addons/hr_payroll/hr_payroll_demo.xml        | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
index 398a8c8c4fe..bd39e091d8b 100644
--- a/addons/hr_contract/test/test_hr_contract.yml
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -11,7 +11,7 @@
     name: Mark Johnson
     user_id: base.user_root
     children: 2
-    marital: hr.hr_employee_marital_status_married
+    marital: 'married'
     place_of_birth: Belgium
     vehicle: 'No'
     vehicle_distance: 12
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 229eb9de482..173f4556edf 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -9,8 +9,7 @@
             <field eval="40.0" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">HRA</field>
-            <field name="type" ref="AL"/>
-            <field name="category_id" ref="hr_payroll.HRA"/>
+            <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
@@ -19,8 +18,7 @@
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
             <field name="code">CA</field>
-            <field name="type" ref="AL"/>
-            <field name="category_id" ref="hr_payroll.CA"/>
+            <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
@@ -30,8 +28,7 @@
             <field eval="15" name="sequence"/>
             <field eval="-200.0" name="amount_fix"/>
             <field name="code">PT</field>
-            <field name="type" ref="DED"/>
-            <field name="category_id" ref="hr_payroll.PT"/>
+            <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Professional Tax</field>
         </record>
 
@@ -41,8 +38,7 @@
             <field eval="-12.5" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">PF</field>
-            <field name="type" ref="DED"/>
-            <field name="category_id" ref="hr_payroll.PF"/>
+            <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Provident Fund</field>
         </record>