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

[IMP] hr_payroll: Improve demo data(set negative value for deduction) 

bzr revid: psi@tinyerp.co.in-20110309103758-x4kzt9kn5krogre3
This commit is contained in:
psi (Open ERP) 2011-03-09 16:07:58 +05:30
parent b46811e762
commit 8b1895b8e8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr_payroll/hr_payroll.py
View File

@ -1273,7 +1273,6 @@ class hr_employee(osv.osv):
'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
'basic': fields.function(_calculate_basic, method=True, multi='dc', type='float', string='Basic Salary', digits_compute=dp.get_precision('Account')),
#FIXME the function has to make the sum of basic field of all the hr.contract for this employee that have date_start < now() and now() < date_stop or not date_stop
}
hr_employee()

10
addons/hr_payroll/hr_payroll_demo.xml
View File

@ -31,7 +31,7 @@
<record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
<field name="amount_type">fix</field>
<field eval="15" name="sequence"/>
<field eval="200.0" name="amount"/>
<field eval="-200.0" name="amount"/>
<field name="code">PT</field>
<field name="type" ref="DED"/>
<field name="category_id" ref="hr_payroll.PT"/>
@ -43,7 +43,7 @@
<record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
<field name="amount_type">per</field>
<field eval="20" name="sequence"/>
<field eval="0.125" name="amount"/>
<field eval="-0.125" name="amount"/>
<field name="code">PF</field>
<field name="type" ref="DED"/>
<field name="category_id" ref="hr_payroll.PF"/>
@ -51,16 +51,16 @@
<field name="name">Provident Fund</field>
<field name="sequence" eval="50"/>
</record>
<!-- Salary Structure -->
<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 name="company_id" ref="base.main_company"/>
</record>
<!-- Employee -->
<record id="hr_employee_bonamy0" model="hr.employee">
<field eval="0" name="manager"/>