From e8d5da1a81a2dadc35b126736f26abc975dc2ed4 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 23 Nov 2015 12:10:21 +0100 Subject: [PATCH] [FIX] have one list of notifications [IMP] use a nice formatting to show notifications for imported file --- .../models/account_bank_statement_import.py | 2 +- .../models/account_bank_statement_import.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/account_bank_statement_import/models/account_bank_statement_import.py b/account_bank_statement_import/models/account_bank_statement_import.py index 9a8b913..1a6e8a3 100644 --- a/account_bank_statement_import/models/account_bank_statement_import.py +++ b/account_bank_statement_import/models/account_bank_statement_import.py @@ -94,7 +94,7 @@ class AccountBankStatementImport(models.TransientModel): self._import_statement(stmt_vals)) if statement_id: statement_ids.append(statement_id) - notifications.append(new_notifications) + notifications.extend(new_notifications) if len(statement_ids) == 0: raise Warning(_('You have already imported that file.')) return statement_ids, notifications diff --git a/account_bank_statement_import_save_file/models/account_bank_statement_import.py b/account_bank_statement_import_save_file/models/account_bank_statement_import.py index 875e2c7..21f04a5 100644 --- a/account_bank_statement_import_save_file/models/account_bank_statement_import.py +++ b/account_bank_statement_import_save_file/models/account_bank_statement_import.py @@ -46,5 +46,7 @@ class AccountBankStatementImport(models.TransientModel): 'res_id': statement_id, 'type': 'binary', 'datas': base64.b64encode(data_file), - 'description': notifications, + 'description': '\n'.join( + '%(type)s: %(message)' % notification + for notification in notifications) or False, }