[FIX] Corrected failures caused by previous commits,Thanks to builbot

bzr revid: jvo@tinyerp.com-20100927123806-hz4nh1imppi772cn
This commit is contained in:
Jay (OpenERP)
2010-09-27 18:08:06 +05:30
parent a15e21270b
commit 449c4ae7bf
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -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'
+1 -1
View File
@@ -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)