From c564251a02958183880e58c4f122f1b3be9a8c41 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Thu, 4 Feb 2021 19:01:28 +0100
Subject: [PATCH 1/2] account_reconciliation_widget: Use payment_ref for the
 statement line label

---
 .../models/reconciliation_widget.py                         | 1 +
 .../static/src/xml/account_reconciliation.xml               | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py
index 0d0a3d1b..b515b095 100644
--- a/account_reconciliation_widget/models/reconciliation_widget.py
+++ b/account_reconciliation_widget/models/reconciliation_widget.py
@@ -1033,6 +1033,7 @@ class AccountReconciliation(models.AbstractModel):
             # FIXME: where to fill?
             # 'note': st_line.note or "",
             "name": st_line.name,
+            "payment_ref": st_line.payment_ref,
             "date": format_date(self.env, st_line.date),
             "amount": amount,
             "amount_str": amount_str,  # Amount in the statement line currency
diff --git a/account_reconciliation_widget/static/src/xml/account_reconciliation.xml b/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
index e687e29b..2d23eb4f 100644
--- a/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
+++ b/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
@@ -149,8 +149,8 @@
                             /></td>
                     <td class="cell_due_date"><t t-esc="state.st_line.date" /></td>
                     <td class="cell_label"><t
-                                t-if="state.st_line.name"
-                                t-esc="state.st_line.name"
+                                t-if="state.st_line.payment_ref"
+                                t-esc="state.st_line.payment_ref"
                             /> <t t-if="state.st_line.amount_currency_str"> (<t
                                     t-esc="state.st_line.amount_currency_str"
                                 />)</t></td>
@@ -562,7 +562,7 @@
         <tr t-if="state.st_line.ref"><td>Transaction</td><td><t
                         t-esc="state.st_line.ref"
                     /></td></tr>
-        <tr><td>Description</td><td><t t-esc="state.st_line.name" /></td></tr>
+        <tr><td>Description</td><td><t t-esc="state.st_line.payment_ref" /></td></tr>
         <tr><td>Amount</td><td><t t-raw="state.st_line.amount_str" /><t
                         t-if="state.st_line.amount_currency_str"
                     > (<t t-esc="state.st_line.amount_currency_str" />)</t></td></tr>

From 81993220daf52e9acdd83808c341a2251bedbdff Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Thu, 4 Feb 2021 22:17:41 +0100
Subject: [PATCH 2/2] account_reconciliation_widget: note -> narration on bank
 statement lines

---
 account_reconciliation_widget/models/reconciliation_widget.py | 3 +--
 .../static/src/xml/account_reconciliation.xml                 | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py
index b515b095..62aaa403 100644
--- a/account_reconciliation_widget/models/reconciliation_widget.py
+++ b/account_reconciliation_widget/models/reconciliation_widget.py
@@ -1030,8 +1030,7 @@ class AccountReconciliation(models.AbstractModel):
         data = {
             "id": st_line.id,
             "ref": st_line.ref,
-            # FIXME: where to fill?
-            # 'note': st_line.note or "",
+            "narration": st_line.narration or "",
             "name": st_line.name,
             "payment_ref": st_line.payment_ref,
             "date": format_date(self.env, st_line.date),
diff --git a/account_reconciliation_widget/static/src/xml/account_reconciliation.xml b/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
index 2d23eb4f..ce429c33 100644
--- a/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
+++ b/account_reconciliation_widget/static/src/xml/account_reconciliation.xml
@@ -569,8 +569,8 @@
         <tr><td>Account</td><td><t t-esc="state.st_line.account_code" /> <t
                         t-esc="state.st_line.account_name"
                     /></td></tr>
-        <tr t-if="state.st_line.note"><td>Note</td><td style="white-space: pre;"><t
-                        t-esc="state.st_line.note"
+        <tr t-if="state.st_line.narration"><td>Note</td><td style="white-space: pre;"><t
+                        t-esc="state.st_line.narration"
                     /></td></tr>
     </table>
 </t>