odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]l10n_in_hr_payroll:HRA rule improved,removed field. 

bzr revid: kbh@tinyerp.com-20120822125933-bsiky3e4ttawry7a
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-08-22 18:29:33 +05:30
parent f958f6f064
commit 13485fd6b0
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
View File

@ -34,27 +34,27 @@
<record id="hr_company_transport_register" model="hr.contribution.register">
<field name="name">Register for Company Provided Transport Deduction</field>
</record>
<record id="hr_food_coupen_deduction_register" model="hr.contribution.register">
<field name="name">Register for Food Coupons Deduction</field>
</record>
<record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
<field name="name">Register for State Labour Welfare Fund Deduction</field>
</record>
<record id="hr_group_term_insurance_register" model="hr.contribution.register">
<field name="name">Register for Company Provided Group Term Insurance Deduction</field>
</record>
<record id="hr_leave_availed_register" model="hr.contribution.register">
<field name="name">Register for Leave Availed Deduction</field>
</record>
<record id="hr_medical_insurance_register" model="hr.contribution.register">
<field name="name">Register for Company Provided Medical Insurance Deduction</field>
</record>
<record id="hr_other_deduction_register" model="hr.contribution.register">
<field name="name">Register for Other Deduction from Employer</field>
</record>
@ -73,7 +73,7 @@
<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) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='non-metro') else 0.00</field>
<field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100)</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"/>

7
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
View File

@ -45,16 +45,9 @@ class hr_contract(osv.osv):
'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for 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'),
'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
}
_defaults = {
'city_type': 'non-metro',
}
hr_contract()

1
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
View File

@ -13,7 +13,6 @@
<group col="2" colspan="2" name="right_column">
<separator colspan="2" string="Allowance"/>
<field name="driver_salay"/>
<field name="city_type"/>
<field name="house_rent_allowance_metro_nonmetro"/>
<field name="supplementary_allowance"/>
</group>