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

[FIX]l10n_in_hr_payroll:rules improved,help updated 

bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-08-29 15:12:52 +05:30
parent 6aa5ea647f
commit b1724905d4
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
View File

@ -1,5 +1,5 @@
"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
1,"fix",1,1,,1200,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
2,"fix",2,10,,2400,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",

1 id amount_select condition_range_min condition_range_max amount_percentage amount_fix name category_id sequence code parent_rule_id/id condition_select condition_range amount_percentage_base
2 1 fix 1 1 1200 100 Education Allowance For One Child Allowance 23 CHEAONE hr_payroll_rule_child1 range employee.children
3 2 fix 2 10 2400 200 Education Allowance For Two Child Allowance 24 CHEATWO hr_payroll_rule_child1 range employee.children
4 3 fix 1 1 300 Child Hostel Allowance For One Child Allowance 26 CHOONE hr_payroll_rule_child2 range employee.children
5 4 fix 2 10 600 Child Hostel Allowance For Two Child Allowance 27 CHOTWO hr_payroll_rule_child2 range employee.children

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

@ -208,13 +208,22 @@ Now difference of income tax between payment year and actual year would be allow
<field name="note">This would be fully taxable based on Bonus.</field>
</record>
<record id="hr_salary_rule_medical_allow" model="hr.salary.rule">
<field name="code">MEDA</field>
<field name="name">Medical Allowance</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="amount_select">fix</field>
<field eval="1250.0" name="amount_fix"/>
<field name="sequence" eval="43"/>
<field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
</record>
<record id="hr_salary_rule_medical" model="hr.salary.rule">
<field name="code">MEDA</field>
<field name="name">Medical Reimbursement</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="amount_select">fix</field>
<field eval="1250.0" name="amount_fix"/>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = inputs.MR.amount</field>
<field name="sequence" eval="32"/>
<field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
</record>
@ -225,7 +234,7 @@ Now difference of income tax between payment year and actual year would be allow
<field name="quantity">worked_days.WORK100.number_of_days</field>
<field name="code">FC</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="name">Food Coupons Allowance</field>
<field name="name">Food Allowance</field>
<field name="register_id" ref="hr_food_coupen_register"/>
<field name="sequence" eval="33"/>
</record>
@ -542,5 +551,10 @@ Now difference of income tax between payment year and actual year would be allow
<field name="name">Leave Availed</field>
<field name="input_id" ref="hr_payslip_rule_dla"/>
</record>
<record id="hr_rule_input_medical" model="hr.rule.input">
<field name="code">MR</field>
<field name="name">Medical Reimbursement</field>
<field name="input_id" ref="hr_salary_rule_medical"/>
</record>
</data>
</openerp>

6
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
View File

@ -44,9 +44,9 @@ class hr_contract(osv.osv):
'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
'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(%)"),
'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.And VPF computed as percentage(%)"),
'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses.And HRA computed as percentage(%)"),
'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll'), help="Supplementary Allowance provides a basic weekly allowance to eligible people who have little or no income"),
}
hr_contract()