[FIX] payroll: grouping of details by salayr head AND domain is not applied on first tab of payslip, we should see there only the payslip lines with appears_on_payslip = True
bzr revid: mra@mra-laptop-20110411113637-qfnxuylu1icn6889
This commit is contained in:
@@ -352,7 +352,7 @@ class hr_payslip(osv.osv):
|
||||
else:
|
||||
#if we don't give the contract, then the rules to apply should be for all current contracts of the employee
|
||||
contract_ids = self.get_contract(cr, uid, payslip.employee_id, payslip.date_from, payslip.date_to, context=context)
|
||||
lines = [(0,0,line) for line in self.pool.get('hr.payslip').get_payslip_lines(cr, uid, contract_ids, payslip.id, context=context)]
|
||||
lines = [(0,0,line) for line in self.pool.get('hr.payslip').get_payslip_lines(cr, uid, contract_ids, payslip.id, context=context) if line['appears_on_payslip']]
|
||||
self.write(cr, uid, [payslip.id], {'line_ids': lines}, context=context)
|
||||
return True
|
||||
|
||||
|
||||
@@ -237,7 +237,7 @@
|
||||
</page>
|
||||
<!-- TODO: put me back -->
|
||||
<page string="Details By Salary Head">
|
||||
<field name="details_by_salary_head" nolabel="1">
|
||||
<field name="details_by_salary_head" context="{'group_by':'category_id'}" nolabel="1">
|
||||
<tree string="Payslip Lines">
|
||||
<field name="category_id"/>
|
||||
<field name="sequence" groups="base.group_extended"/>
|
||||
|
||||
Reference in New Issue
Block a user