From 8d94232e0a0f7271705d86b9e00f5446b6b1c8b0 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 13 Jul 2012 17:25:44 +0530
Subject: [PATCH] [IMP] l10n_in_hr_payroll: added field on hr.contract object
 and modified salary rules of 'HRAM' and 'HRANM'

bzr revid: mtr@tinyerp.com-20120713115544-bc9sdi7so47j65t6
---
 .../data/l10n_in_hr_payroll_data.xml             | 16 ++++++++++------
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  6 +++++-
 .../l10n_in_hr_payroll_view.xml                  |  7 ++++---
 3 files changed, 19 insertions(+), 10 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 8816ee24412..780829aec4c 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
@@ -20,6 +20,8 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro city</field>
             <field name="sequence" eval="51"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = (contract.city_type=='metro')</field>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -35,6 +37,8 @@ Income tax exemption for HRA will be least of following:
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for non metro city</field>
             <field name="sequence" eval="52"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = (contract.city_type=='non-metro')</field>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -121,7 +125,7 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
-            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
 One would need to compute income tax on the arrears if it would have been received in actual year.
 Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
         </record>
@@ -134,8 +138,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_select">code</field>
              <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days) or (contract.wage * 15 * employee.number_of_year / worked_days.WORK100.number_of_days)</field>
             <field name="sequence" eval="57"/>
-            <field name="note">Covered under the Payment of Gratuity Act, 1971: 
-(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
+            <field name="note">Covered under the Payment of Gratuity Act, 1971:
+(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x
 number of years of service (date of joining – date of retirement/leaving job)</field>
         </record>
 
@@ -328,12 +332,12 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">CPT</field>
             <field name="name">Deduction for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">none</field>			
+            <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="165"/>
         </record>
-        
+
          <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="-20" name="amount_fix"/>
@@ -367,7 +371,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">DLA</field>
             <field name="name">Deduction Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">none</field>			
+            <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="180"/>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 3f00ecf9c63..302611d9c92 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -44,6 +44,10 @@ class hr_contract(osv.osv):
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
+        'city_type': fields.selection([
+            ('metro', 'Metro'),
+            ('non-metro', 'Non-Metro'),
+            ], 'Type of City', readonly=False),
     }
 
 hr_contract()
@@ -244,4 +248,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index ddd6543df34..b1b98adf967 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -13,6 +13,7 @@
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="driver_salay"/>
+                        <field name="city_type"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>
@@ -24,7 +25,7 @@
             </data>
             </field>
         </record>
-        
+
         <record id="hr_employee_form_in_inherit" model="ir.ui.view">
             <field name="name">hr.employee.form.inherit</field>
             <field name="model">hr.employee</field>
@@ -55,7 +56,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -140,7 +141,7 @@
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
             <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
         </record>
-        
+
         <menuitem
             action="action_view_hr_bank_advice_tree"
             id="hr_menu_payment_advice"