From 5ae87d32e3f05452c2829c38f6b14e842e7079ad Mon Sep 17 00:00:00 2001
From: Andrea <a.stirpe@onestein.nl>
Date: Tue, 2 Oct 2018 11:15:50 +0200
Subject: [PATCH 1/2] [9.0][FIX] account_bank_statement_import_camt: switch
 name and note

---
 account_bank_statement_import_camt/__openerp__.py   | 2 +-
 account_bank_statement_import_camt/models/parser.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/account_bank_statement_import_camt/__openerp__.py b/account_bank_statement_import_camt/__openerp__.py
index 2b1a3f56..2695c585 100644
--- a/account_bank_statement_import_camt/__openerp__.py
+++ b/account_bank_statement_import_camt/__openerp__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'CAMT Format Bank Statements Import',
-    'version': '9.0.1.0.0',
+    'version': '9.0.1.0.1',
     'license': 'AGPL-3',
     'author': 'Odoo Community Association (OCA), Therp BV',
     'website': 'https://github.com/OCA/bank-statement-import',
diff --git a/account_bank_statement_import_camt/models/parser.py b/account_bank_statement_import_camt/models/parser.py
index ed455fde..5a5305d0 100644
--- a/account_bank_statement_import_camt/models/parser.py
+++ b/account_bank_statement_import_camt/models/parser.py
@@ -54,12 +54,12 @@ class CamtParser(models.AbstractModel):
                 './ns:RmtInf/ns:Ustrd',
                 './ns:AddtlNtryInf',
                 './ns:Refs/ns:InstrId',
-            ], transaction, 'note', join_str='\n')
+            ], transaction, 'name', join_str='\n')
         # name
         self.add_value_from_node(
             ns, node, [
                 './ns:AddtlTxInf',
-            ], transaction, 'name', join_str='\n')
+            ], transaction, 'note', join_str='\n')
         # eref
         self.add_value_from_node(
             ns, node, [

From d76da10a8644f979c1b54d6e5d95320356f0fc8c Mon Sep 17 00:00:00 2001
From: Andrea <a.stirpe@onestein.nl>
Date: Tue, 2 Oct 2018 16:12:02 +0200
Subject: [PATCH 2/2] Adapt tests

---
 account_bank_statement_import_camt/README.rst        |  1 +
 .../test_files/golden-camt053.pydata                 | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/account_bank_statement_import_camt/README.rst b/account_bank_statement_import_camt/README.rst
index a564f7a8..39d4ee57 100644
--- a/account_bank_statement_import_camt/README.rst
+++ b/account_bank_statement_import_camt/README.rst
@@ -31,6 +31,7 @@ Contributors
 * Holger Brunn <hbrunn@therp.nl>
 * Stefan Rijnhart <srijnhart@therp.nl>
 * Ronald Portier <rportier@therp.nl>
+* Andrea Stirpe <a.stirpe@onestein.nl>
 
 Maintainer
 ----------
diff --git a/account_bank_statement_import_camt/test_files/golden-camt053.pydata b/account_bank_statement_import_camt/test_files/golden-camt053.pydata
index dcc56be0..b4e940de 100644
--- a/account_bank_statement_import_camt/test_files/golden-camt053.pydata
+++ b/account_bank_statement_import_camt/test_files/golden-camt053.pydata
@@ -9,8 +9,8 @@
                      'data': '<TxDtls xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">\n                        <Refs>\n                            <InstrId>INNDNL2U20141231000142300002844</InstrId>\n                            <EndToEndId>435005714488-ABNO33052620</EndToEndId>\n                            <MndtId>1880000341866</MndtId>\n                        </Refs>\n                        <AmtDtls>\n                            <TxAmt>\n                                <Amt Ccy="EUR">754.25</Amt>\n                            </TxAmt>\n                        </AmtDtls>\n                        <RltdPties>\n                            <Cdtr>\n                                <Nm>INSURANCE COMPANY TESTX</Nm>\n                                <PstlAdr>\n                                    <StrtNm>TEST STREET 20</StrtNm>\n                                    <TwnNm>1234 AB TESTCITY</TwnNm>\n                                    <Ctry>NL</Ctry>\n                                </PstlAdr>\n                            </Cdtr>\n                            <CdtrAcct>\n                                <Id>\n                                    <IBAN>NL46ABNA0499998748</IBAN>\n                                </Id>\n                            </CdtrAcct>\n                        </RltdPties>\n                        <RltdAgts>\n                            <CdtrAgt>\n                                <FinInstnId>\n                                    <BIC>ABNANL2A</BIC>\n                                </FinInstnId>\n                            </CdtrAgt>\n                        </RltdAgts>\n                        <RmtInf>\n                            <Ustrd>Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014</Ustrd>\n                        </RmtInf>\n                        <AddtlTxInf>MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014</AddtlTxInf>\n                    </TxDtls>\n                ',
                      'date': '2014-01-05',
                      'execution_date': '2014-01-05',
-                     'name': 'MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014',
-                     'note': 'Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014',
+                     'name': 'Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014',
+                     'note': 'MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014',
                      'partner_country': 'NL',
                      'partner_name': 'INSURANCE COMPANY TESTX',
                      'ref': '435005714488-ABNO33052620',
@@ -22,8 +22,8 @@
                      'data': '<TxDtls xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">\n                        <Refs>\n                            <InstrId>TESTBANK/NL/20141229/01206408</InstrId>\n                            <EndToEndId>TESTBANK/NL/20141229/01206408</EndToEndId>\n                            <MndtId>NL22ZZZ524885430000-C0125.1</MndtId>\n                        </Refs>\n                        <AmtDtls>\n                            <TxAmt>\n                                <Amt Ccy="EUR">564.05</Amt>\n                            </TxAmt>\n                        </AmtDtls>\n                        <RltdPties>\n                            <Cdtr>\n                                <Nm>Test Customer</Nm>\n                                <PstlAdr>\n                                    <Ctry>NL</Ctry>\n                                </PstlAdr>\n                            </Cdtr>\n                            <CdtrAcct>\n                                <Id>\n                                    <IBAN>NL46ABNA0499998748</IBAN>\n                                </Id>\n                            </CdtrAcct>\n                        </RltdPties>\n                        <RltdAgts>\n                            <CdtrAgt>\n                                <FinInstnId>\n                                    <BIC>ABNANL2A</BIC>\n                                </FinInstnId>\n                            </CdtrAgt>\n                        </RltdAgts>\n                        <RmtInf>\n                            <Ustrd>Direct Debit S14 0410</Ustrd>\n                        </RmtInf>\n                        <RtrInf>\n                            <Rsn>\n                                <Cd>AC06</Cd>\n                            </Rsn>\n                        </RtrInf>\n                        <AddtlTxInf>Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408</AddtlTxInf>\n                    </TxDtls>\n                ',
                      'date': '2014-01-05',
                      'execution_date': '2014-01-05',
-                     'name': 'Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
-                     'note': 'Direct Debit S14 0410',
+                     'name': 'Direct Debit S14 0410',
+                     'note': 'Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
                      'partner_country': 'NL',
                      'partner_name': 'Test Customer',
                      'ref': 'TESTBANK/NL/20141229/01206408',
@@ -35,8 +35,8 @@
                      'data': '<TxDtls xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">\n                        <Refs>\n                            <InstrId>INNDNL2U20140105000217200000708</InstrId>\n                            <EndToEndId>115</EndToEndId>\n                        </Refs>\n                        <AmtDtls>\n                            <TxAmt>\n                                <Amt Ccy="EUR">1405.31</Amt>\n                            </TxAmt>\n                        </AmtDtls>\n                        <RltdPties>\n                            <Dbtr>\n                                <Nm>3rd party Media</Nm>\n                                <PstlAdr>\n                                    <StrtNm>SOMESTREET 570-A</StrtNm>\n                                    <TwnNm>1276 ML HOUSCITY</TwnNm>\n                                    <Ctry>NL</Ctry>\n                                </PstlAdr>\n                            </Dbtr>\n                            <DbtrAcct>\n                                <Id>\n                                    <IBAN>NL69ABNA0522123643</IBAN>\n                                </Id>\n                            </DbtrAcct>\n                        </RltdPties>\n                        <RltdAgts>\n                            <DbtrAgt>\n                                <FinInstnId>\n                                    <BIC>ABNANL2A</BIC>\n                                </FinInstnId>\n                            </DbtrAgt>\n                        </RltdAgts>\n                        <AddtlTxInf>#RD PARTY MEDIA CUSNO 90782 4210773</AddtlTxInf>\n                    </TxDtls>\n                ',
                      'date': '2014-01-05',
                      'execution_date': '2014-01-05',
-                     'name': '#RD PARTY MEDIA CUSNO 90782 4210773',
-                     'note': 'INNDNL2U20140105000217200000708',
+                     'name': 'INNDNL2U20140105000217200000708',
+                     'note': '#RD PARTY MEDIA CUSNO 90782 4210773',
                      'partner_country': 'NL',
                      'partner_name': '3rd party Media',
                      'ref': '115',