From 4805c12199698ab101ea26bf6d3e599ab8345630 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 4 Jul 2012 16:47:21 +0200 Subject: [PATCH] [FIX] OPW 576406: bank.statement: fix incorrect test + cleanup bad variable names bzr revid: odo@openerp.com-20120704144721-9moczgo1k3shuh7j --- addons/account/account_bank_statement.py | 8 ++++---- addons/account/test/account_bank_statement.yml | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 56a5e8eeaf4..13d134dc94a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -373,11 +373,11 @@ class account_bank_statement(osv.osv): for st in self.browse(cr, uid, ids, context=context): if st.state=='draft': continue - ids = [] + move_ids = [] for line in st.line_ids: - ids += [x.id for x in line.move_ids] - account_move_obj.button_cancel(cr, uid, ids, context=context) - account_move_obj.unlink(cr, uid, ids, context) + move_ids += [x.id for x in line.move_ids] + account_move_obj.button_cancel(cr, uid, move_ids, context=context) + account_move_obj.unlink(cr, uid, move_ids, context) done.append(st.id) return self.write(cr, uid, done, {'state':'draft'}, context=context) diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml index 37789f3ad66..4e8280d3156 100644 --- a/addons/account/test/account_bank_statement.yml +++ b/addons/account/test/account_bank_statement.yml @@ -69,5 +69,7 @@ !python {model: account.bank.statement}: | try: self.button_cancel(cr, uid, [ref("account_bank_statement_0")]) - except Exception, e: - assert e[0]=='UserError', 'Another exception has been raised!' + assert False, "An exception should have been raised, the journal should not let us cancel moves!" + except Exception: + # exception was raised as expected, as the journal does notallow cancelling moves + pass