diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml index 484866c15..5d3dfda68 100644 --- a/account_banking/account_banking_view.xml +++ b/account_banking/account_banking_view.xml @@ -192,7 +192,7 @@ - black:state == 'confirmed';darkmagenta:match_multi == True;grey:state=='draft';crimson:duplicate == True; + black:state == 'confirmed';darkmagenta:match_multi == True;crimson:duplicate == True;grey:state == 'draft'; diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py index 95eb6d2b9..a0cd64c5c 100644 --- a/account_banking/banking_import_transaction.py +++ b/account_banking/banking_import_transaction.py @@ -766,10 +766,10 @@ class banking_import_transaction(osv.osv): else: account_id = journal.default_debit_account_id.id cancel_line = False - move_lines = [ + move_lines = [] + for move in transaction.statement_line_id.move_ids: # There should usually be just one move, I think - move.line_id for move in transaction.statement_line_id.move_ids - ] + move_lines += move.line_id for line in move_lines: if line.account_id.id != account_id: cancel_line = line