From 04cebbd5378d403c6a80fe44422ea11deb3f19e3 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 30 Sep 2015 17:12:10 +0200 Subject: [PATCH] [IMP] hr_payroll: remove broken field total_wage This field is broken since 230e12b in 2011 (return value to inexistant 'basic' key). As it was never used and not working, remove it. Closes #8781 Closes #8785 --- addons/hr_payroll/hr_payroll.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b51a07a244f..3362dee3555 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -924,24 +924,6 @@ class hr_employee(osv.osv): _inherit = 'hr.employee' _description = 'Employee' - def _calculate_total_wage(self, cr, uid, ids, name, args, context): - if not ids: return {} - res = {} - 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} - continue - cr.execute( 'SELECT SUM(wage) '\ - 'FROM hr_contract '\ - 'WHERE employee_id = %s '\ - 'AND date_start <= %s '\ - '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']} - return res - def _payslip_count(self, cr, uid, ids, field_name, arg, context=None): Payslip = self.pool['hr.payslip'] return { @@ -951,6 +933,5 @@ class hr_employee(osv.osv): _columns = { 'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True), - 'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Payroll'), help="Sum of all current contract's wage of employee."), 'payslip_count': fields.function(_payslip_count, type='integer', string='Payslips', groups="base.group_hr_user"), }