diff --git a/account_partner_reconcile/README.rst b/account_partner_reconcile/README.rst index 96b1134373..ed70d33e6b 100644 --- a/account_partner_reconcile/README.rst +++ b/account_partner_reconcile/README.rst @@ -17,13 +17,13 @@ Account Partner 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_partner_reconcile + :target: https://github.com/OCA/account-reconcile/tree/16.0/account_partner_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_partner_reconcile + :target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_partner_reconcile :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -55,7 +55,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -72,6 +72,7 @@ Contributors * Jordi Ballester * Jaume Planas +* Ahmet Yiğit Budak Maintainers ~~~~~~~~~~~ @@ -86,6 +87,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_partner_reconcile/__manifest__.py b/account_partner_reconcile/__manifest__.py index 383a334dc7..9275d72e1b 100644 --- a/account_partner_reconcile/__manifest__.py +++ b/account_partner_reconcile/__manifest__.py @@ -3,12 +3,12 @@ { "name": "Account Partner Reconcile", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Accounting", "author": "ForgeFlow, Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-reconcile", "license": "AGPL-3", - "depends": ["account"], + "depends": ["account_reconcile_oca"], "data": ["views/res_partner_view.xml"], "installable": True, } diff --git a/account_partner_reconcile/models/res_partner.py b/account_partner_reconcile/models/res_partner.py index f1bb58cd87..d2ec000e81 100644 --- a/account_partner_reconcile/models/res_partner.py +++ b/account_partner_reconcile/models/res_partner.py @@ -9,19 +9,20 @@ class ResPartner(models.Model): def action_open_reconcile(self): # Open reconciliation view for customers and suppliers + self.ensure_one() + reconcile_mode = self.env.context.get("reconcile_mode", False) - accounts = self.property_account_payable_id + account = self.property_account_payable_id if reconcile_mode == "customers": - accounts = self.property_account_receivable_id - - action_context = { - "show_mode_selector": True, - "partner_ids": [self.id], - "mode": reconcile_mode, - "account_ids": accounts.ids, - } - return { - "type": "ir.actions.client", - "tag": "manual_reconciliation_view", - "context": action_context, - } + account = self.property_account_receivable_id + + action = self.env["ir.actions.act_window"]._for_xml_id( + "account_reconcile_oca.account_account_reconcile_act_window" + ) + + action["domain"] = [ + ("account_id", "=", account.id), + ("partner_id", "=", self.id), + ] + + return action diff --git a/account_partner_reconcile/readme/CONTRIBUTORS.rst b/account_partner_reconcile/readme/CONTRIBUTORS.rst index 97ef56a255..0aecc832b9 100644 --- a/account_partner_reconcile/readme/CONTRIBUTORS.rst +++ b/account_partner_reconcile/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Jordi Ballester * Jaume Planas +* Ahmet Yiğit Budak diff --git a/account_partner_reconcile/static/description/index.html b/account_partner_reconcile/static/description/index.html index b1792a5304..9da8065ba4 100644 --- a/account_partner_reconcile/static/description/index.html +++ b/account_partner_reconcile/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,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. @@ -275,7 +275,7 @@ 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 } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -369,7 +369,7 @@

Account Partner Reconcile

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:04ec889db4224fc1ffea939167adbe6aa397644b80650f08d6a3532f64fecc24 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module adds the buttons “Match Receivables” (& “Match Payables”) in the customer (& suppliers) form view to allow to start the matching of invoices & payments for that partner.

Table of contents

@@ -404,7 +404,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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -420,16 +420,19 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

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_partner_reconcile/tests/test_account_partner_reconcile.py b/account_partner_reconcile/tests/test_account_partner_reconcile.py index e6f3c40945..ab09f95441 100644 --- a/account_partner_reconcile/tests/test_account_partner_reconcile.py +++ b/account_partner_reconcile/tests/test_account_partner_reconcile.py @@ -8,26 +8,46 @@ class TestAccountPartnerReconcile(TransactionCase): """Tests for Account Partner Reconcile.""" def setUp(self): - super(TestAccountPartnerReconcile, self).setUp() + super().setUp() self.partner1 = self.env.ref("base.res_partner_1") def test_account_partner_reconcile(self): - res = self.partner1.action_open_reconcile() - - # assertDictContainsSubset is deprecated in Python <3.2 - expect = {"type": "ir.actions.client", "tag": "manual_reconciliation_view"} + receivable_account = self.partner1.property_account_receivable_id + payable_account = self.partner1.property_account_payable_id + + # reconcile_mode="customers" (Match Receivables) + res = self.partner1.with_context( + reconcile_mode="customers" + ).action_open_reconcile() + expect = { + "type": "ir.actions.act_window", + "xml_id": "account_reconcile_oca.account_account_reconcile_act_window", + "domain": [ + ("account_id", "=", receivable_account.id), + ("partner_id", "=", self.partner1.id), + ], + } self.assertDictEqual( expect, {k: v for k, v in res.items() if k in expect}, - "There was an error and the manual_reconciliation_view " - "couldn't be opened.", + "There was an error and the Reconcile action couldn't be opened.", ) - expect = {"partner_ids": self.partner1.ids, "show_mode_selector": True} + # reconcile_mode="suppliers" (Match Payables) + res = self.partner1.with_context( + reconcile_mode="suppliers" + ).action_open_reconcile() + expect = { + "type": "ir.actions.act_window", + "xml_id": "account_reconcile_oca.account_account_reconcile_act_window", + "domain": [ + ("account_id", "=", payable_account.id), + ("partner_id", "=", self.partner1.id), + ], + } self.assertDictEqual( expect, - {k: v for k, v in res["context"].items() if k in expect}, - "There was an error and the manual_reconciliation_view " - "couldn't be opened.", + {k: v for k, v in res.items() if k in expect}, + "There was an error and the Reconcile action couldn't be opened.", ) diff --git a/account_partner_reconcile/views/res_partner_view.xml b/account_partner_reconcile/views/res_partner_view.xml index 12c7809c0a..f0df3e381c 100644 --- a/account_partner_reconcile/views/res_partner_view.xml +++ b/account_partner_reconcile/views/res_partner_view.xml @@ -7,7 +7,6 @@ res.partner -
@@ -24,6 +24,7 @@ type="object" name="action_open_reconcile" context="{'reconcile_mode': 'suppliers'}" + groups="account.group_account_invoice" icon="fa-usd" string="Match Payables" >