diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 6b8f07d0e52..647d80e61be 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -412,7 +412,7 @@ class account_bank_statement(osv.osv): if t['state'] in ('draft'): unlink_ids.append(t['id']) else: - raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement which are already confirmed !')) + raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement(s) which are already confirmed !')) osv.osv.unlink(self, cr, uid, unlink_ids, context=context) return True diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index b97edb9a546..cf96028f01c 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -282,6 +282,7 @@ class account_analytic_line(osv.osv): _defaults = { 'date': time.strftime('%Y-%m-%d'), 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c), + 'amount' : 0.00 } _order = 'date desc' diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index de448ced584..ee4abdb35c4 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -64,7 +64,7 @@ class hr_analytic_timesheet(osv.osv): if prod_id and unit_amount: # find company company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context) - res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context) + res.update(self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)) # update unit of measurement if prod_id: uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context)