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

[IMP]removed changes from hr_payroll and changed code for Professional tax. 

bzr revid: kbh@tinyerp.com-20120524062846-5had196y4n50fpli
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-05-24 11:58:46 +05:30
parent c77d5a88e9
commit 2d9090c8f0
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
addons/hr_payroll/hr_payroll_demo.xml
View File

@ -16,26 +16,21 @@
<field name="name">Professional Tax Register</field>
</record>
<record id="hr_meal_voucher_register" model="hr.contribution.register">
<record id="hr_meal_voucher_register" model="hr.contribution.register">
<field name="name">Meal Voucher Register</field>
</record>
<!-- Salary Rules -->
<record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
<field name="amount_select">percentage</field>
<field eval="40.0" name="amount_percentage"/>
<field name="amount_percentage_base">contract.wage</field>
<field name="code">HRA</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="register_id" ref="hr_houserent_register"/>
<field name="name">House Rent Allowance</field>
<field name="amount_select">percentage</field>
<field eval="40.0" name="amount_percentage"/>
<field name="amount_percentage_base">contract.wage</field>
<field name="code">HRA</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="register_id" ref="hr_houserent_register"/>
<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>
<field name="sequence" eval="5"/>
</record>
<record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
@ -55,7 +50,6 @@ Income tax exemption for HRA will be least of following:
<field name="category_id" ref="hr_payroll.DED"/>
<field name="register_id" ref="hr_professional_tax_register"/>
<field name="name">Professional Tax</field>
<field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.</field>
</record>
<record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
@ -78,6 +72,17 @@ Income tax exemption for HRA will be least of following:
<field name="sequence" eval="15"/>
</record>
<record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
<field name="amount_select">fix</field>
<field eval="10" name="amount_fix"/>
<field name="quantity">worked_days.WORK100.number_of_days</field>
<field name="code">MA</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="register_id" ref="hr_meal_voucher_register"/>
<field name="name">Meal Voucher</field>
<field name="sequence" eval="16"/>
</record>
<record id="hr_salary_rule_sales_commission" model="hr.salary.rule">
<field name="amount_select">code</field>
<field name="code">SALE</field>
@ -85,7 +90,7 @@ Income tax exemption for HRA will be least of following:
<field name="name">Get 1% of sales</field>
<field name="sequence" eval="17"/>
<field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
</record>
</record>
<!-- Rule Inputs -->
@ -106,7 +111,7 @@ Income tax exemption for HRA will be least of following:
<record id="structure_001" model="hr.payroll.structure">
<field name="code">ME</field>
<field name="name">Marketing Executive</field>
<field eval="[(6, 0, [ref('hr_salary_rule_houserentallowancemetro'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
<field eval="[(6, 0, [ref('hr_salary_rule_houserentallowance1'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
<field name="company_id" ref="base.main_company"/>
<field name="parent_id" ref="structure_base"/>
</record>
@ -114,7 +119,7 @@ Income tax exemption for HRA will be least of following:
<record id="structure_002" model="hr.payroll.structure">
<field name="code">MEQP</field>
<field name="name">Marketing Executive for Quentin Paolino</field>
<field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_food_coupon')])]" name="rule_ids"/>
<field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_meal_voucher')])]" name="rule_ids"/>
<field name="company_id" ref="base.main_company"/>
<field name="parent_id" ref="structure_001"/>
</record>

2
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
View File

@ -374,7 +374,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
<!--Deductions -->
<record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
<field name="code">PT</field>
<field name="code">PTD</field>
<field name="name">Professional Tax</field>
<field name="category_id" ref="hr_payroll.DED"/>
<field name="condition_select">python</field>