diff options
| author | Jay (OpenERP) <jvo@tinyerp.com> | 2010-09-27 18:08:06 +0530 |
|---|---|---|
| committer | Jay (OpenERP) <jvo@tinyerp.com> | 2010-09-27 18:08:06 +0530 |
| commit | 449c4ae7bf4ecc3bdfb5193de03f6212e09f07d1 (patch) | |
| tree | 9bbe6b71cca95b2a96945a7e6aa7c7937c64e35a /addons | |
| parent | a15e21270b32440b50dfa0b048757bc8b284dc1d (diff) | |
[FIX] Corrected failures caused by previous commits,Thanks to builbot
bzr revid: jvo@tinyerp.com-20100927123806-hz4nh1imppi772cn
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/account_bank_statement.py | 2 | ||||
| -rw-r--r-- | addons/analytic/analytic.py | 1 | ||||
| -rw-r--r-- | addons/hr_timesheet/hr_timesheet.py | 2 |
3 files changed, 3 insertions, 2 deletions
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) |