From 7f97f2e2b3e34fda9c8ecc33073edade0e84e906 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 6 May 2011 12:09:03 +0530 Subject: [PATCH] [IMP] Payroll: Clean the code bzr revid: mra@mra-laptop-20110506063903-4hno1tb6enrd0bk4 --- addons/hr_payroll/hr_payroll.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 61b156263c5..31806a6f2ec 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -623,10 +623,10 @@ class hr_payslip(osv.osv): FROM hr_payslip as hp, hr_payslip_line as pl \ WHERE hp.employee_id = %s AND hp.state in ('confirm','done') \ AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND pl.code = %s", - (employee, from_date, to_date, code )) + (employee, from_date, to_date, code)) res = cr.fetchone() return res and res[0] or 0.0 - + hr_payslip() class hr_payslip_input(osv.osv): @@ -649,7 +649,7 @@ class hr_payslip_input(osv.osv): _defaults = { 'sequence': 10, } - + def sum(self, cr, uid, code, field, from_date, to_date=None, employee=False, context=None): if not employee: return 0.0 @@ -663,13 +663,12 @@ class hr_payslip_input(osv.osv): WHERE hp.employee_id = %s AND hp.state in ('confirm','done') \ AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s", (employee, from_date, to_date, code)) - res = cr.fetchall() - input_ids = [r[0] for r in res] - input_lines = self.read(cr, uid, input_ids, [field], context=context) - for dict in input_lines: - result += dict.get(field) + input_ids = [r[0] for r in cr.fetchall()] + input_data = self.read(cr, uid, input_ids, [field], context=context) + for input in input_data: + result += input.get(field) return result - + hr_payslip_input() class hr_salary_rule(osv.osv):