From 77cb23551b092c1746df64c290a303bb0d68b3d6 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 11:45:55 +0530
Subject: [PATCH 1/2] [ADD/IMP]l10n_in_hr_payroll:added data for contribution
 register and used its reference in rules

bzr revid: kbh@tinyerp.com-20120807061555-n8s44w4crx2gh9pa
---
 .../data/l10n_in_hr_payroll_data.xml          | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index bccf03137be..1633b20d627 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Contribution Register -->
+
+        <record id="hr_houserent_allowance_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register for Metro and Non Metro city</field>
+        </record>
+
+        <record id="hr_provident_fund_employee_register" model="hr.contribution.register">
+            <field name="name">Employee's Provident Fund Register</field>
+        </record>
+
+        <record id="hr_provident_fund_employer_register" model="hr.contribution.register">
+            <field name="name">Employer's Provident Fund Register</field>
+        </record>
+
+        <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
+            <field name="name">Professional Tax Deduction Register</field>
+        </record>
+
+        <record id="hr_food_coupen_register" model="hr.contribution.register">
+            <field name="name">Food Coupen Register</field>
+        </record>
+
         <!-- Hr Salary Rules for allowance-->
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">
@@ -19,6 +41,7 @@
             <field name="amount_python_compute">result=payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40) if (contract.city_type=='non-metro') else 0.00</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro and nonmetro city</field>
+            <field name="register_id" ref="hr_houserent_allowance_register"/>
             <field name="sequence" eval="51"/>
         </record>
 
@@ -170,6 +193,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Food Coupons Allowance</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
             <field name="sequence" eval="33"/>
          </record>
 
@@ -268,6 +292,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_python">result = contract.wage &gt;= 3000 </field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else -0</field>
+            <field name="register_id" ref="hr_professional_tax_deduction_register"/>
             <field eval="145" name="sequence"/>
         </record>
 
@@ -278,6 +303,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
+            <field name="register_id" ref="hr_provident_fund_employee_register"/>
             <field name="sequence" eval="150"/>
         </record>
 
@@ -390,6 +416,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
+            <field name="register_id" ref="hr_provident_fund_employer_register"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
 

From 669449534323f2656656317e4c01ed9bc7b4babb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 14:07:34 +0530
Subject: [PATCH 2/2] [FIX]l10n_in_hr_payroll:register name changed

bzr revid: kbh@tinyerp.com-20120807083734-yhob146pybjykuex
---
 .../data/l10n_in_hr_payroll_data.xml           | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 1633b20d627..61a0b4e4352 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -4,23 +4,19 @@
         <!-- Contribution Register -->
 
         <record id="hr_houserent_allowance_register" model="hr.contribution.register">
-            <field name="name">House Rent Allowance Register for Metro and Non Metro city</field>
+            <field name="name">Register for House Rent Allowance</field>
         </record>
 
-        <record id="hr_provident_fund_employee_register" model="hr.contribution.register">
-            <field name="name">Employee's Provident Fund Register</field>
-        </record>
-
-        <record id="hr_provident_fund_employer_register" model="hr.contribution.register">
-            <field name="name">Employer's Provident Fund Register</field>
+        <record id="hr_register_provident_fund" model="hr.contribution.register">
+            <field name="name">Register for Provident Fund</field>
         </record>
 
         <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
-            <field name="name">Professional Tax Deduction Register</field>
+            <field name="name">Register for Professional Tax</field>
         </record>
 
         <record id="hr_food_coupen_register" model="hr.contribution.register">
-            <field name="name">Food Coupen Register</field>
+            <field name="name">Register for Food Coupen</field>
         </record>
 
         <!-- Hr Salary Rules for allowance-->
@@ -303,7 +299,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
-            <field name="register_id" ref="hr_provident_fund_employee_register"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="sequence" eval="150"/>
         </record>
 
@@ -416,7 +412,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
-            <field name="register_id" ref="hr_provident_fund_employer_register"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>