[MERGE] l10n_in_hr-payroll: One field added on contract type of city which will be...

bzr revid: mra@tinyerp.com-20120716122438-l68c02q4ohdf6xf9

diff --cc addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8816ee2,20ed708..bccf031
--- 1/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
--- 2/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
@@@ -13,36 -13,21 +13,15 @@@
              <field name="sequence" eval="13"/>
          </record>
  
--        <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
-             <field name="code">HRAM</field>
 -            <field name="code">HRA</field>
++        <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
++            <field name="code">HRAMN</field>
              <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50)</field>
+             <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 city</field>
 -            <field name="name">House Rent Allowance</field>
++            <field name="name">House Rent Allowance for metro and nonmetro city</field>
              <field name="sequence" eval="51"/>
--            <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.
-     2. 40% (if living in non-metro area).
-     3. Rent paid minus 10% of (basic salary+DA).
-             </field>
 -    2. 50% (if living in metro area) and 40% (if living in non-metro area) of (basic salary+Dearness allowance).
 -    3. Rent paid minus 10% of (basic salary+DA).
 -            </field>
          </record>
  
-         <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
-             <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40)</field>
-             <field name="code">HRANM</field>
-             <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="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.
-     2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
-     3. Rent paid minus 10% of (basic salary+DA).
-              </field>
-          </record>
- 
          <record id="hr_salary_trans_allownce" model="hr.salary.rule">
              <field name="code">TCA</field>
              <field name="name">Transport/Conveyance Allownace</field>

diff --cc addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 6eef530,9dcf69e..26e51d3
--- 1/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
--- 2/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@@ -45,6 -44,13 +45,13 @@@ 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),
++            ('non-metro', 'Non Metro'),
++            ], 'Type of City'),
+     }
+     _defaults = {
+         'city_type': 'non-metro',
      }
  
  hr_contract()

diff --cc addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
Simple merge