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

[IMP] hr_payroll: code improvment in details by payslip report 

bzr revid: psi@tinyerp.co.in-20110602132346-x23d19p3j2ulancv
This commit is contained in:
psi (Open ERP) 2011-06-02 18:53:46 +05:30
parent 51f8615651
commit 664fbb68d6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/hr_payroll/report/report_payslip_details.py
View File

@ -64,8 +64,9 @@ class payslip_details_report(report_sxw.rml_parse):
for key, value in result.iteritems():
rule_categories = rule_cate_obj.browse(self.cr, self.uid, [key])
parents = get_recursive_parent(rule_categories)
self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\
WHERE pl.id in %s''',(tuple(value),))
category_total = 0
for line in payslip_line.browse(self.cr, self.uid, value):
category_total += line.total
level = 0
for parent in parents:
res.append({
@ -73,7 +74,7 @@ class payslip_details_report(report_sxw.rml_parse):
'name': parent.name,
'code': parent.code,
'level': level,
'total': self.cr.fetchone()[0] or 0.0,
'total': category_total,
})
level += 1
for line in payslip_line.browse(self.cr, self.uid, value):
@ -96,11 +97,12 @@ class payslip_details_report(report_sxw.rml_parse):
result.setdefault(obj[id].register_id.name, [])
result[obj[id].register_id.name].append(obj[id].id)
for key, value in result.iteritems():
self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\
WHERE pl.id in %s''',(tuple(value),))
register_total = 0
for line in payslip_line.browse(self.cr, self.uid, value):
register_total += line.total
res.append({
'register_name': key,
'total': self.cr.fetchone()[0] or 0.0,
'total': register_total,
})
for line in payslip_line.browse(self.cr, self.uid, value):
res.append({