From 61f33b1b86d9542cddab54b75405fa684fc667aa Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sat, 29 Jun 2024 17:23:24 +0200 Subject: [PATCH 1/2] [ADD] new module pos_check_accounting_settings to avoid launching new PoS session with incorrect configuration. --- pos_check_accounting_settings/README.rst | 103 +++++ pos_check_accounting_settings/__init__.py | 1 + pos_check_accounting_settings/__manifest__.py | 15 + pos_check_accounting_settings/i18n/fr.po | 35 ++ .../models/__init__.py | 1 + .../models/pos_config.py | 31 ++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 20 + .../description/error_oustanding_payment.png | Bin 0 -> 16116 bytes .../static/description/index.html | 434 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_module.py | 30 ++ .../odoo/addons/pos_check_accounting_settings | 1 + setup/pos_check_accounting_settings/setup.py | 6 + 14 files changed, 679 insertions(+) create mode 100644 pos_check_accounting_settings/README.rst create mode 100644 pos_check_accounting_settings/__init__.py create mode 100644 pos_check_accounting_settings/__manifest__.py create mode 100644 pos_check_accounting_settings/i18n/fr.po create mode 100644 pos_check_accounting_settings/models/__init__.py create mode 100644 pos_check_accounting_settings/models/pos_config.py create mode 100644 pos_check_accounting_settings/readme/CONTRIBUTORS.rst create mode 100644 pos_check_accounting_settings/readme/DESCRIPTION.rst create mode 100644 pos_check_accounting_settings/static/description/error_oustanding_payment.png create mode 100644 pos_check_accounting_settings/static/description/index.html create mode 100644 pos_check_accounting_settings/tests/__init__.py create mode 100644 pos_check_accounting_settings/tests/test_module.py create mode 120000 setup/pos_check_accounting_settings/odoo/addons/pos_check_accounting_settings create mode 100644 setup/pos_check_accounting_settings/setup.py diff --git a/pos_check_accounting_settings/README.rst b/pos_check_accounting_settings/README.rst new file mode 100644 index 0000000000..005bf844ca --- /dev/null +++ b/pos_check_accounting_settings/README.rst @@ -0,0 +1,103 @@ +========================================= +Point of Sale - Check Accounting Settings +========================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:95ba837ae556e8ecb7af92cc67c3a0b664e5bc119051ebb1d5a73e01bcdf16ab + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/16.0/pos_check_accounting_settings + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-16-0/pos-16-0-pos_check_accounting_settings + :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/pos&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionnality of Odoo PoS adding extra +checks, when opening session, to ensure that accounting configation +is correct. + +Use case 1 +~~~~~~~~~~ + +When we create a payment method and if: +- the field 'Outstanding Payment' is not set on payment method +- AND the field 'Outstanding Receipts Account' is not on company + +if we use the payment method in the Point of sale, it is not +possible to close the session after. + +.. image:: https://raw.githubusercontent.com/OCA/pos/16.0/pos_check_accounting_settings/static/img/error_oustanding_payment.png + +As it not possible to change a payment method when a session +is not closed, this bad configuration has to be fixed by SQL. + +This module adds a check when opening session, to avoid such situation. + +**Table of contents** + +.. contents:: + :local: + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* GRAP + +Contributors +~~~~~~~~~~~~ + +* Sylvain LE GAL (https://twitter.com/legalsylvain) + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-legalsylvain| image:: https://github.com/legalsylvain.png?size=40px + :target: https://github.com/legalsylvain + :alt: legalsylvain + +Current `maintainer `__: + +|maintainer-legalsylvain| + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_check_accounting_settings/__init__.py b/pos_check_accounting_settings/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/pos_check_accounting_settings/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/pos_check_accounting_settings/__manifest__.py b/pos_check_accounting_settings/__manifest__.py new file mode 100644 index 0000000000..39f106d19b --- /dev/null +++ b/pos_check_accounting_settings/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright (C) 2024 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Point of Sale - Check Accounting Settings", + "version": "16.0.1.0.0", + "category": "Point of Sale", + "summary": "Prevent incorrect accounting configuration" + " when launching Point Of Sale", + "depends": ["point_of_sale"], + "website": "https://github.com/OCA/pos", + "author": "GRAP,Odoo Community Association (OCA)", + "maintainers": ["legalsylvain"], + "license": "LGPL-3", +} diff --git a/pos_check_accounting_settings/i18n/fr.po b/pos_check_accounting_settings/i18n/fr.po new file mode 100644 index 0000000000..7f5c4c41cc --- /dev/null +++ b/pos_check_accounting_settings/i18n/fr.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_check_accounting_settings +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-06-29 22:22+0000\n" +"PO-Revision-Date: 2024-06-29 22:22+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_check_accounting_settings +#. odoo-python +#: code:addons/pos_check_accounting_settings/models/pos_config.py:0 +#, python-format +msgid "" +"No outstanding payments/receipts account for the payment method " +"'%(payment_method_name)s'. Please set the field 'Outstanding Payment' on the" +" payment method or the field 'Outstanding Receipts Account' on the company " +"settings." +msgstr "" +"Pas de compte de paiements entrants/sortants en suspens pour la méthode de paiement " +"'%(payment_method_name)s'. Veuillez renseigner le champs 'Paiements sortants en suspens' sur la méthode de paiement, ou le champs 'Compte de paiements entrants en suspens'" +" dans les paramétrage de la société." + +#. module: pos_check_accounting_settings +#: model:ir.model,name:pos_check_accounting_settings.model_pos_config +msgid "Point of Sale Configuration" +msgstr "Configuration du point de vente" diff --git a/pos_check_accounting_settings/models/__init__.py b/pos_check_accounting_settings/models/__init__.py new file mode 100644 index 0000000000..db8634ade1 --- /dev/null +++ b/pos_check_accounting_settings/models/__init__.py @@ -0,0 +1 @@ +from . import pos_config diff --git a/pos_check_accounting_settings/models/pos_config.py b/pos_check_accounting_settings/models/pos_config.py new file mode 100644 index 0000000000..7a9b883946 --- /dev/null +++ b/pos_check_accounting_settings/models/pos_config.py @@ -0,0 +1,31 @@ +# Copyright (C) 2024 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import _, models +from odoo.exceptions import UserError + + +class PosConfig(models.Model): + _inherit = "pos.config" + + def _check_before_creating_new_session(self): + res = super()._check_before_creating_new_session() + for payment_method in self.payment_method_ids.filtered( + lambda x: x.journal_id and x.journal_id.type != "cash" + ): + company = payment_method.journal_id.company_id + if ( + not payment_method.outstanding_account_id + and not company.account_journal_payment_debit_account_id + ): + raise UserError( + _( + "No outstanding payments/receipts account for the payment method" + " '%(payment_method_name)s'." + " Please set the field 'Outstanding Payment' on the payment method" + " or the field 'Outstanding Receipts Account' on the company settings.", + payment_method_name=payment_method.name, + ) + ) + return res diff --git a/pos_check_accounting_settings/readme/CONTRIBUTORS.rst b/pos_check_accounting_settings/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..ae6f43a86d --- /dev/null +++ b/pos_check_accounting_settings/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Sylvain LE GAL (https://twitter.com/legalsylvain) diff --git a/pos_check_accounting_settings/readme/DESCRIPTION.rst b/pos_check_accounting_settings/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..1a25af653d --- /dev/null +++ b/pos_check_accounting_settings/readme/DESCRIPTION.rst @@ -0,0 +1,20 @@ +This module extends the functionnality of Odoo PoS adding extra +checks, when opening session, to ensure that accounting configation +is correct. + +Use case 1 +~~~~~~~~~~ + +When we create a payment method and if: +- the field 'Outstanding Payment' is not set on payment method +- AND the field 'Outstanding Receipts Account' is not on company + +if we use the payment method in the Point of sale, it is not +possible to close the session after. + +.. image:: ../static/img/error_oustanding_payment.png + +As it not possible to change a payment method when a session +is not closed, this bad configuration has to be fixed by SQL. + +This module adds a check when opening session, to avoid such situation. diff --git a/pos_check_accounting_settings/static/description/error_oustanding_payment.png b/pos_check_accounting_settings/static/description/error_oustanding_payment.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b7dc983f23703501bbd4a13634749e8df196fc GIT binary patch literal 16116 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 + + + + +Point of Sale - Check Accounting Settings + + + +
+

Point of Sale - Check Accounting Settings

+ + +

Beta License: LGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

This module extends the functionnality of Odoo PoS adding extra +checks, when opening session, to ensure that accounting configation +is correct.

+
+

Use case 1

+

When we create a payment method and if: +- the field ‘Outstanding Payment’ is not set on payment method +- AND the field ‘Outstanding Receipts Account’ is not on company

+

if we use the payment method in the Point of sale, it is not +possible to close the session after.

+https://raw.githubusercontent.com/OCA/pos/16.0/pos_check_accounting_settings/static/img/error_oustanding_payment.png +

As it not possible to change a payment method when a session +is not closed, this bad configuration has to be fixed by SQL.

+

This module adds a check when opening session, to avoid such situation.

+

Table of contents

+ +
+

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.

+

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

+
+ +
+
+

Authors

+
    +
  • GRAP
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +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.

+

Current maintainer:

+

legalsylvain

+

This module is part of the OCA/pos project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+ + diff --git a/pos_check_accounting_settings/tests/__init__.py b/pos_check_accounting_settings/tests/__init__.py new file mode 100644 index 0000000000..d9b96c4fa5 --- /dev/null +++ b/pos_check_accounting_settings/tests/__init__.py @@ -0,0 +1 @@ +from . import test_module diff --git a/pos_check_accounting_settings/tests/test_module.py b/pos_check_accounting_settings/tests/test_module.py new file mode 100644 index 0000000000..20c1f5e4d3 --- /dev/null +++ b/pos_check_accounting_settings/tests/test_module.py @@ -0,0 +1,30 @@ +# Copyright (C) 2024 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.exceptions import UserError +from odoo.tests.common import TransactionCase + + +class TestModule(TransactionCase): + def setUp(self): + super().setUp() + self.pos_config = self.env.ref("point_of_sale.pos_config_main").copy( + default={ + "payment_method_ids": self.env.ref( + "point_of_sale.pos_config_main" + ).payment_method_ids.ids + } + ) + self.bank_payment_method = self.pos_config.payment_method_ids.filtered( + lambda x: x.journal_id.type == "bank" and not x.split_transactions + ) + + def test_correct_configuration(self): + self.pos_config.open_ui() + + def test_incorrect_configuration(self): + self.bank_payment_method.outstanding_account_id = False + self.env.company.account_journal_payment_debit_account_id = False + with self.assertRaises(UserError): + self.pos_config.open_ui() diff --git a/setup/pos_check_accounting_settings/odoo/addons/pos_check_accounting_settings b/setup/pos_check_accounting_settings/odoo/addons/pos_check_accounting_settings new file mode 120000 index 0000000000..db11b735e3 --- /dev/null +++ b/setup/pos_check_accounting_settings/odoo/addons/pos_check_accounting_settings @@ -0,0 +1 @@ +../../../../pos_check_accounting_settings \ No newline at end of file diff --git a/setup/pos_check_accounting_settings/setup.py b/setup/pos_check_accounting_settings/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/pos_check_accounting_settings/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 9224c3ec810a0d7459fa80bc02beccbe858b976a Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sun, 30 Jun 2024 01:30:02 +0200 Subject: [PATCH 2/2] [IMP] pos_payment_change : simplify code of test, and make it compatible with pos_check_accounting_settings_company module --- pos_payment_change/tests/test_module.py | 44 +++++++++---------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/pos_payment_change/tests/test_module.py b/pos_payment_change/tests/test_module.py index 53a7162cbc..4239ff6db2 100644 --- a/pos_payment_change/tests/test_module.py +++ b/pos_payment_change/tests/test_module.py @@ -22,35 +22,21 @@ def setUp(self): "pos.payment.change.wizard.new.line" ] self.product = self.env.ref("product.product_product_3") - self.pos_config = self.env.ref("point_of_sale.pos_config_main").copy() - - def _initialize_journals_open_session(self): - account_id = self.env.company.account_default_pos_receivable_account_id - self.bank_payment_method = self.PosPaymentMethod.create( - { - "name": "Bank", - "receivable_account_id": account_id.id, + self.pos_config = self.env.ref("point_of_sale.pos_config_main").copy( + default={ + "payment_method_ids": self.env.ref( + "point_of_sale.pos_config_main" + ).payment_method_ids.ids } ) - self.cash_payment_method = self.PosPaymentMethod.create( - { - "name": "Cash", - "is_cash_count": True, - "receivable_account_id": account_id.id, - "journal_id": self.env["account.journal"] - .search( - [("type", "=", "cash"), ("company_id", "=", self.env.company.id)], - limit=1, - ) - .id, - } + self.cash_payment_method = self.pos_config.payment_method_ids.filtered( + lambda x: x.journal_id.type == "cash" + ) + self.bank_payment_method = self.pos_config.payment_method_ids.filtered( + lambda x: x.journal_id.type == "bank" and not x.split_transactions ) - # create new session and open it - self.pos_config.payment_method_ids = [ - self.bank_payment_method.id, - self.cash_payment_method.id, - ] + def _open_session(self): self.pos_config.open_ui() self.session = self.pos_config.current_session_id @@ -120,7 +106,7 @@ def _change_payment( def test_01_payment_change_policy_update(self): self.pos_config.payment_change_policy = "update" - self._initialize_journals_open_session() + self._open_session() # Make a sale with 35 in cash journal and 65 in check order = self._sale(self.cash_payment_method, 35, self.bank_payment_method, 65) @@ -165,7 +151,7 @@ def test_01_payment_change_policy_update(self): def test_02_payment_change_policy_refund(self): self.pos_config.payment_change_policy = "refund" - self._initialize_journals_open_session() + self._open_session() # Make a sale with 35 in cash journal and 65 in check order = self._sale(self.cash_payment_method, 35, self.bank_payment_method, 65) @@ -185,7 +171,7 @@ def test_02_payment_change_policy_refund(self): def test_03_payment_change_closed_orders(self): self.pos_config.payment_change_policy = "update" - self._initialize_journals_open_session() + self._open_session() # Make a sale with 35 in cash journal and 65 in check order = self._sale(self.cash_payment_method, 35, self.bank_payment_method, 65) @@ -198,7 +184,7 @@ def test_03_payment_change_closed_orders(self): def test_04_payment_change_security(self): self.pos_config.payment_change_policy = "refund" - self._initialize_journals_open_session() + self._open_session() order = self._sale(self.cash_payment_method, 35, self.bank_payment_method, 65) # the demo user should be able to do this