Purnendu Singh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-contribution-regi-demo-psi into
lp:~openerp-dev/openobject-addons/trunk-payroll.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-contribution-regi-demo-psi/+merge/66257
Hello,
Added demo data for contribution register and updated few salary rules demo
data.
Thanks,
Purnendu Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-contribution-regi-demo-psi/+merge/66257
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-contribution-regi-demo-psi into
lp:~openerp-dev/openobject-addons/trunk-payroll.
=== modified file 'hr_payroll/hr_payroll_demo.xml'
--- hr_payroll/hr_payroll_demo.xml 2011-05-24 06:02:02 +0000
+++ hr_payroll/hr_payroll_demo.xml 2011-06-29 08:53:33 +0000
@@ -2,43 +2,57 @@
<openerp>
<data>
+ <!-- Contribution Register -->
+
+ <record id="hr_contribution_register_allowance" model="hr.contribution.register">
+ <field name="name">Contribution Register for Allowances</field>
+ </record>
+
+ <record id="hr_contribution_register_deduction" model="hr.contribution.register">
+ <field name="name">Contribution Register for Deductions</field>
+ </record>
+
<!-- Salary Rules -->
- <record id="hr_payslip_line_houserantallowance1" model="hr.salary.rule">
+ <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_contribution_register_allowance"/>
<field name="name">House Rent Allowance</field>
<field name="sequence" eval="5"/>
</record>
- <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
+ <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
<field name="amount_select">fix</field>
<field eval="800.0" name="amount_fix"/>
<field name="code">CA</field>
<field name="category_id" ref="hr_payroll.ALW"/>
+ <field name="register_id" ref="hr_contribution_register_allowance"/>
<field name="name">Conveyance Allowance</field>
<field name="sequence" eval="10"/>
</record>
- <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
+ <record id="hr_salary_rule_professionaltax1" model="hr.salary.rule">
<field name="amount_select">fix</field>
<field eval="150" name="sequence"/>
<field eval="-200.0" name="amount_fix"/>
<field name="code">PT</field>
<field name="category_id" ref="hr_payroll.DED"/>
+ <field name="register_id" ref="hr_contribution_register_deduction"/>
<field name="name">Professional Tax</field>
</record>
- <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
+ <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
<field name="amount_select">percentage</field>
<field eval="120" name="sequence"/>
<field eval="-12.5" name="amount_percentage"/>
<field name="amount_percentage_base">contract.wage</field>
<field name="code">PF</field>
<field name="category_id" ref="hr_payroll.DED"/>
+ <field name="register_id" ref="hr_contribution_register_deduction"/>
<field name="name">Provident Fund</field>
</record>
@@ -89,7 +103,7 @@
<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_payslip_line_houserantallowance1'), ref('hr_payslip_line_convanceallowance1'),ref('hr_payslip_line_professionaltax1'),ref('hr_payslip_line_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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
