summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMack <mackzxh@gmail.com>2015-09-30 15:32:13 +0800
committerMartin Trigaux <mat@odoo.com>2015-10-08 12:20:29 +0200
commitf8b56e4f40b49436abbda006a0e77adfbe2ce72a (patch)
tree01b9013757951be2be25ba9819faaefbc5a9df27
parent096fe8a05cd99c5c181d0fa793db0767c8070465 (diff)
[FIX] hr_payroll: total_wage return format
Field removed in 9.0 at 04cebbd (because useless). This avoids an error if read. cf #8781
-rw-r--r--addons/hr_payroll/hr_payroll.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 52e2a6f30c8..b18b52af64c 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -975,7 +975,7 @@ class hr_employee(osv.osv):
current_date = datetime.now().strftime('%Y-%m-%d')
for employee in self.browse(cr, uid, ids, context=context):
if not employee.contract_ids:
- res[employee.id] = {'basic': 0.0}
+ res[employee.id] = 0.0
continue
cr.execute( 'SELECT SUM(wage) '\
'FROM hr_contract '\
@@ -984,7 +984,7 @@ class hr_employee(osv.osv):
'AND (date_end > %s OR date_end is NULL)',
(employee.id, current_date, current_date))
result = dict(cr.dictfetchone())
- res[employee.id] = {'basic': result['sum']}
+ res[employee.id] = result['sum']
return res
_columns = {