From e6ecd8a21681b4c5ccbc0fc3683820be4e6d1111 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 23 May 2011 11:03:11 +0530 Subject: [PATCH] [IMP] hr_payroll: Improve contribution register report, remove unwanted get_register function bzr revid: psi@tinyerp.co.in-20110523053311-9lj0z6lv00krbljd --- .../hr_payroll/report/report_contribution_register.py | 11 +---------- .../report/report_contribution_register.rml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py index 5edde72b561..8648132262c 100644 --- a/addons/hr_payroll/report/report_contribution_register.py +++ b/addons/hr_payroll/report/report_contribution_register.py @@ -33,7 +33,6 @@ class contribution_register_report(report_sxw.rml_parse): super(contribution_register_report, self).__init__(cr, uid, name, context) self.localcontext.update({ 'get_payslip_lines': self._get_payslip_lines, - 'get_registers': self._get_registers, }) def set_context(self, objects, data, ids, report_type=None): @@ -41,15 +40,7 @@ class contribution_register_report(report_sxw.rml_parse): self.date_to = data['form'].get('date_to', str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10]) return super(contribution_register_report, self).set_context(objects, data, ids, report_type=report_type) - def _get_registers(self,form): - result = [] - periods = [] - register_obj = self.pool.get('hr.contribution.register') - register_ids = form['contribution_register'] - result = register_obj.browse(self.cr,self.uid, register_ids) - return result - - def _get_payslip_lines(self, obj, form): + def _get_payslip_lines(self, obj): payslip_obj = self.pool.get('hr.payslip') payslip_line = self.pool.get('hr.payslip.line') res = [] diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml index 441641d6ac9..67c9d1d787a 100644 --- a/addons/hr_payroll/report/report_contribution_register.rml +++ b/addons/hr_payroll/report/report_contribution_register.rml @@ -116,7 +116,7 @@
- [[repeatIn(get_payslip_lines(o, data['form']),'r') ]] + [[repeatIn(get_payslip_lines(o),'r') ]]