From 521f1002322fccbc0a6f832c021a820e4d2c3b35 Mon Sep 17 00:00:00 2001
From: lk-eska <leventk@eskayazilim.com.tr>
Date: Fri, 15 Mar 2024 23:58:27 +0100
Subject: [PATCH 1/9] [IMP] account_statement_base: Set tree views

Make them listed and editable
---
 .../views/account_bank_statement_line.xml     | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/account_statement_base/views/account_bank_statement_line.xml b/account_statement_base/views/account_bank_statement_line.xml
index 052595c0..13594b89 100644
--- a/account_statement_base/views/account_bank_statement_line.xml
+++ b/account_statement_base/views/account_bank_statement_line.xml
@@ -15,7 +15,7 @@
                 <field name="company_id" invisible="1" />
                 <field name="currency_id" invisible="1" />
                 <field name="country_code" invisible="1" />
-                <field name="state" invisible="1" />
+                <field5c1485a3 name="state" invisible="1" />
                 <field name="suitable_journal_ids" invisible="1" />
                 <field name="date" />
                 <field name="payment_ref" required="1" />
@@ -60,21 +60,35 @@
 <record id="account_bank_statement_line_tree" model="ir.ui.view">
     <field name="model">account.bank.statement.line</field>
     <field name="arch" type="xml">
-        <tree decoration-muted="is_reconciled">
-            <field name="sequence" widget="handle" />
-            <field name="date" />
-            <field name="payment_ref" />
-            <field name="ref" optional="hide" />
-            <field name="partner_id" />
-            <field name="amount" />
+        <tree editable="top" multi_edit="1" decoration-muted="is_reconciled">
+            <field name="sequence" />
+            <field name="date" readonly="is_reconciled" />
+            <field name="payment_ref" readonly="is_reconciled" />
+            <field name="ref" optional="hide" readonly="is_reconciled" />
+            <field name="transaction_type" optional="hide" />
+            <field name="account_number" optional="hide" />
+            <field name="partner_id" readonly="is_reconciled" />
+            <field name="amount" readonly="is_reconciled" />
+            <field
+                    name="foreign_currency_id"
+                    optional="hidden"
+                    groups="base.group_multi_currency"
+                    readonly="is_reconciled"
+                />
             <field
                     name="amount_currency"
                     optional="hide"
                     groups="base.group_multi_currency"
+                    readonly="is_reconciled"
                 />
-            <field name="narration" optional="hide" string="Notes" />
-            <field name="journal_id" optional="hide" />
-            <field name="partner_bank_id" optional="hide" />
+            <field
+                    name="narration"
+                    optional="hide"
+                    string="Notes"
+                    readonly="is_reconciled"
+                />
+            <field name="journal_id" optional="hide" readonly="is_reconciled" />
+            <field name="partner_bank_id" optional="hide" readonly="is_reconciled" />
             <button
                     name="action_undo_reconciliation"
                     type="object"
@@ -88,6 +102,8 @@
             <field name="foreign_currency_id" column_invisible="True" />
             <field name="country_code" column_invisible="True" />
             <field name="state" column_invisible="True" />
+            <field name="suitable_journal_ids" column_invisible="True" />
+
         </tree>
     </field>
 </record>

From 716c63917125a8492eaf8030b05a321c8f0e8936 Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Wed, 29 May 2024 13:51:02 +0200
Subject: [PATCH 2/9] [IMP] account_statement_base: Add statement form view

---
 account_statement_base/README.rst             |  9 ++-
 account_statement_base/__manifest__.py        |  2 +-
 account_statement_base/readme/CONTRIBUTORS.md |  6 +-
 .../static/description/index.html             | 19 ++++-
 .../views/account_bank_statement.xml          | 75 +++++++++++++++++++
 .../views/account_bank_statement_line.xml     |  1 +
 6 files changed, 105 insertions(+), 7 deletions(-)

diff --git a/account_statement_base/README.rst b/account_statement_base/README.rst
index 84f5adde..7d2d7883 100644
--- a/account_statement_base/README.rst
+++ b/account_statement_base/README.rst
@@ -58,7 +58,14 @@ Authors
 Contributors
 ------------
 
--  Alexis de Lattre <alexis.delattre@akretion.com>
+-  `Akretion <https://www.akretion.com>`__:
+
+   -  Alexis de Lattre <alexis.delattre@akretion.com>
+
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Carlos Dauden
+   -  Sergio Teruel
 
 Maintainers
 -----------
diff --git a/account_statement_base/__manifest__.py b/account_statement_base/__manifest__.py
index 871bb02e..e2d7551e 100644
--- a/account_statement_base/__manifest__.py
+++ b/account_statement_base/__manifest__.py
@@ -14,8 +14,8 @@
     "website": "https://github.com/OCA/account-reconcile",
     "depends": ["account"],
     "data": [
-        "views/account_bank_statement.xml",
         "views/account_bank_statement_line.xml",
+        "views/account_bank_statement.xml",  # Keep order
     ],
     "installable": True,
 }
diff --git a/account_statement_base/readme/CONTRIBUTORS.md b/account_statement_base/readme/CONTRIBUTORS.md
index b61afe5d..fc3d487b 100644
--- a/account_statement_base/readme/CONTRIBUTORS.md
+++ b/account_statement_base/readme/CONTRIBUTORS.md
@@ -1 +1,5 @@
-- Alexis de Lattre \<<alexis.delattre@akretion.com>\>
+  - [Akretion](https://www.akretion.com):
+      - Alexis de Lattre \<<alexis.delattre@akretion.com>\>
+  - [Tecnativa](https://www.tecnativa.com):
+      - Carlos Dauden
+      - Sergio Teruel
diff --git a/account_statement_base/static/description/index.html b/account_statement_base/static/description/index.html
index 3aba0616..e6af25b3 100644
--- a/account_statement_base/static/description/index.html
+++ b/account_statement_base/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@ span.option {
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -403,13 +404,23 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:<ul>
 <li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
 </ul>
+</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Carlos Dauden</li>
+<li>Sergio Teruel</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
diff --git a/account_statement_base/views/account_bank_statement.xml b/account_statement_base/views/account_bank_statement.xml
index 7c4341c9..6c86b867 100644
--- a/account_statement_base/views/account_bank_statement.xml
+++ b/account_statement_base/views/account_bank_statement.xml
@@ -5,6 +5,81 @@
 -->
 <odoo>
 
+    <record id="view_bank_statement_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Bank Statement">
+                    <div
+                    class="alert alert-warning"
+                    role="alert"
+                    invisible="not problem_description"
+                >
+                        <field name="problem_description" />
+                    </div>
+                    <sheet>
+                        <div name="button_box" position="inside">
+                            <button
+                            class="oe_stat_button"
+                            type="action"
+                            name="%(account_bank_statement_line_action)d"
+                            icon="fa-bars"
+                            context="{'search_default_statement_id': id}"
+                            string="Transactions"
+                        />
+                        </div>
+                        <div class="oe_title oe_inline">
+                            <label for="name" />
+                            <h1><field
+                                name="name"
+                                placeholder="e.g. BNK/2021/0001"
+                            /></h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="date" />
+                                <field
+                                name='company_id'
+                                options="{'no_create': True}"
+                                groups="base.group_multi_company"
+                            />
+                                <field name="currency_id" invisible="1" />
+                                <field name="journal_id" invisible="1" />
+                            </group>
+                            <group>
+                                <label for="balance_start" />
+                                <div>
+                                    <field name="balance_start" class="oe_inline" />
+                                </div>
+                                <label for="balance_end_real" />
+                                <div>
+                                    <field name="balance_end_real" class="oe_inline" />
+                                </div>
+                            </group>
+                        </group>
+                        <field
+                        name="line_ids"
+                        context="{'default_journal_id': journal_id}"
+                    />
+                        <group
+                        class="oe_subtotal_footer oe_right"
+                        name="sale_total"
+                        col="1"
+                    >
+                            <field
+                            name="balance_end"
+                            class="oe_subtotal_footer_separator"
+                        />
+                        </group>
+                        <field name="attachment_ids" widget="many2many_binary" />
+                        <div class="oe_clear" />
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+
     <!-- Add form to view mode. -->
     <record id="account.action_bank_statement_tree" model="ir.actions.act_window">
          <field name="res_model">account.bank.statement</field>
diff --git a/account_statement_base/views/account_bank_statement_line.xml b/account_statement_base/views/account_bank_statement_line.xml
index 13594b89..0227e41d 100644
--- a/account_statement_base/views/account_bank_statement_line.xml
+++ b/account_statement_base/views/account_bank_statement_line.xml
@@ -119,6 +119,7 @@
                 />
             <field name="partner_id" />
             <field name="date" />
+            <field name="statement_id" />
             <field name="journal_id" domain="[('type', 'in', ('bank', 'cash'))]" />
             <field name="amount" />
             <separator />

From b74fe1f217ff0fa14f69032cead60da1927f24ea Mon Sep 17 00:00:00 2001
From: Carlos Lopez <carlos.lopez@tecnativa.com>
Date: Wed, 7 Aug 2024 14:43:57 -0500
Subject: [PATCH 3/9] [IMP] account_statement_base: Show action to create
 Statements

Before this commit, when a user clicked the "New Transaction" button, an error was raised. After this commit, statement lines are displayed to create new records.
---
 account_statement_base/__init__.py               |  1 +
 account_statement_base/models/__init__.py        |  1 +
 .../models/account_journal_dashboard.py          | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 account_statement_base/models/__init__.py
 create mode 100644 account_statement_base/models/account_journal_dashboard.py

diff --git a/account_statement_base/__init__.py b/account_statement_base/__init__.py
index e69de29b..0650744f 100644
--- a/account_statement_base/__init__.py
+++ b/account_statement_base/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_statement_base/models/__init__.py b/account_statement_base/models/__init__.py
new file mode 100644
index 00000000..3fb26d48
--- /dev/null
+++ b/account_statement_base/models/__init__.py
@@ -0,0 +1 @@
+from . import account_journal_dashboard
diff --git a/account_statement_base/models/account_journal_dashboard.py b/account_statement_base/models/account_journal_dashboard.py
new file mode 100644
index 00000000..d6661090
--- /dev/null
+++ b/account_statement_base/models/account_journal_dashboard.py
@@ -0,0 +1,16 @@
+from odoo import models
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    def create_cash_statement(self):
+        # Totally override this action for avoiding the standard
+        # message saying that you need to install the enterprise
+        # module. We do the equivalent thing instead.
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id(
+            "account_statement_base.account_bank_statement_line_action"
+        )
+        action["context"] = {"search_default_journal_id": self.id}
+        return action

From f693bea86b950498b4ce35b9d33bc22acd2e9953 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Tue, 13 Aug 2024 22:58:35 +0200
Subject: [PATCH 4/9] [IMP] account_statement_base: Add extra fields

---
 account_statement_base/views/account_bank_statement_line.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_statement_base/views/account_bank_statement_line.xml b/account_statement_base/views/account_bank_statement_line.xml
index 0227e41d..aac145a2 100644
--- a/account_statement_base/views/account_bank_statement_line.xml
+++ b/account_statement_base/views/account_bank_statement_line.xml
@@ -71,7 +71,7 @@
             <field name="amount" readonly="is_reconciled" />
             <field
                     name="foreign_currency_id"
-                    optional="hidden"
+                    optional="hide"
                     groups="base.group_multi_currency"
                     readonly="is_reconciled"
                 />
@@ -81,6 +81,7 @@
                     groups="base.group_multi_currency"
                     readonly="is_reconciled"
                 />
+            <field name="running_balance" />
             <field
                     name="narration"
                     optional="hide"

From 74d084c63a0797637522d9b2239e7991af5c4ffb Mon Sep 17 00:00:00 2001
From: PNurm <65661625+PNurm@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:21:52 +0300
Subject: [PATCH 5/9] [FIX] account_reconcile_oca: Pass partner parameter
 correctly to _get_write_off_move_lines_dict

---
 account_reconcile_oca/models/account_bank_statement_line.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_reconcile_oca/models/account_bank_statement_line.py b/account_reconcile_oca/models/account_bank_statement_line.py
index ddf8a8dc..2395b195 100644
--- a/account_reconcile_oca/models/account_bank_statement_line.py
+++ b/account_reconcile_oca/models/account_bank_statement_line.py
@@ -412,8 +412,9 @@ class AccountBankStatementLine(models.Model):
                 continue
             new_data.append(line_data)
             liquidity_amount += line_data["amount"]
+
         for line in reconcile_model._get_write_off_move_lines_dict(
-            -liquidity_amount, self._retrieve_partner()
+            -liquidity_amount, self._retrieve_partner().id
         ):
             new_line = line.copy()
             amount = line.get("balance")

From b3b270313f22a7221c88490835b6fdcaf53f4866 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Tue, 13 Aug 2024 22:58:16 +0200
Subject: [PATCH 6/9] [IMP] account_reconcile_oca: improve search filters

---
 account_reconcile_oca/views/account_move_line.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_reconcile_oca/views/account_move_line.xml b/account_reconcile_oca/views/account_move_line.xml
index e818c718..c2927700 100644
--- a/account_reconcile_oca/views/account_move_line.xml
+++ b/account_reconcile_oca/views/account_move_line.xml
@@ -45,7 +45,7 @@
                     <field
                     name="name"
                     string="Journal Item"
-                    filter_domain="[                         '|', '|', '|',                         ('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self)]"
+                    filter_domain="['|','|','|','|','|',('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self),('amount_residual', 'ilike', self),('amount_residual_currency', 'ilike', self)]"
                 />
                     <field name="name" />
                     <field name="ref" />

From 8f98e9f8c92b7db8bccf9db8115ae26107425034 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Tue, 13 Aug 2024 23:17:42 +0200
Subject: [PATCH 7/9] [FIX] account_reconcile_oca: Refresh view when adding
 information

---
 .../src/js/reconcile/reconcile_controller.esm.js     |  1 +
 .../reconcile_form/reconcile_form_controller.esm.js  | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js b/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
index fd9f7cb9..55697e35 100644
--- a/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
+++ b/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
@@ -69,6 +69,7 @@ export class ReconcileController extends KanbanController {
         this.action.doAction(action, {
             onClose: async () => {
                 await this.model.root.load();
+                await this.updateJournalInfo();
                 this.render(true);
             },
         });
diff --git a/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js b/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js
index d91b4bda..ae5640dd 100644
--- a/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js
+++ b/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js
@@ -23,10 +23,12 @@ export class ReconcileFormController extends FormController {
     async reloadFormController() {
         var is_reconciled = this.model.root.data.is_reconciled;
         await this.model.root.load();
-        if (!is_reconciled && this.model.root.data.is_reconciled) {
-            // This only happens when we press the reconcile button
-            if (this.env.parentController) {
-                // Showing rainbow man
+        if (this.env.parentController) {
+            // We will update the parent controller every time we reload the form.
+            await this.env.parentController.model.root.load();
+            await this.env.parentController.render(true);
+            if (!is_reconciled && this.model.root.data.is_reconciled) {
+                // This only happens when we press the reconcile button for showing rainbow man
                 const message = await this.orm.call(
                     "account.journal",
                     "get_rainbowman_message",
@@ -36,8 +38,6 @@ export class ReconcileFormController extends FormController {
                     this.env.parentController.setRainbowMan(message);
                 }
                 // Refreshing
-                await this.env.parentController.model.root.load();
-                await this.env.parentController.render(true);
                 this.env.parentController.selectRecord();
             }
         }

From 39c7d464298d77ba5ec70ce79134211ac50e0273 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Tue, 13 Aug 2024 23:12:42 +0200
Subject: [PATCH 8/9] [FIX] account_reconcile_oca: Remove bug when accessing
 from move view

---
 .../static/src/js/reconcile/reconcile_controller.esm.js         | 2 +-
 account_reconcile_oca/views/account_move.xml                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js b/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
index 55697e35..862c05ac 100644
--- a/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
+++ b/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js
@@ -33,7 +33,7 @@ export class ReconcileController extends KanbanController {
         });
     }
     get journalId() {
-        if (this.props.resModel === "account.bank.statement.line") {
+        if (this.props.context.active_model === "account.journal") {
             return this.props.context.active_id;
         }
         return false;
diff --git a/account_reconcile_oca/views/account_move.xml b/account_reconcile_oca/views/account_move.xml
index c8de1da8..aa6a8d3a 100644
--- a/account_reconcile_oca/views/account_move.xml
+++ b/account_reconcile_oca/views/account_move.xml
@@ -13,6 +13,7 @@
                     type="action"
                     name="%(account_reconcile_oca.action_bank_statement_line_move_view_reconcile)s"
                     string="Bank reconcile"
+                    context="{'search_default_move_id': id}"
                     class="btn btn-primary"
                     icon="fa-list"
                     invisible="statement_line_id == False"

From a0927812495a7cf90597873bcbe97a0c35053354 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Sat, 17 Aug 2024 00:06:01 +0200
Subject: [PATCH 9/9] [FIX] account_reconcile_oca: Remove warning

---
 .../static/src/js/widgets/reconcile_chatter_field.esm.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js b/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js
index 4f401d5c..632768dd 100644
--- a/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js
+++ b/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js
@@ -2,9 +2,10 @@
 
 // import {ChatterContainer} from "@mail/components/chatter_container/chatter_container";
 // import {Chatter} from "@mail/core/web/chatter";
+import {Chatter} from "@mail/core/web/chatter";
+
 import {registry} from "@web/core/registry";
 import {standardFieldProps} from "@web/views/fields/standard_field_props";
-import {Chatter} from "@mail/core/web/chatter";
 
 const {Component} = owl;