From 418265d252a5fd8950ac8286b487ce084eb5e342 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 11 Jul 2011 15:57:54 +0530
Subject: [PATCH] [IMP] hr_payroll,hr_payroll_account: improved yaml and demo
 data for payroll_account

bzr revid: mtr@mtr-20110711102754-1qw17zempu4e32ol
---
 addons/hr_payroll/test/payslip.yml                   |  8 ++++----
 .../hr_payroll_account/hr_payroll_account_demo.xml   | 12 ++++--------
 .../hr_payroll_account/test/hr_payroll_account.yml   |  8 ++++----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index a95a2c7b9e4..089005f0b52 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -18,10 +18,10 @@
     company_id: base.main_company
     parent_id: structure_base
     rule_ids:
-      - hr_payslip_line_houserantallowance1
-      - hr_payslip_line_convanceallowance1
-      - hr_payslip_line_professionaltax1
-      - hr_payslip_line_providentfund1
+      - hr_salary_rule_houserentallowance1
+      - hr_salary_rule_convanceallowance1
+      - hr_salary_rule_professionaltax1
+      - hr_salary_rule_providentfund1
       - hr_salary_rule_meal_voucher
       - hr_salary_rule_sales_commission
 -
diff --git a/addons/hr_payroll_account/hr_payroll_account_demo.xml b/addons/hr_payroll_account/hr_payroll_account_demo.xml
index c038025bb0a..6372dabc723 100644
--- a/addons/hr_payroll_account/hr_payroll_account_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_demo.xml
@@ -2,19 +2,19 @@
 <openerp>
     <data>
 
-        <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_houserentallowance1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_professionaltax1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_professionaltax1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_providentfund1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_providentfund1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
         
@@ -37,10 +37,6 @@
         <record id="hr_payroll.hr_rule_net" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
-        
-        <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.salary.rule">
-            <field name="account_debit" ref="account.a_salary_expense"/>
-        </record>
 
         <!-- Payslip -->
        <!-- <record id="hr_payroll.hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
diff --git a/addons/hr_payroll_account/test/hr_payroll_account.yml b/addons/hr_payroll_account/test/hr_payroll_account.yml
index bd71dfbfef4..98747539bb3 100644
--- a/addons/hr_payroll_account/test/hr_payroll_account.yml
+++ b/addons/hr_payroll_account/test/hr_payroll_account.yml
@@ -33,10 +33,10 @@
     company_id: base.main_company
     parent_id: hr_payroll.structure_base
     rule_ids:
-      - hr_payroll.hr_payslip_line_houserantallowance1
-      - hr_payroll.hr_payslip_line_convanceallowance1
-      - hr_payroll.hr_payslip_line_professionaltax1
-      - hr_payroll.hr_payslip_line_providentfund1
+      - hr_payroll.hr_salary_rule_houserentallowance1
+      - hr_payroll.hr_salary_rule_convanceallowance1
+      - hr_payroll.hr_salary_rule_professionaltax1
+      - hr_payroll.hr_salary_rule_providentfund1
       - hr_payroll.hr_salary_rule_meal_voucher
       - hr_payroll.hr_salary_rule_sales_commission
 -