From 82b0249a9d05c67342a276dbc94314dc10a33c3d Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Wed, 29 Jun 2011 14:50:32 +0530 Subject: [PATCH 1/2] [IMP] hr_payroll: Improve the contribution register report so it will now show the lines of confirmed payslips only bzr revid: psi@tinyerp.co.in-20110629092032-2uq3i90evylxy8zu --- addons/hr_payroll/report/report_contribution_register.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py index bd9e00d3832..e32e93532b5 100644 --- a/addons/hr_payroll/report/report_contribution_register.py +++ b/addons/hr_payroll/report/report_contribution_register.py @@ -54,6 +54,7 @@ class contribution_register_report(report_sxw.rml_parse): "LEFT JOIN hr_payslip AS hp on (pl.slip_id = hp.id) "\ "WHERE (hp.date_from >= %s) AND (hp.date_to <= %s) "\ "AND pl.register_id = %s "\ + "AND hp.state = 'done' "\ "ORDER BY pl.slip_id, pl.sequence", (self.date_from, self.date_to, obj.id)) payslip_lines = [x[0] for x in self.cr.fetchall()] From 4c37aafc45119db0e26033d98e42b3ff9a02943f Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Wed, 29 Jun 2011 16:01:10 +0530 Subject: [PATCH 2/2] [IMP] hr_payroll: remove abs from contribution report bzr revid: psi@tinyerp.co.in-20110629103110-kjqz620ybuwxxswb --- addons/hr_payroll/report/report_contribution_register.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml index fedacc8786e..efe2955b22d 100644 --- a/addons/hr_payroll/report/report_contribution_register.rml +++ b/addons/hr_payroll/report/report_contribution_register.rml @@ -222,7 +222,7 @@ Total: - [[ formatLang(abs(sum_total())) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]