summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormtr <mtr@mtr>2011-05-05 18:19:59 +0530
committermtr <mtr@mtr>2011-05-05 18:19:59 +0530
commit3bca5dc9c83da08f0bfcd860e36f2c8c145ce75f (patch)
tree0e109e3106d0f5af30234709173ae41fb04f56b7
parent12aeaca5533922ab38badba0cec649553f87fb20 (diff)
[IMP] hr_payroll: minor improvement in methods for parameter employee
bzr revid: mtr@mtr-20110505124959-062hns4ca03vltbu
-rw-r--r--addons/hr_payroll/hr_payroll.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 628fd03ecbc..61b156263c5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -613,12 +613,12 @@ class hr_payslip(osv.osv):
return self.onchange_employee_id(cr, uid, ids, date_from=date_from, date_to=date_to, employee_id=employee_id, contract_id=contract_id, context=context)
def sum(self, cr, uid, code, from_date, to_date=None, employee=False, context=None):
+ if not employee:
+ return 0.0
if context is None:
context = {}
if to_date is None:
to_date = datetime.now().strftime('%Y-%m-%d')
- if not employee:
- return 0.0
cr.execute("SELECT sum(pl.total) \
FROM hr_payslip as hp, hr_payslip_line as pl \
WHERE hp.employee_id = %s AND hp.state in ('confirm','done') \
@@ -651,12 +651,12 @@ class hr_payslip_input(osv.osv):
}
def sum(self, cr, uid, code, field, from_date, to_date=None, employee=False, context=None):
+ if not employee:
+ return 0.0
if context is None:
context = {}
if to_date is None:
to_date = datetime.now().strftime('%Y-%m-%d')
- if not employee:
- return 0.0
result = 0.0
cr.execute("SELECT pi.id \
FROM hr_payslip as hp, hr_payslip_input as pi \