From 6f5c7b8227ffd385ce8e0e34dfbeb88a3748d3d8 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 14:18:55 +0530
Subject: [PATCH 1/2] [IMP] hr_payroll: Added demo data for contribution
 register and updated the demo data

bzr revid: psi@tinyerp.co.in-20110629084855-ah2889z5oucv6ssg
---
 addons/hr_payroll/hr_payroll_demo.xml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 6408cb78094..a7c0e170b6e 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -2,43 +2,57 @@
 <openerp>
     <data>
 
+        <!-- Contribution Register -->
+
+        <record id="hr_contribution_register_allowance" model="hr.contribution.register">
+            <field name="name">Contribution Register for Allowances</field>
+        </record>
+
+        <record id="hr_contribution_register_deduction" model="hr.contribution.register">
+            <field name="name">Contribution Register for Deductions</field>
+        </record>
+
         <!-- Salary Rules -->
 
-        <record id="hr_payslip_line_houserantallowance1" model="hr.salary.rule">
+        <record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
             <field name="amount_select">percentage</field>
             <field eval="40.0" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">HRA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
 
-        <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
+        <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
             <field name="code">CA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
 
-        <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
+        <record id="hr_salary_rule_professionaltax1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="150" name="sequence"/>
             <field eval="-200.0" name="amount_fix"/>
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="register_id" ref="hr_contribution_register_deduction"/>
             <field name="name">Professional Tax</field>
         </record>
 
-        <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
+        <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
             <field name="amount_select">percentage</field>
             <field eval="120" name="sequence"/>
             <field eval="-12.5" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="register_id" ref="hr_contribution_register_deduction"/>
             <field name="name">Provident Fund</field>
         </record>
 
@@ -89,7 +103,7 @@
          <record id="structure_001" model="hr.payroll.structure">
             <field name="code">ME</field>
             <field name="name">Marketing Executive</field>
-            <field eval="[(6, 0, [ref('hr_payslip_line_houserantallowance1'), ref('hr_payslip_line_convanceallowance1'),ref('hr_payslip_line_professionaltax1'),ref('hr_payslip_line_providentfund1')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowance1'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_base"/>
         </record>

From 167b5b068639f830aa304e95b0892007dfe1c0a1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 15:58:01 +0530
Subject: [PATCH 2/2] [IMP] hr_payroll: Improvement in demo data

bzr revid: psi@tinyerp.co.in-20110629102801-wx3i2rcpy5ols9pg
---
 addons/hr_payroll/hr_payroll_demo.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index a7c0e170b6e..bcbecd63ffd 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -4,12 +4,20 @@
 
         <!-- Contribution Register -->
 
-        <record id="hr_contribution_register_allowance" model="hr.contribution.register">
-            <field name="name">Contribution Register for Allowances</field>
+        <record id="hr_houserent_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register</field>
         </record>
 
-        <record id="hr_contribution_register_deduction" model="hr.contribution.register">
-            <field name="name">Contribution Register for Deductions</field>
+        <record id="hr_provident_fund_register" model="hr.contribution.register">
+            <field name="name">Provident Fund Register</field>
+        </record>
+
+        <record id="hr_professional_tax_register" model="hr.contribution.register">
+            <field name="name">Professional Tax Register</field>
+        </record>
+
+        <record id="hr_meal_voucher_register" model="hr.contribution.register">
+            <field name="name">Meal Voucher Register</field>
         </record>
 
         <!-- Salary Rules -->
@@ -20,7 +28,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">HRA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_contribution_register_allowance"/>
+            <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
@@ -30,7 +38,6 @@
             <field eval="800.0" name="amount_fix"/>
             <field name="code">CA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
@@ -41,7 +48,7 @@
             <field eval="-200.0" name="amount_fix"/>
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="register_id" ref="hr_contribution_register_deduction"/>
+            <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
         </record>
 
@@ -52,7 +59,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="register_id" ref="hr_contribution_register_deduction"/>
+            <field name="register_id" ref="hr_provident_fund_register"/>
             <field name="name">Provident Fund</field>
         </record>
 
@@ -71,6 +78,7 @@
             <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">MA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_meal_voucher_register"/>
             <field name="name">Meal Voucher</field>
             <field name="sequence" eval="16"/>
          </record>
@@ -117,6 +125,7 @@
         </record>
 
         <!-- Employee -->
+
         <record id="hr_employee_bonamy0" model="hr.employee">
             <field eval="0" name="manager"/>
             <field eval="1.0" name="time_efficiency"/>
@@ -127,6 +136,7 @@
         </record>
 
         <!-- Employee Contract -->
+
         <record id="hr_contract_firstcontract1" model="hr.contract">
             <field name="name">Marketing Executive Contract</field>
             <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>