Merge PR #511 into 12.0

Signed-off-by alexey-pelykh

account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_parser.py

@@ -311,12 +311,11 @@ class AccountBankStatementImportSheetParser(models.TransientModel):
                 transaction_id,
             )
         if note and notes:
-            note = '%s\n%s' % (
-                note,
-                note.strip(),
-            )
+            note = "{}\n{}".format(notes, note.strip())
         elif note:
             note = note.strip()
+        elif notes:
+            note = notes
         if note:
             transaction['note'] = note