diff --git a/account_mass_reconcile/README.rst b/account_mass_reconcile/README.rst index a25d2516..3f6104fa 100644 --- a/account_mass_reconcile/README.rst +++ b/account_mass_reconcile/README.rst @@ -14,14 +14,14 @@ Account Mass Reconcile :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github - :target: https://github.com/OCA/account-reconcile/tree/15.0/account_mass_reconcile + :target: https://github.com/OCA/account-reconcile/tree/16.0/account_mass_reconcile :alt: OCA/account-reconcile .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-reconcile-15-0/account-reconcile-15-0-account_mass_reconcile + :target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_mass_reconcile :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/98/15.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/account-reconcile&target_branch=16.0 + :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -44,6 +44,10 @@ on 2 lines (1 debit / 1 credit) and do not allow partial reconciliation, they also match on 1 key, partner or Journal item name. +2 advanced reconciliation methods are also available, which can make full +reconcilations, based on the account move lines' Label and Reference, for moves +with the same partner. + **Table of contents** .. contents:: @@ -62,7 +66,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -97,6 +101,14 @@ Contributors * Akim Juillerat * Mykhailo Panarin * Adrià Gil Sorribes +* `Trobz `_: + + * Son Ho + +Other credits +~~~~~~~~~~~~~ + +The migration of this module from 14.0 to 16.0 was financially supported by Camptocamp Maintainers ~~~~~~~~~~~ @@ -111,6 +123,6 @@ 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. -This module is part of the `OCA/account-reconcile `_ project on GitHub. +This module is part of the `OCA/account-reconcile `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_mass_reconcile/__manifest__.py b/account_mass_reconcile/__manifest__.py index 5bb91471..93f67f75 100644 --- a/account_mass_reconcile/__manifest__.py +++ b/account_mass_reconcile/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Account Mass Reconcile", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "depends": ["account"], "author": "Akretion,Camptocamp,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-reconcile", diff --git a/account_mass_reconcile/models/base_advanced_reconciliation.py b/account_mass_reconcile/models/base_advanced_reconciliation.py index 9269d408..9fb93a02 100644 --- a/account_mass_reconcile/models/base_advanced_reconciliation.py +++ b/account_mass_reconcile/models/base_advanced_reconciliation.py @@ -205,7 +205,7 @@ class MassReconcileAdvanced(models.AbstractModel): ] def _action_rec(self): - self.flush() + self.env.flush_all() credit_lines = self._query_credit() debit_lines = self._query_debit() result = self._rec_auto_lines_advanced(credit_lines, debit_lines) diff --git a/account_mass_reconcile/models/mass_reconcile.py b/account_mass_reconcile/models/mass_reconcile.py index 067486cf..c1edb92d 100644 --- a/account_mass_reconcile/models/mass_reconcile.py +++ b/account_mass_reconcile/models/mass_reconcile.py @@ -9,7 +9,7 @@ import psycopg2 from psycopg2.extensions import AsIs from odoo import _, api, exceptions, fields, models, sql_db -from odoo.exceptions import Warning as UserError +from odoo.exceptions import UserError _logger = logging.getLogger(__name__) @@ -149,7 +149,7 @@ class AccountMassReconcile(models.Model): def find_reconcile_ids(fieldname, move_line_ids): if not move_line_ids: return [] - self.flush() + self.env.flush_all() sql = """ SELECT DISTINCT %s FROM account_move_line WHERE %s IS NOT NULL AND id in %s @@ -246,7 +246,7 @@ class AccountMassReconcile(models.Model): "view_id": False, "res_model": "account.move.line", "type": "ir.actions.act_window", - "nodestroy": True, + "context": {"nodestroy": True}, "target": "current", "domain": [("id", "in", move_line_ids)], } diff --git a/account_mass_reconcile/models/mass_reconcile_history.py b/account_mass_reconcile/models/mass_reconcile_history.py index a6353dcd..acf21398 100644 --- a/account_mass_reconcile/models/mass_reconcile_history.py +++ b/account_mass_reconcile/models/mass_reconcile_history.py @@ -59,7 +59,7 @@ class MassReconcileHistory(models.Model): "view_id": False, "res_model": "account.move.line", "type": "ir.actions.act_window", - "nodestroy": True, + "context": {"nodestroy": True}, "target": "current", "domain": [("id", "in", move_line_ids)], } diff --git a/account_mass_reconcile/models/simple_reconciliation.py b/account_mass_reconcile/models/simple_reconciliation.py index 7ce6ff1d..c0dc7b09 100644 --- a/account_mass_reconcile/models/simple_reconciliation.py +++ b/account_mass_reconcile/models/simple_reconciliation.py @@ -71,7 +71,7 @@ class MassReconcileSimple(models.AbstractModel): query = " ".join( (select, self._from_query(), where, where2, self._simple_order()) ) - self.flush() + self.env.flush_all() self.env.cr.execute(query, params + params2) lines = self.env.cr.dictfetchall() return self.rec_auto_lines_simple(lines) diff --git a/account_mass_reconcile/readme/CONTRIBUTORS.rst b/account_mass_reconcile/readme/CONTRIBUTORS.rst index 8dbad2e1..66ed0de7 100644 --- a/account_mass_reconcile/readme/CONTRIBUTORS.rst +++ b/account_mass_reconcile/readme/CONTRIBUTORS.rst @@ -17,3 +17,6 @@ * Akim Juillerat * Mykhailo Panarin * Adrià Gil Sorribes +* `Trobz `_: + + * Son Ho diff --git a/account_mass_reconcile/readme/CREDITS.rst b/account_mass_reconcile/readme/CREDITS.rst new file mode 100644 index 00000000..a5c8f66b --- /dev/null +++ b/account_mass_reconcile/readme/CREDITS.rst @@ -0,0 +1 @@ +The migration of this module from 14.0 to 16.0 was financially supported by Camptocamp diff --git a/account_mass_reconcile/static/description/index.html b/account_mass_reconcile/static/description/index.html index 082da6c0..3728447f 100644 --- a/account_mass_reconcile/static/description/index.html +++ b/account_mass_reconcile/static/description/index.html @@ -3,7 +3,7 @@ - + Account Mass Reconcile