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

[IMP] hr_payroll: if employee is not provided in an argument it returns 0 

bzr revid: mtr@mtr-20110505072004-1254kzo59rv9z97e
This commit is contained in:
mtr 2011-05-05 12:50:04 +05:30
parent 89a6e52202
commit e04c62a5f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/hr_payroll/hr_payroll.py
View File

@ -612,11 +612,11 @@ class hr_payslip(osv.osv):
res['value'].update({'struct_id': False})
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 payslip_sum(self, cr, uid, code, from_date, to_date=datetime.now().strftime('%Y-%m-%d'), employee, context=None):
def payslip_sum(self, cr, uid, code, from_date, to_date=datetime.now().strftime('%Y-%m-%d'), employee=False, context=None):
if context is None:
context = {}
if not employee:
employee = 0
return 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') \
@ -625,12 +625,12 @@ class hr_payslip(osv.osv):
res = cr.fetchone()
return res and res[0] or 0.0
def worked_days_sum(self, cr, uid, code, field, from_date, to_date=datetime.now().strftime('%Y-%m-%d'), employee, context=None):
def worked_days_sum(self, cr, uid, code, field, from_date, to_date=datetime.now().strftime('%Y-%m-%d'), employee=False, context=None):
payslip_input_obj = self.pool.get('hr.payslip.input')
if context is None:
context = {}
if not employee:
employee = 0
return 0
result = 0.0
cr.execute("SELECT pi.id \
FROM hr_payslip as hp, hr_payslip_input as pi \