From 97ceaedad3f0fe63103213eca87313d7e55ebbd4 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Wed, 21 Sep 2022 11:15:51 +0200 Subject: [PATCH 1/9] Add account_payment_order_transfer_journal. --- .../README.rst | 78 ++++ .../__init__.py | 1 + .../__manifest__.py | 17 + .../models/__init__.py | 2 + .../models/account_journal.py | 15 + .../models/account_payment_order.py | 15 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 424 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_payment_order.py | 118 +++++ .../views/account_journal.xml | 21 + 14 files changed, 695 insertions(+) create mode 100644 account_payment_order_transfer_journal/README.rst create mode 100644 account_payment_order_transfer_journal/__init__.py create mode 100644 account_payment_order_transfer_journal/__manifest__.py create mode 100644 account_payment_order_transfer_journal/models/__init__.py create mode 100644 account_payment_order_transfer_journal/models/account_journal.py create mode 100644 account_payment_order_transfer_journal/models/account_payment_order.py create mode 100644 account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst create mode 100644 account_payment_order_transfer_journal/readme/DESCRIPTION.rst create mode 100644 account_payment_order_transfer_journal/readme/USAGE.rst create mode 100644 account_payment_order_transfer_journal/static/description/icon.png create mode 100644 account_payment_order_transfer_journal/static/description/index.html create mode 100644 account_payment_order_transfer_journal/tests/__init__.py create mode 100644 account_payment_order_transfer_journal/tests/test_payment_order.py create mode 100644 account_payment_order_transfer_journal/views/account_journal.xml diff --git a/account_payment_order_transfer_journal/README.rst b/account_payment_order_transfer_journal/README.rst new file mode 100644 index 00000000000..2a16d2735aa --- /dev/null +++ b/account_payment_order_transfer_journal/README.rst @@ -0,0 +1,78 @@ +======================================= +Account Payement Order Transfer Journal +======================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github + :target: https://github.com/OCA/bank-payment/tree/14.0/account_payment_order_transfer_journal + :alt: OCA/bank-payment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_payment_order_transfer_journal + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/173/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allow to generate payment order entries on a transfer journal + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Set transfer jounrnal directly on the bank journal. If there is no transfer journal, the bank journal itself will be used. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ACSONE SA/NV + +Contributors +~~~~~~~~~~~~ + +* Adrien Peiffer (https://acsone.eu) + +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. + +This module is part of the `OCA/bank-payment `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_transfer_journal/__init__.py b/account_payment_order_transfer_journal/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/account_payment_order_transfer_journal/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_payment_order_transfer_journal/__manifest__.py b/account_payment_order_transfer_journal/__manifest__.py new file mode 100644 index 00000000000..ec4fc1a6e3e --- /dev/null +++ b/account_payment_order_transfer_journal/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Account Payement Order Transfer Journal", + "summary": """ + Add the possibility to book payement order operations on a transfert journal.""", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/bank-payment", + "depends": ["account_payment_order"], + "data": [ + "views/account_journal.xml", + ], + "demo": [], +} diff --git a/account_payment_order_transfer_journal/models/__init__.py b/account_payment_order_transfer_journal/models/__init__.py new file mode 100644 index 00000000000..eb04dbf3585 --- /dev/null +++ b/account_payment_order_transfer_journal/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_journal +from . import account_payment_order diff --git a/account_payment_order_transfer_journal/models/account_journal.py b/account_payment_order_transfer_journal/models/account_journal.py new file mode 100644 index 00000000000..466f8c5b5a6 --- /dev/null +++ b/account_payment_order_transfer_journal/models/account_journal.py @@ -0,0 +1,15 @@ +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountJournal(models.Model): + + _inherit = "account.journal" + + transfer_journal_id = fields.Many2one( + comodel_name="account.journal", + string="Transfer journal on payment/debit orders", + help="Journal to write payment entries when confirming payment/debit orders", + ) diff --git a/account_payment_order_transfer_journal/models/account_payment_order.py b/account_payment_order_transfer_journal/models/account_payment_order.py new file mode 100644 index 00000000000..9a20cbac79a --- /dev/null +++ b/account_payment_order_transfer_journal/models/account_payment_order.py @@ -0,0 +1,15 @@ +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountPaymentOrder(models.Model): + + _inherit = "account.payment.order" + + def _prepare_move(self, bank_lines=None): + res = super()._prepare_move(bank_lines=bank_lines) + if self.journal_id.transfer_journal_id: + res["journal_id"] = self.journal_id.transfer_journal_id.id + return res diff --git a/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..94a5ccf2090 --- /dev/null +++ b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Adrien Peiffer (https://acsone.eu) diff --git a/account_payment_order_transfer_journal/readme/DESCRIPTION.rst b/account_payment_order_transfer_journal/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..048a922ee44 --- /dev/null +++ b/account_payment_order_transfer_journal/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allow to generate payment order entries on a transfer journal diff --git a/account_payment_order_transfer_journal/readme/USAGE.rst b/account_payment_order_transfer_journal/readme/USAGE.rst new file mode 100644 index 00000000000..ae1960c7837 --- /dev/null +++ b/account_payment_order_transfer_journal/readme/USAGE.rst @@ -0,0 +1 @@ +Set transfer jounrnal directly on the bank journal. If there is no transfer journal, the bank journal itself will be used. diff --git a/account_payment_order_transfer_journal/static/description/icon.png b/account_payment_order_transfer_journal/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_payment_order_transfer_journal/static/description/index.html b/account_payment_order_transfer_journal/static/description/index.html new file mode 100644 index 00000000000..2c5ec388bd7 --- /dev/null +++ b/account_payment_order_transfer_journal/static/description/index.html @@ -0,0 +1,424 @@ + + + + + + +Account Payement Order Transfer Journal + + + +
+

Account Payement Order Transfer Journal

+ + +

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

This module allow to generate payment order entries on a transfer journal

+

Table of contents

+ +
+

Usage

+

Set transfer jounrnal directly on the bank journal. If there is no transfer journal, the bank journal itself will be used.

+
+
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • ACSONE SA/NV
    • +
+
+ +
+

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.

+

This module is part of the OCA/bank-payment project on GitHub.

+

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

+
+
+
+ + diff --git a/account_payment_order_transfer_journal/tests/__init__.py b/account_payment_order_transfer_journal/tests/__init__.py new file mode 100644 index 00000000000..528bf29603f --- /dev/null +++ b/account_payment_order_transfer_journal/tests/__init__.py @@ -0,0 +1 @@ +from . import test_payment_order diff --git a/account_payment_order_transfer_journal/tests/test_payment_order.py b/account_payment_order_transfer_journal/tests/test_payment_order.py new file mode 100644 index 00000000000..aa4c1309c0e --- /dev/null +++ b/account_payment_order_transfer_journal/tests/test_payment_order.py @@ -0,0 +1,118 @@ +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import datetime, timedelta + +from odoo import fields +from odoo.tests.common import TransactionCase + + +class TestPaymentOrder(TransactionCase): + def setUp(self): + super().setUp() + self.company = self.env.ref("base.main_company") + self.env.user.company_id = self.company.id + self.partner = self.env["res.partner"].create( + { + "name": "Test Partner", + } + ) + self.product = self.env["product.product"].create({"name": "Test"}) + self.invoice_line_account = self.env["account.account"].create( + { + "name": "Test account", + "code": "TEST1", + "user_type_id": self.env.ref("account.data_account_type_expenses").id, + } + ) + self.bank_journal = self.env["account.journal"].search( + [("company_id", "=", self.company.id), ("type", "=", "bank")], limit=1 + ) + self.transfer_journal = self.env["account.journal"].search( + [("company_id", "=", self.company.id), ("type", "=", "general")], + limit=1, + ) + + self.mode = self.env["account.payment.mode"].create( + { + "name": "Test Credit Transfer to Suppliers", + "company_id": self.company.id, + "payment_method_id": self.env.ref( + "account.account_payment_method_manual_out" + ).id, + "fixed_journal_id": self.bank_journal.id, + "bank_account_link": "fixed", + } + ) + self.invoice = self._create_supplier_invoice("F1242") + # Make sure no other payment orders are in the DB + self.domain = [ + ("state", "=", "draft"), + ("payment_type", "=", "outbound"), + ("company_id", "=", self.env.user.company_id.id), + ] + self.env["account.payment.order"].search(self.domain).unlink() + + def _create_supplier_invoice(self, ref): + invoice = self.env["account.move"].create( + { + "partner_id": self.partner.id, + "move_type": "in_invoice", + "ref": ref, + "payment_mode_id": self.mode.id, + "invoice_date": fields.Date.today(), + "invoice_line_ids": [ + ( + 0, + None, + { + "product_id": self.product.id, + "quantity": 1.0, + "price_unit": 100.0, + "name": "product that cost 100", + "account_id": self.invoice_line_account.id, + }, + ) + ], + } + ) + + return invoice + + def test_payment_order_transfer_jounral(self): + self.invoice.action_post() + self.bank_journal.transfer_journal_id = self.transfer_journal + order_vals = { + "payment_type": "outbound", + "payment_mode_id": self.mode.id, + } + order = self.env["account.payment.order"].create(order_vals) + order.payment_mode_id = self.mode.id + order.payment_mode_id_change() + self.assertEqual(order.journal_id.id, self.bank_journal.id) + + self.assertEqual(len(order.payment_line_ids), 0) + line_create = ( + self.env["account.payment.line.create"] + .with_context(active_model="account.payment.order", active_id=order.id) + .create( + {"date_type": "move", "move_date": datetime.now() + timedelta(days=1)} + ) + ) + line_create.payment_mode = "any" + line_create.move_line_filters_change() + line_create.populate() + line_create.create_payment_lines() + line_created_due = ( + self.env["account.payment.line.create"] + .with_context(active_model="account.payment.order", active_id=order.id) + .create( + {"date_type": "due", "due_date": datetime.now() + timedelta(days=1)} + ) + ) + line_created_due.populate() + line_created_due.create_payment_lines() + order.draft2open() + order.open2generated() + order.generated2uploaded() + self.assertEqual(order.move_ids[0].journal_id, self.transfer_journal) diff --git a/account_payment_order_transfer_journal/views/account_journal.xml b/account_payment_order_transfer_journal/views/account_journal.xml new file mode 100644 index 00000000000..c23e15953b2 --- /dev/null +++ b/account_payment_order_transfer_journal/views/account_journal.xml @@ -0,0 +1,21 @@ + + + + + + account.journal.form (in account_payment_order_transfer_journal) + account.journal + + + + + + + + + + + From 059442eac29f64be132f22282534e4bf643af169 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 29 Jun 2023 10:08:56 +0200 Subject: [PATCH 2/9] [IMP] account_payment_order_transfer_journal: pre-commit stuff --- .../odoo/addons/account_payment_order_transfer_journal | 1 + setup/account_payment_order_transfer_journal/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal create mode 100644 setup/account_payment_order_transfer_journal/setup.py diff --git a/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal b/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal new file mode 120000 index 00000000000..08e22498842 --- /dev/null +++ b/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal @@ -0,0 +1 @@ +../../../../account_payment_order_transfer_journal \ No newline at end of file diff --git a/setup/account_payment_order_transfer_journal/setup.py b/setup/account_payment_order_transfer_journal/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/account_payment_order_transfer_journal/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 56f905d9984d808bd1786e89df632a493998cf17 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 29 Jun 2023 11:20:47 +0200 Subject: [PATCH 3/9] [MIG] account_payment_order_transfer_journal: Migration to 16.0 --- .../__manifest__.py | 9 ++++---- .../models/__init__.py | 2 +- .../models/account_payment_line.py | 14 +++++++++++++ .../models/account_payment_order.py | 15 ------------- .../readme/CONTRIBUTORS.rst | 1 + .../views/account_journal.xml | 21 ------------------- .../views/account_journal_views.xml | 17 +++++++++++++++ 7 files changed, 38 insertions(+), 41 deletions(-) create mode 100644 account_payment_order_transfer_journal/models/account_payment_line.py delete mode 100644 account_payment_order_transfer_journal/models/account_payment_order.py delete mode 100644 account_payment_order_transfer_journal/views/account_journal.xml create mode 100644 account_payment_order_transfer_journal/views/account_journal_views.xml diff --git a/account_payment_order_transfer_journal/__manifest__.py b/account_payment_order_transfer_journal/__manifest__.py index ec4fc1a6e3e..e107d39d0d2 100644 --- a/account_payment_order_transfer_journal/__manifest__.py +++ b/account_payment_order_transfer_journal/__manifest__.py @@ -1,17 +1,18 @@ # Copyright 2022 ACSONE SA/NV +# Copyright 2023 Noviat # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Account Payement Order Transfer Journal", "summary": """ - Add the possibility to book payement order operations on a transfert journal.""", - "version": "14.0.1.0.0", + Add the possibility to book payment order operations on a transfert journal.""", + "version": "16.0.1.0.0", "license": "AGPL-3", - "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "author": "ACSONE SA/NV,Noviat,Odoo Community Association (OCA)", "website": "https://github.com/OCA/bank-payment", "depends": ["account_payment_order"], "data": [ - "views/account_journal.xml", + "views/account_journal_views.xml", ], "demo": [], } diff --git a/account_payment_order_transfer_journal/models/__init__.py b/account_payment_order_transfer_journal/models/__init__.py index eb04dbf3585..d1408893fcc 100644 --- a/account_payment_order_transfer_journal/models/__init__.py +++ b/account_payment_order_transfer_journal/models/__init__.py @@ -1,2 +1,2 @@ from . import account_journal -from . import account_payment_order +from . import account_payment_line diff --git a/account_payment_order_transfer_journal/models/account_payment_line.py b/account_payment_order_transfer_journal/models/account_payment_line.py new file mode 100644 index 00000000000..a26ceb68e27 --- /dev/null +++ b/account_payment_order_transfer_journal/models/account_payment_line.py @@ -0,0 +1,14 @@ +# Copyright 2023 Noviat +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountPaymentLine(models.Model): + _inherit = "account.payment.line" + + def _prepare_account_payment_vals(self): + vals = super()._prepare_account_payment_vals() + if self.order_id.journal_id.transfer_journal_id: + vals["journal_id"] = self.order_id.journal_id.transfer_journal_id.id + return vals diff --git a/account_payment_order_transfer_journal/models/account_payment_order.py b/account_payment_order_transfer_journal/models/account_payment_order.py deleted file mode 100644 index 9a20cbac79a..00000000000 --- a/account_payment_order_transfer_journal/models/account_payment_order.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2022 ACSONE SA/NV -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import models - - -class AccountPaymentOrder(models.Model): - - _inherit = "account.payment.order" - - def _prepare_move(self, bank_lines=None): - res = super()._prepare_move(bank_lines=bank_lines) - if self.journal_id.transfer_journal_id: - res["journal_id"] = self.journal_id.transfer_journal_id.id - return res diff --git a/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst index 94a5ccf2090..074a9b413ec 100644 --- a/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst +++ b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Adrien Peiffer (https://acsone.eu) +* Luc De Meyer (https://noviat.com) diff --git a/account_payment_order_transfer_journal/views/account_journal.xml b/account_payment_order_transfer_journal/views/account_journal.xml deleted file mode 100644 index c23e15953b2..00000000000 --- a/account_payment_order_transfer_journal/views/account_journal.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - account.journal.form (in account_payment_order_transfer_journal) - account.journal - - - - - - - - - - - diff --git a/account_payment_order_transfer_journal/views/account_journal_views.xml b/account_payment_order_transfer_journal/views/account_journal_views.xml new file mode 100644 index 00000000000..c7e5da023af --- /dev/null +++ b/account_payment_order_transfer_journal/views/account_journal_views.xml @@ -0,0 +1,17 @@ + + + + + account.journal.form (in account_payment_order_transfer_journal) + account.journal + + + + + + + + + From 8dd8e05b26124656369b0c1f8ed464d6a765d577 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 29 Jun 2023 14:49:56 +0200 Subject: [PATCH 4/9] account_payment_order_transfer_journal - add 'general' filter on transfer journal --- .../models/account_journal.py | 3 ++- .../views/account_journal_views.xml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/account_payment_order_transfer_journal/models/account_journal.py b/account_payment_order_transfer_journal/models/account_journal.py index 466f8c5b5a6..ae65d51eb1f 100644 --- a/account_payment_order_transfer_journal/models/account_journal.py +++ b/account_payment_order_transfer_journal/models/account_journal.py @@ -1,15 +1,16 @@ # Copyright 2022 ACSONE SA/NV +# Copyright 2023 Noviat # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models class AccountJournal(models.Model): - _inherit = "account.journal" transfer_journal_id = fields.Many2one( comodel_name="account.journal", string="Transfer journal on payment/debit orders", + domain="[('type', '=', 'general')]", help="Journal to write payment entries when confirming payment/debit orders", ) diff --git a/account_payment_order_transfer_journal/views/account_journal_views.xml b/account_payment_order_transfer_journal/views/account_journal_views.xml index c7e5da023af..f26d125b503 100644 --- a/account_payment_order_transfer_journal/views/account_journal_views.xml +++ b/account_payment_order_transfer_journal/views/account_journal_views.xml @@ -8,6 +8,11 @@ account.journal + + {'invisible': [('transfer_journal_id', '!=', False)]} + From 7aebbd4a57f2ed0072b116487dfcac697fcb999a Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 29 Jun 2023 15:53:14 +0200 Subject: [PATCH 5/9] unit test --- .../tests/test_payment_order.py | 130 +++++------------- 1 file changed, 32 insertions(+), 98 deletions(-) diff --git a/account_payment_order_transfer_journal/tests/test_payment_order.py b/account_payment_order_transfer_journal/tests/test_payment_order.py index aa4c1309c0e..c249d267ca8 100644 --- a/account_payment_order_transfer_journal/tests/test_payment_order.py +++ b/account_payment_order_transfer_journal/tests/test_payment_order.py @@ -1,118 +1,52 @@ -# Copyright 2022 ACSONE SA/NV +# Copyright 2023 Noviat # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from datetime import datetime, timedelta - +import odoo.tests from odoo import fields -from odoo.tests.common import TransactionCase +from odoo.addons.account.tests.common import AccountTestInvoicingCommon -class TestPaymentOrder(TransactionCase): - def setUp(self): - super().setUp() - self.company = self.env.ref("base.main_company") - self.env.user.company_id = self.company.id - self.partner = self.env["res.partner"].create( - { - "name": "Test Partner", - } - ) - self.product = self.env["product.product"].create({"name": "Test"}) - self.invoice_line_account = self.env["account.account"].create( - { - "name": "Test account", - "code": "TEST1", - "user_type_id": self.env.ref("account.data_account_type_expenses").id, - } - ) - self.bank_journal = self.env["account.journal"].search( - [("company_id", "=", self.company.id), ("type", "=", "bank")], limit=1 - ) - self.transfer_journal = self.env["account.journal"].search( - [("company_id", "=", self.company.id), ("type", "=", "general")], - limit=1, - ) - self.mode = self.env["account.payment.mode"].create( +@odoo.tests.tagged("post_install", "-at_install") +class TestPaymentOrderTranserJournal(AccountTestInvoicingCommon): + @classmethod + def setUpClass(cls): + super().setUpClass() + today = fields.Date.today() + cls.in_invoice = cls.init_invoice( + "in_invoice", invoice_date=today, products=cls.product_a + ) + cls.bank_journal = cls.company_data["default_journal_bank"] + cls.misc_journal = cls.company_data["default_journal_misc"] + cls.payment_mode = cls.env["account.payment.mode"].create( { "name": "Test Credit Transfer to Suppliers", - "company_id": self.company.id, - "payment_method_id": self.env.ref( + "company_id": cls.env.company.id, + "payment_method_id": cls.env.ref( "account.account_payment_method_manual_out" ).id, - "fixed_journal_id": self.bank_journal.id, + "fixed_journal_id": cls.bank_journal.id, "bank_account_link": "fixed", } ) - self.invoice = self._create_supplier_invoice("F1242") - # Make sure no other payment orders are in the DB - self.domain = [ - ("state", "=", "draft"), - ("payment_type", "=", "outbound"), - ("company_id", "=", self.env.user.company_id.id), - ] - self.env["account.payment.order"].search(self.domain).unlink() - def _create_supplier_invoice(self, ref): - invoice = self.env["account.move"].create( - { - "partner_id": self.partner.id, - "move_type": "in_invoice", - "ref": ref, - "payment_mode_id": self.mode.id, - "invoice_date": fields.Date.today(), - "invoice_line_ids": [ - ( - 0, - None, - { - "product_id": self.product.id, - "quantity": 1.0, - "price_unit": 100.0, - "name": "product that cost 100", - "account_id": self.invoice_line_account.id, - }, - ) - ], - } + def test_payment_order_transfer_journal(self): + self.in_invoice._post() + self.bank_journal.transfer_journal_id = self.misc_journal + ap_aml = self.in_invoice.line_ids.filtered( + lambda r: r.account_type == "liability_payable" ) - - return invoice - - def test_payment_order_transfer_jounral(self): - self.invoice.action_post() - self.bank_journal.transfer_journal_id = self.transfer_journal + payline_vals = { + "move_line_id": ap_aml.id, + "partner_id": self.in_invoice.partner_id.id, + "communication": "F0123", + "amount_currency": -ap_aml.amount_currency, + } order_vals = { "payment_type": "outbound", - "payment_mode_id": self.mode.id, + "payment_mode_id": self.payment_mode.id, + "payment_line_ids": [(0, 0, payline_vals)], } order = self.env["account.payment.order"].create(order_vals) - order.payment_mode_id = self.mode.id - order.payment_mode_id_change() - self.assertEqual(order.journal_id.id, self.bank_journal.id) - - self.assertEqual(len(order.payment_line_ids), 0) - line_create = ( - self.env["account.payment.line.create"] - .with_context(active_model="account.payment.order", active_id=order.id) - .create( - {"date_type": "move", "move_date": datetime.now() + timedelta(days=1)} - ) - ) - line_create.payment_mode = "any" - line_create.move_line_filters_change() - line_create.populate() - line_create.create_payment_lines() - line_created_due = ( - self.env["account.payment.line.create"] - .with_context(active_model="account.payment.order", active_id=order.id) - .create( - {"date_type": "due", "due_date": datetime.now() + timedelta(days=1)} - ) - ) - line_created_due.populate() - line_created_due.create_payment_lines() order.draft2open() - order.open2generated() - order.generated2uploaded() - self.assertEqual(order.move_ids[0].journal_id, self.transfer_journal) + self.assertEqual(order.mapped("move_ids.journal_id"), self.misc_journal) From 7ea2fa398c7483679d9d21858f5ba26f0ec33b97 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Tue, 7 Nov 2023 13:25:47 +0100 Subject: [PATCH 6/9] [IMP] move transfer jpurnal setting from journal to payment mode --- .../README.rst | 28 ++++++----- .../__manifest__.py | 2 +- .../models/__init__.py | 2 +- .../models/account_payment_line.py | 4 +- ...unt_journal.py => account_payment_mode.py} | 5 +- .../readme/USAGE.rst | 3 +- .../static/description/index.html | 47 ++++++++++--------- .../tests/test_payment_order.py | 2 +- .../views/account_journal_views.xml | 22 --------- .../views/account_payment_mode_views.xml | 18 +++++++ 10 files changed, 70 insertions(+), 63 deletions(-) rename account_payment_order_transfer_journal/models/{account_journal.py => account_payment_mode.py} (80%) delete mode 100644 account_payment_order_transfer_journal/views/account_journal_views.xml create mode 100644 account_payment_order_transfer_journal/views/account_payment_mode_views.xml diff --git a/account_payment_order_transfer_journal/README.rst b/account_payment_order_transfer_journal/README.rst index 2a16d2735aa..7e2c93797f4 100644 --- a/account_payment_order_transfer_journal/README.rst +++ b/account_payment_order_transfer_journal/README.rst @@ -2,10 +2,13 @@ Account Payement Order Transfer Journal ======================================= -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:e52099ef175e833fe269292c0e7ed67f491c0f1006c5f05c122147f541a3369c + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Account Payement Order Transfer Journal :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/14.0/account_payment_order_transfer_journal + :target: https://github.com/OCA/bank-payment/tree/16.0/account_payment_order_transfer_journal :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_payment_order_transfer_journal + :target: https://translation.odoo-community.org/projects/bank-payment-16-0/bank-payment-16-0-account_payment_order_transfer_journal :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-payment&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allow to generate payment order entries on a transfer journal @@ -35,15 +38,16 @@ This module allow to generate payment order entries on a transfer journal Usage ===== -Set transfer jounrnal directly on the bank journal. If there is no transfer journal, the bank journal itself will be used. +Set transfer jounrnal via Accounting Settings or on the payment mode. +If there is no transfer journal, the bank journal itself will be used. 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 `_. +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. @@ -54,11 +58,13 @@ Authors ~~~~~~~ * ACSONE SA/NV +* Noviat Contributors ~~~~~~~~~~~~ * Adrien Peiffer (https://acsone.eu) +* Luc De Meyer (https://noviat.com) Maintainers ~~~~~~~~~~~ @@ -73,6 +79,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/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_transfer_journal/__manifest__.py b/account_payment_order_transfer_journal/__manifest__.py index e107d39d0d2..ee51320ceb5 100644 --- a/account_payment_order_transfer_journal/__manifest__.py +++ b/account_payment_order_transfer_journal/__manifest__.py @@ -12,7 +12,7 @@ "website": "https://github.com/OCA/bank-payment", "depends": ["account_payment_order"], "data": [ - "views/account_journal_views.xml", + "views/account_payment_mode_views.xml", ], "demo": [], } diff --git a/account_payment_order_transfer_journal/models/__init__.py b/account_payment_order_transfer_journal/models/__init__.py index d1408893fcc..e35c609e84b 100644 --- a/account_payment_order_transfer_journal/models/__init__.py +++ b/account_payment_order_transfer_journal/models/__init__.py @@ -1,2 +1,2 @@ -from . import account_journal from . import account_payment_line +from . import account_payment_mode diff --git a/account_payment_order_transfer_journal/models/account_payment_line.py b/account_payment_order_transfer_journal/models/account_payment_line.py index a26ceb68e27..2326a12a397 100644 --- a/account_payment_order_transfer_journal/models/account_payment_line.py +++ b/account_payment_order_transfer_journal/models/account_payment_line.py @@ -9,6 +9,6 @@ class AccountPaymentLine(models.Model): def _prepare_account_payment_vals(self): vals = super()._prepare_account_payment_vals() - if self.order_id.journal_id.transfer_journal_id: - vals["journal_id"] = self.order_id.journal_id.transfer_journal_id.id + if self.order_id.payment_mode_id.transfer_journal_id: + vals["journal_id"] = self.order_id.payment_mode_id.transfer_journal_id.id return vals diff --git a/account_payment_order_transfer_journal/models/account_journal.py b/account_payment_order_transfer_journal/models/account_payment_mode.py similarity index 80% rename from account_payment_order_transfer_journal/models/account_journal.py rename to account_payment_order_transfer_journal/models/account_payment_mode.py index ae65d51eb1f..c1e7226b05b 100644 --- a/account_payment_order_transfer_journal/models/account_journal.py +++ b/account_payment_order_transfer_journal/models/account_payment_mode.py @@ -1,12 +1,11 @@ -# Copyright 2022 ACSONE SA/NV # Copyright 2023 Noviat # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models -class AccountJournal(models.Model): - _inherit = "account.journal" +class AccountPaymentMode(models.Model): + _inherit = "account.payment.mode" transfer_journal_id = fields.Many2one( comodel_name="account.journal", diff --git a/account_payment_order_transfer_journal/readme/USAGE.rst b/account_payment_order_transfer_journal/readme/USAGE.rst index ae1960c7837..b638f380c8b 100644 --- a/account_payment_order_transfer_journal/readme/USAGE.rst +++ b/account_payment_order_transfer_journal/readme/USAGE.rst @@ -1 +1,2 @@ -Set transfer jounrnal directly on the bank journal. If there is no transfer journal, the bank journal itself will be used. +Set transfer jounrnal via Accounting Settings or on the payment mode. +If there is no transfer journal, the bank journal itself will be used. diff --git a/account_payment_order_transfer_journal/static/description/index.html b/account_payment_order_transfer_journal/static/description/index.html index 2c5ec388bd7..668f0b6fdfe 100644 --- a/account_payment_order_transfer_journal/static/description/index.html +++ b/account_payment_order_transfer_journal/static/description/index.html @@ -1,20 +1,20 @@ - + - + Account Payement Order Transfer Journal - - -
-

Account Payement Order Transfer Journal

- - -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runboat

-

This module allow to generate payment order entries on a transfer journal

-

Table of contents

- -
-

Usage

-

Set transfer jounrnal via Accounting Settings or on the Payment Mode. -If there is no transfer journal, the bank journal itself will be used.

-
-
-

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

-
    -
  • ACSONE SA/NV
    • -
  • Noviat
    • -
-
- -
-

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.

-

This module is part of the OCA/bank-payment project on GitHub.

-

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

-
-
-
- - diff --git a/account_payment_order_transfer_journal/tests/__init__.py b/account_payment_order_transfer_journal/tests/__init__.py deleted file mode 100644 index 528bf29603f..00000000000 --- a/account_payment_order_transfer_journal/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import test_payment_order diff --git a/account_payment_order_transfer_journal/views/account_payment_mode_views.xml b/account_payment_order_transfer_journal/views/account_payment_mode_views.xml deleted file mode 100644 index 8a81b4e3d31..00000000000 --- a/account_payment_order_transfer_journal/views/account_payment_mode_views.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - account.payment.mode.form.transfer_journal) - account.payment.mode - - - - - - - - - diff --git a/account_payment_order_transfer_journal/wizards/__init__.py b/account_payment_order_transfer_journal/wizards/__init__.py deleted file mode 100644 index 0deb68c4680..00000000000 --- a/account_payment_order_transfer_journal/wizards/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import res_config_settings diff --git a/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal b/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal deleted file mode 120000 index 08e22498842..00000000000 --- a/setup/account_payment_order_transfer_journal/odoo/addons/account_payment_order_transfer_journal +++ /dev/null @@ -1 +0,0 @@ -../../../../account_payment_order_transfer_journal \ No newline at end of file diff --git a/setup/account_payment_order_transfer_journal/setup.py b/setup/account_payment_order_transfer_journal/setup.py deleted file mode 100644 index 28c57bb6403..00000000000 --- a/setup/account_payment_order_transfer_journal/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) From 7c7fbfa999ab69edebd5713292358f5a7c528036 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sun, 14 Apr 2024 19:54:17 +0200 Subject: [PATCH 9/9] [FIX]account_payment_order transfer journal The transfer journal functionality has been broken by commit https://github.com/odoo/odoo/commit/65a19492a8044be4f05a8200a6956c3e50b69eab This fix adds transfer journal support to this constraint. --- account_payment_order/models/account_payment.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/account_payment_order/models/account_payment.py b/account_payment_order/models/account_payment.py index d1febc96a90..45075eb2d6d 100644 --- a/account_payment_order/models/account_payment.py +++ b/account_payment_order/models/account_payment.py @@ -35,3 +35,16 @@ def _compute_payment_method_line_fields(self): ) ) return res + + @api.constrains("payment_method_line_id") + def _check_payment_method_line_id(self): + for pay in self: + transfer_journal = ( + pay.payment_order_id.payment_mode_id.transfer_journal_id + or pay.company_id.transfer_journal_id + ) + if pay.journal_id == transfer_journal: + continue + else: + super(AccountPayment, pay)._check_payment_method_line_id() + return