From d4fb97e655076aab4aed5df3a86766491db22e89 Mon Sep 17 00:00:00 2001
From: kir-odoo <kir@odoo.com>
Date: Tue, 28 Sep 2021 12:13:55 +0000
Subject: [PATCH] [IMP] account: align the label of fields narration in both

Purpose of the task is to:
1) Label becomes "Notes" rather than "Terms & Conditions".
2) Fields reorganization from left to right.

So in this commit, Updated Label "Terms & Conditions" to "Notes", Fields
reorganization from left to right in 'account.bank.statement' and
'accont.bank.statement.line' model and make group_by bank statement.

Links
Task - 2613132

closes odoo/odoo#77454

X-original-commit: ce4234c98a701c0071228827187471db167a3bdb
Related: odoo/enterprise#21287
Signed-off-by: Florian Gilbert <FlorianGilbert@users.noreply.github.com>
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
---
 .../views/account_bank_statement_views.xml      | 17 +++++++++--------
 .../views/account_journal_dashboard_view.xml    |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/account/views/account_bank_statement_views.xml b/addons/account/views/account_bank_statement_views.xml
index bfebc60b040..70814498787 100644
--- a/addons/account/views/account_bank_statement_views.xml
+++ b/addons/account/views/account_bank_statement_views.xml
@@ -208,15 +208,15 @@
                                            attrs="{'readonly': [('parent.state', '!=', 'open')]}"
                                            domain="['|', ('parent_id','=', False), ('is_company','=',True)]"/>
                                     <field name="ref" optional="hidden"/>
-                                    <field name="transaction_type" optional="hidden"/>
                                     <field name="narration" string="Notes" optional="hidden"/>
-                                    <field name="amount"
-                                           attrs="{'readonly': [('parent.state', '!=', 'open')]}"/>
+                                    <field name="transaction_type" optional="hidden"/>
                                     <field name="amount_currency" optional="hidden" groups="base.group_multi_currency"
                                            attrs="{'readonly': [('parent.state', '!=', 'open')]}"/>
-                                    <field name="account_number" optional="hidden"/>
                                     <field name="foreign_currency_id" optional="hidden" groups="base.group_multi_currency"
                                            attrs="{'readonly': [('parent.state', '!=', 'open')]}"/>
+                                    <field name="amount"
+                                           attrs="{'readonly': [('parent.state', '!=', 'open')]}"/>
+                                    <field name="account_number" optional="hidden"/>
 
                                     <!-- Buttons -->
                                     <button name="button_undo_reconciliation" type="object"
@@ -290,6 +290,7 @@
                     <field name="transaction_type"/>
                     <field name="move_id"/>
                     <field name="amount"/>
+                    <filter name="statement" string="Statement" context="{'group_by':'statement_id'}"/>
                 </search>
             </field>
         </record>
@@ -342,14 +343,14 @@
                     <field name="move_id"/>
                     <field name="date"/>
                     <field name="payment_ref"/>
-                    <field name="ref" groups="base.group_no_one"/>
                     <field name="partner_id"/>
-                    <field name="amount"/>
+                    <field name="ref" groups="base.group_no_one" optional="hidden"/>
+                    <field name="narration" string="Notes" optional="hidden"/>
+                    <field name="transaction_type" optional="hidden"/>
                     <field name="amount_currency" optional="hidden" groups="base.group_multi_currency"/>
                     <field name="foreign_currency_id" optional="hidden" groups="base.group_multi_currency"/>
+                    <field name="amount"/>
                     <field name="account_number" optional="hidden"/>
-                    <field name="transaction_type" optional="hidden"/>
-                    <field name="narration" optional="hidden"/>
 
                     <!-- Buttons -->
                     <button name="button_undo_reconciliation" type="object"
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml
index e524cf1620d..3326fc4ea09 100644
--- a/addons/account/views/account_journal_dashboard_view.xml
+++ b/addons/account/views/account_journal_dashboard_view.xml
@@ -64,7 +64,7 @@
                                     <a t-if="journal_type == 'cash'" role="menuitem" type="object" name="open_action_with_context" context="{'action_name': 'action_view_bank_statement_tree', 'search_default_journal': True}">Statements</a>
                                 </div>
                                 <div>
-                                    <a role="menuitem" type="object" name="open_action_with_context" context="{'action_name': 'action_bank_statement_line', 'search_default_journal': True}">Operations</a>
+                                    <a role="menuitem" type="object" name="open_action_with_context" context="{'action_name': 'action_bank_statement_line', 'search_default_journal': True,'search_default_statement': 1}">Operations</a>
                                 </div>
                                 <div>
                                     <a role="menuitem" type="object" name="open_collect_money">Cust. Payments</a>