From 4a29f76d032787e195d6e13bd8ed80a920cbb193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 4 Oct 2024 09:58:04 +0200 Subject: [PATCH 1/5] [FIX] account_statement_base: Allow remove lines from bank statment form view Fixes https://github.com/OCA/account-reconcile/issues/697 TT50906 --- .../models/account_bank_statement_line.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/account_statement_base/models/account_bank_statement_line.py b/account_statement_base/models/account_bank_statement_line.py index 857619b91b..4199a73fd2 100644 --- a/account_statement_base/models/account_bank_statement_line.py +++ b/account_statement_base/models/account_bank_statement_line.py @@ -7,6 +7,13 @@ class AccountBankStatementLine(models.Model): _inherit = "account.bank.statement.line" + # TODO: Delete if merged https://github.com/odoo/odoo/pull/182497 + def _compute_running_balance(self): + # We need to set value to all records because super() does not do it using sql. + for item in self: + item.running_balance = item.running_balance + return super()._compute_running_balance() + def action_open_journal_entry(self): self.ensure_one() if not self: From 79416011c4566ae6ca012f99bc14c280faecb4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 4 Oct 2024 10:07:41 +0200 Subject: [PATCH 2/5] [FIX] account_statement_base: Allow add lines from bank statment form view TT50906 --- .../models/account_bank_statement.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/account_statement_base/models/account_bank_statement.py b/account_statement_base/models/account_bank_statement.py index 5dcae41d8d..c9a608234f 100644 --- a/account_statement_base/models/account_bank_statement.py +++ b/account_statement_base/models/account_bank_statement.py @@ -4,6 +4,25 @@ class AccountBankStatement(models.Model): _inherit = "account.bank.statement" + # TODO: Delete if merged https://github.com/odoo/odoo/pull/182497 + def _compute_date_index(self): + """The super() method does not take into account lines that do not have + internal_index set yet, and causes sorted() to fail, we need to re-define + the method in these cases to avoid the error. + """ + _self = self + for stmt in self: + if any(not line.internal_index for line in stmt.line_ids): + _self -= stmt + sorted_lines = stmt.line_ids.filtered("internal_index").sorted( + "internal_index" + ) + stmt.first_line_index = sorted_lines[:1].internal_index + stmt.date = sorted_lines.filtered(lambda line: line.state == "posted")[ + -1: + ].date + return super(AccountBankStatement, _self)._compute_date_index() + def action_open_statement_lines(self): self.ensure_one() if not self: From 26ca6b805b2b350dac3c19655092a27a2848ee7b Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 7 Oct 2024 06:12:43 +0000 Subject: [PATCH 3/5] [BOT] post-merge updates --- README.md | 2 +- account_statement_base/README.rst | 2 +- account_statement_base/__manifest__.py | 2 +- account_statement_base/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1913822b26..4636e860bc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ addon | version | maintainers | summary [account_mass_reconcile](account_mass_reconcile/) | 17.0.1.0.1 | | Account Mass Reconcile [account_reconcile_model_oca](account_reconcile_model_oca/) | 17.0.1.0.1 | | This includes the logic moved from Odoo Community to Odoo Enterprise [account_reconcile_oca](account_reconcile_oca/) | 17.0.1.3.0 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting -[account_statement_base](account_statement_base/) | 17.0.1.3.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements +[account_statement_base](account_statement_base/) | 17.0.1.3.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements [//]: # (end addons) diff --git a/account_statement_base/README.rst b/account_statement_base/README.rst index 8c2eba25cb..2de7fde18a 100644 --- a/account_statement_base/README.rst +++ b/account_statement_base/README.rst @@ -7,7 +7,7 @@ Bank Statement Base !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:a6db86062f116142106b9ac1a1fd98c3f66c7bbb4d98a35bcff5c002288792a6 + !! source digest: sha256:baed690e1bab1fc9aea5f5fbb74b80f3a00ed79c64bd911ce8b59571b8b27ad4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png diff --git a/account_statement_base/__manifest__.py b/account_statement_base/__manifest__.py index 929501447a..f2f54ec4f4 100644 --- a/account_statement_base/__manifest__.py +++ b/account_statement_base/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Bank Statement Base", - "version": "17.0.1.3.0", + "version": "17.0.1.3.1", "category": "Accounting", "license": "LGPL-3", "summary": "Base module for Bank Statements", diff --git a/account_statement_base/static/description/index.html b/account_statement_base/static/description/index.html index 022fc2d503..4d74b0351c 100644 --- a/account_statement_base/static/description/index.html +++ b/account_statement_base/static/description/index.html @@ -367,7 +367,7 @@

Bank Statement Base

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:a6db86062f116142106b9ac1a1fd98c3f66c7bbb4d98a35bcff5c002288792a6 +!! source digest: sha256:baed690e1bab1fc9aea5f5fbb74b80f3a00ed79c64bd911ce8b59571b8b27ad4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Mature License: LGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runboat

This is a technical module that adds the views of the Bank Statement From ba8bef30df663ad3868f5cb70fefec8eb892b0b5 Mon Sep 17 00:00:00 2001 From: Anjeel Haria Date: Mon, 7 Oct 2024 14:18:43 +0530 Subject: [PATCH 4/5] [FIX] account_reconcile_oca: Fix the layout of statement button on reconciliation screen --- account_reconcile_oca/static/src/scss/reconcile.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_reconcile_oca/static/src/scss/reconcile.scss b/account_reconcile_oca/static/src/scss/reconcile.scss index 9a57498592..b430a1045c 100644 --- a/account_reconcile_oca/static/src/scss/reconcile.scss +++ b/account_reconcile_oca/static/src/scss/reconcile.scss @@ -16,9 +16,9 @@ width: 100%; .o_reconcile_create_statement { position: absolute; - height: 4px; + height: 0px; margin: 0; - padding: 2px 0 0 0; + padding: 0 0 0 0; border: 0; top: -14px; opacity: 0; From e0dcf237d0c7472e1d0594ba55d2fc25f2bb9444 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 7 Oct 2024 11:41:50 +0000 Subject: [PATCH 5/5] [BOT] post-merge updates --- README.md | 2 +- account_reconcile_oca/README.rst | 2 +- account_reconcile_oca/__manifest__.py | 2 +- account_reconcile_oca/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4636e860bc..8f9ed5f5e9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ addon | version | maintainers | summary --- | --- | --- | --- [account_mass_reconcile](account_mass_reconcile/) | 17.0.1.0.1 | | Account Mass Reconcile [account_reconcile_model_oca](account_reconcile_model_oca/) | 17.0.1.0.1 | | This includes the logic moved from Odoo Community to Odoo Enterprise -[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.3.0 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting +[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.3.1 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting [account_statement_base](account_statement_base/) | 17.0.1.3.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements [//]: # (end addons) diff --git a/account_reconcile_oca/README.rst b/account_reconcile_oca/README.rst index 23eb2b6b55..3db1cbef38 100644 --- a/account_reconcile_oca/README.rst +++ b/account_reconcile_oca/README.rst @@ -7,7 +7,7 @@ Account Reconcile Oca !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63 + !! source digest: sha256:ced9f9f34e2e93a89da3b24795e651216f00dfd02b395e3f876cee5ddf39dd78 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_reconcile_oca/__manifest__.py b/account_reconcile_oca/__manifest__.py index 6069e1be9c..7129e02c69 100644 --- a/account_reconcile_oca/__manifest__.py +++ b/account_reconcile_oca/__manifest__.py @@ -5,7 +5,7 @@ "name": "Account Reconcile Oca", "summary": """ Reconcile addons for Odoo CE accounting""", - "version": "17.0.1.3.0", + "version": "17.0.1.3.1", "license": "AGPL-3", "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)", "maintainers": ["etobella"], diff --git a/account_reconcile_oca/static/description/index.html b/account_reconcile_oca/static/description/index.html index 2fab86d045..223244c2f6 100644 --- a/account_reconcile_oca/static/description/index.html +++ b/account_reconcile_oca/static/description/index.html @@ -367,7 +367,7 @@

Account Reconcile Oca

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63 +!! source digest: sha256:ced9f9f34e2e93a89da3b24795e651216f00dfd02b395e3f876cee5ddf39dd78 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runboat

This addon allows to reconcile bank statements and account marked as