Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/account-reconcile (16.0) #210

Merged
merged 4 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ addon | version | maintainers | summary
[account_move_reconcile_forbid_cancel](account_move_reconcile_forbid_cancel/) | 16.0.1.0.1 | | Account Move Reconcile Forbid Cancel
[account_move_so_import](account_move_so_import/) | 16.0.1.0.0 | | Journal Entry Sale Order completion
[account_reconcile_oca](account_reconcile_oca/) | 16.0.2.0.5 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
[account_statement_base](account_statement_base/) | 16.0.1.11.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/) | 16.0.1.12.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
[base_transaction_id](base_transaction_id/) | 16.0.1.0.0 | | Base transaction ID for financial institutes

[//]: # (end addons)
Expand Down
2 changes: 1 addition & 1 deletion account_statement_base/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bank Statement Base
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c628483ba7915f7fb03b59772a9ba6bfd64483bd36f3ef634f12b2c4d9f71336
!! source digest: sha256:4cc388f8d9806adaa648df2193cbb547f352bec34a4d68cd012bac9e39902573
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
Expand Down
2 changes: 1 addition & 1 deletion account_statement_base/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "Bank Statement Base",
"version": "16.0.1.11.0",
"version": "16.0.1.12.0",
"category": "Accounting",
"license": "LGPL-3",
"summary": "Base module for Bank Statements",
Expand Down
19 changes: 19 additions & 0 deletions account_statement_base/models/account_bank_statement.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 l: l.state == "posted")[
-1:
].date
return super(AccountBankStatement, _self)._compute_date_index()

def action_open_statement_lines(self):
self.ensure_one()
if not self:
Expand Down
7 changes: 7 additions & 0 deletions account_statement_base/models/account_bank_statement_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion account_statement_base/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Bank Statement Base</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c628483ba7915f7fb03b59772a9ba6bfd64483bd36f3ef634f12b2c4d9f71336
!! source digest: sha256:4cc388f8d9806adaa648df2193cbb547f352bec34a4d68cd012bac9e39902573
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_statement_base"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_statement_base"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<dl class="docutils">
Expand Down
Loading