pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb
This commit is contained in:
Quentin (OpenERP)
2011-04-08 19:31:29 +02:00
parent 0df1e74d79
commit a79f6fe7a5
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/test/test_hr_contract.yml
+1 -1
View File
@@ -11,7 +11,7 @@
name: Mark Johnson
user_id: base.user_root
children: 2
marital: hr.hr_employee_marital_status_married
marital: 'married'
place_of_birth: Belgium
vehicle: 'No'
vehicle_distance: 12
addons/hr_payroll/hr_payroll_demo.xml
+4 -8
View File
@@ -9,8 +9,7 @@
<field eval="40.0" name="amount_percentage"/>
<field name="amount_percentage_base">contract.wage</field>
<field name="code">HRA</field>
<field name="type" ref="AL"/>
<field name="category_id" ref="hr_payroll.HRA"/>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="name">House Rent Allowance</field>
<field name="sequence" eval="5"/>
</record>
@@ -19,8 +18,7 @@
<field name="amount_select">fix</field>
<field eval="800.0" name="amount_fix"/>
<field name="code">CA</field>
<field name="type" ref="AL"/>
<field name="category_id" ref="hr_payroll.CA"/>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="name">Conveyance Allowance</field>
<field name="sequence" eval="10"/>
</record>
@@ -30,8 +28,7 @@
<field eval="15" name="sequence"/>
<field eval="-200.0" name="amount_fix"/>
<field name="code">PT</field>
<field name="type" ref="DED"/>
<field name="category_id" ref="hr_payroll.PT"/>
<field name="category_id" ref="hr_payroll.DED"/>
<field name="name">Professional Tax</field>
</record>
@@ -41,8 +38,7 @@
<field eval="-12.5" name="amount_percentage"/>
<field name="amount_percentage_base">contract.wage</field>
<field name="code">PF</field>
<field name="type" ref="DED"/>
<field name="category_id" ref="hr_payroll.PF"/>
<field name="category_id" ref="hr_payroll.DED"/>
<field name="name">Provident Fund</field>
</record>