diff --git a/account_fiscal_position_allowed_journal/README.rst b/account_fiscal_position_allowed_journal/README.rst new file mode 100644 index 000000000..b31fb6147 --- /dev/null +++ b/account_fiscal_position_allowed_journal/README.rst @@ -0,0 +1,96 @@ +======================================= +Account Fiscal Position Allowed 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%2Faccount--financial--tools-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-tools/tree/13.0/account_fiscal_position_allowed_journal + :alt: OCA/account-financial-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-tools-13-0/account-financial-tools-13-0-account_fiscal_position_allowed_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/92/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Allow defining allowed journals on fiscal positions. +Related invoices can only use one of the allowed journals on the fiscal position. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +On a fiscal position, a new field allows to select one or several accounting journals. + +Usage +===== + +When creating an invoice, if a fiscal position with allowed journal(s) is set, +only one of these journal can be used on the invoice. + +If there is no fiscal position on the invoice or no allowed journal on the selected fiscal position, +the standard behavior is preserved. + +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 +~~~~~~~~~~~~ + +* Thomas Binsfeld (https://www.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. + +.. |maintainer-ThomasBinsfeld| image:: https://github.com/ThomasBinsfeld.png?size=40px + :target: https://github.com/ThomasBinsfeld + :alt: ThomasBinsfeld + +Current `maintainer `__: + +|maintainer-ThomasBinsfeld| + +This module is part of the `OCA/account-financial-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_fiscal_position_allowed_journal/__init__.py b/account_fiscal_position_allowed_journal/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/account_fiscal_position_allowed_journal/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_fiscal_position_allowed_journal/__manifest__.py b/account_fiscal_position_allowed_journal/__manifest__.py new file mode 100644 index 000000000..6edf037bd --- /dev/null +++ b/account_fiscal_position_allowed_journal/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Fiscal Position Allowed Journal", + "summary": """ + Allow defining allowed journals on fiscal positions. + Related invoices can only use one of the allowed journals on the + fiscal position.""", + "version": "13.0.1.0.0", + "development_status": "Beta", + "category": "Accounting/Accounting", + "license": "AGPL-3", + "author": "ACSONE SA/NV, Odoo Community Association (OCA)", + "maintainers": ["ThomasBinsfeld"], + "website": "https://github.com/OCA/account-financial-tools", + "depends": ["account"], + "data": ["views/account_fiscal_position.xml"], + "demo": [], +} diff --git a/account_fiscal_position_allowed_journal/i18n/account_fiscal_position_allowed_journal.pot b/account_fiscal_position_allowed_journal/i18n/account_fiscal_position_allowed_journal.pot new file mode 100644 index 000000000..ef3cd3b50 --- /dev/null +++ b/account_fiscal_position_allowed_journal/i18n/account_fiscal_position_allowed_journal.pot @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_fiscal_position_allowed_journal +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-03 12:29+0000\n" +"PO-Revision-Date: 2020-02-03 12:29+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: account_fiscal_position_allowed_journal +#: model:ir.model.fields,field_description:account_fiscal_position_allowed_journal.field_account_fiscal_position__allowed_journal_ids +msgid "Allowed journals" +msgstr "" + +#. module: account_fiscal_position_allowed_journal +#: model:ir.model,name:account_fiscal_position_allowed_journal.model_account_fiscal_position +msgid "Fiscal Position" +msgstr "" + +#. module: account_fiscal_position_allowed_journal +#: model:ir.model,name:account_fiscal_position_allowed_journal.model_account_move +msgid "Journal Entries" +msgstr "" + +#. module: account_fiscal_position_allowed_journal +#: code:addons/account_fiscal_position_allowed_journal/models/account_move.py:0 +#, python-format +msgid "The journal is not allowed on the fiscal position." +msgstr "" diff --git a/account_fiscal_position_allowed_journal/i18n/fr.po b/account_fiscal_position_allowed_journal/i18n/fr.po new file mode 100644 index 000000000..2e7352d13 --- /dev/null +++ b/account_fiscal_position_allowed_journal/i18n/fr.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_fiscal_position_allowed_journal +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-03 12:31+0000\n" +"PO-Revision-Date: 2020-02-03 12:31+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: account_fiscal_position_allowed_journal +#: model:ir.model.fields,field_description:account_fiscal_position_allowed_journal.field_account_fiscal_position__allowed_journal_ids +msgid "Allowed journals" +msgstr "Journaux autorisés" + +#. module: account_fiscal_position_allowed_journal +#: model:ir.model,name:account_fiscal_position_allowed_journal.model_account_fiscal_position +msgid "Fiscal Position" +msgstr "Position fiscale" + +#. module: account_fiscal_position_allowed_journal +#: model:ir.model,name:account_fiscal_position_allowed_journal.model_account_move +msgid "Journal Entries" +msgstr "Pièces comptables" + +#. module: account_fiscal_position_allowed_journal +#: code:addons/account_fiscal_position_allowed_journal/models/account_move.py:0 +#, python-format +msgid "The journal is not allowed on the fiscal position." +msgstr "Le journal n'est pas autorisé sur la position fiscale." diff --git a/account_fiscal_position_allowed_journal/models/__init__.py b/account_fiscal_position_allowed_journal/models/__init__.py new file mode 100644 index 000000000..b9b58077e --- /dev/null +++ b/account_fiscal_position_allowed_journal/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_fiscal_position +from . import account_move diff --git a/account_fiscal_position_allowed_journal/models/account_fiscal_position.py b/account_fiscal_position_allowed_journal/models/account_fiscal_position.py new file mode 100644 index 000000000..a8d80dd89 --- /dev/null +++ b/account_fiscal_position_allowed_journal/models/account_fiscal_position.py @@ -0,0 +1,21 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountFiscalPosition(models.Model): + _inherit = "account.fiscal.position" + + allowed_journal_ids = fields.Many2many( + string="Allowed journals", comodel_name="account.journal" + ) + + def _get_allowed_journal(self, journal_type): + """ + Returns the journal matching the given type only if there is only one. + :return: account.journal record + """ + self.ensure_one() + journals = self.allowed_journal_ids.filtered(lambda j: j.type == journal_type) + return journals if len(journals) == 1 else self.env["account.journal"].browse() diff --git a/account_fiscal_position_allowed_journal/models/account_move.py b/account_fiscal_position_allowed_journal/models/account_move.py new file mode 100644 index 000000000..a2087b5e6 --- /dev/null +++ b/account_fiscal_position_allowed_journal/models/account_move.py @@ -0,0 +1,54 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, models +from odoo.exceptions import UserError + + +class AccountMove(models.Model): + _inherit = "account.move" + + @api.onchange("fiscal_position_id") + def _onchange_fiscal_position_allowed_journal(self): + self.ensure_one() + journal_domain = [ + ("company_id", "=", self.company_id.id), + ("type", "=?", self.invoice_filter_type_domain), + ] + if self.fiscal_position_id: + journal_type = "sale" if self.is_sale_document() else "purchase" + allowed_journal = self.fiscal_position_id._get_allowed_journal(journal_type) + if allowed_journal: + self.journal_id = allowed_journal + journal_domain.append( + ("id", "in", self.fiscal_position_id.allowed_journal_ids.ids) + ) + return {"domain": {"journal_id": journal_domain}} + + def _check_journal_allowed_fiscal_position(self): + """ + This method checks whether the journal of the invoice is allowed for the + selected fiscal position. + If no fiscal position or no allowed journal on the fiscal position, always OK. + :raise: UserError if not allowed + """ + for rec in self: + if ( + rec.is_invoice(include_receipts=True) + and self.fiscal_position_id + and self.fiscal_position_id.allowed_journal_ids + and rec.journal_id not in self.fiscal_position_id.allowed_journal_ids + ): + raise UserError( + _( + "Journal {journal_name} is not allowed for fiscal position " + "{fp_name}." + ).format( + journal_name=rec.journal_id.display_name, + fp_name=rec.fiscal_position_id.display_name, + ) + ) + + def post(self): + self._check_journal_allowed_fiscal_position() + return super().post() diff --git a/account_fiscal_position_allowed_journal/readme/CONFIGURE.rst b/account_fiscal_position_allowed_journal/readme/CONFIGURE.rst new file mode 100644 index 000000000..ca203c2d3 --- /dev/null +++ b/account_fiscal_position_allowed_journal/readme/CONFIGURE.rst @@ -0,0 +1 @@ +On a fiscal position, a new field allows to select one or several accounting journals. diff --git a/account_fiscal_position_allowed_journal/readme/CONTRIBUTORS.rst b/account_fiscal_position_allowed_journal/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..0a9ab3ef5 --- /dev/null +++ b/account_fiscal_position_allowed_journal/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Thomas Binsfeld (https://www.acsone.eu/) diff --git a/account_fiscal_position_allowed_journal/readme/DESCRIPTION.rst b/account_fiscal_position_allowed_journal/readme/DESCRIPTION.rst new file mode 100644 index 000000000..784406043 --- /dev/null +++ b/account_fiscal_position_allowed_journal/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Allow defining allowed journals on fiscal positions. +Related invoices can only use one of the allowed journals on the fiscal position. diff --git a/account_fiscal_position_allowed_journal/readme/USAGE.rst b/account_fiscal_position_allowed_journal/readme/USAGE.rst new file mode 100644 index 000000000..de424b18b --- /dev/null +++ b/account_fiscal_position_allowed_journal/readme/USAGE.rst @@ -0,0 +1,5 @@ +When creating an invoice, if a fiscal position with allowed journal(s) is set, +only one of these journal can be used on the invoice. + +If there is no fiscal position on the invoice or no allowed journal on the selected fiscal position, +the standard behavior is preserved. diff --git a/account_fiscal_position_allowed_journal/static/description/icon.png b/account_fiscal_position_allowed_journal/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_fiscal_position_allowed_journal/static/description/icon.png differ diff --git a/account_fiscal_position_allowed_journal/static/description/index.html b/account_fiscal_position_allowed_journal/static/description/index.html new file mode 100644 index 000000000..81a35984a --- /dev/null +++ b/account_fiscal_position_allowed_journal/static/description/index.html @@ -0,0 +1,435 @@ + + + + + + +Account Fiscal Position Allowed Journal + + + +
+

Account Fiscal Position Allowed Journal

+ + +

Beta License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runbot

+

Allow defining allowed journals on fiscal positions. +Related invoices can only use one of the allowed journals on the fiscal position.

+

Table of contents

+ +
+

Configuration

+

On a fiscal position, a new field allows to select one or several accounting journals.

+
+
+

Usage

+

When creating an invoice, if a fiscal position with allowed journal(s) is set, +only one of these journal can be used on the invoice.

+

If there is no fiscal position on the invoice or no allowed journal on the selected fiscal position, +the standard behavior is preserved.

+
+
+

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.

+

Current maintainer:

+

ThomasBinsfeld

+

This module is part of the OCA/account-financial-tools project on GitHub.

+

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

+
+
+
+ + diff --git a/account_fiscal_position_allowed_journal/tests/__init__.py b/account_fiscal_position_allowed_journal/tests/__init__.py new file mode 100644 index 000000000..57d004dcc --- /dev/null +++ b/account_fiscal_position_allowed_journal/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_fiscal_position_allowed_journal diff --git a/account_fiscal_position_allowed_journal/tests/test_account_fiscal_position_allowed_journal.py b/account_fiscal_position_allowed_journal/tests/test_account_fiscal_position_allowed_journal.py new file mode 100644 index 000000000..769550008 --- /dev/null +++ b/account_fiscal_position_allowed_journal/tests/test_account_fiscal_position_allowed_journal.py @@ -0,0 +1,117 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.exceptions import UserError +from odoo.tests.common import SavepointCase + + +class TestAccountFiscalPositionAllowedJournal(SavepointCase): + @classmethod + def setUpClass(cls): + super(TestAccountFiscalPositionAllowedJournal, cls).setUpClass() + + # MODELS + cls.account_model = cls.env["account.account"] + cls.fiscal_position_model = cls.env["account.fiscal.position"] + cls.invoice_model = cls.env["account.move"] + cls.journal_model = cls.env["account.journal"] + cls.partner_model = cls.env["res.partner"] + + # INSTANCES + cls.account_account_01 = cls.account_model.search( + [("code", "ilike", "4%")], limit=1 + ) + cls.fiscal_position_01 = cls.fiscal_position_model.create( + {"name": "Fiscal position 01"} + ) + cls.journal_01 = cls.journal_model.search([("type", "=", "sale")], limit=1) + cls.journal_02 = cls.journal_01.copy() + cls.partner_01 = cls.partner_model.search([], limit=1) + cls.invoice_01 = cls.invoice_model.create( + { + "type": "out_invoice", + "partner_id": cls.partner_01.id, + "journal_id": cls.journal_01.id, + "fiscal_position_id": cls.fiscal_position_01.id, + "invoice_line_ids": [ + ( + 0, + None, + { + "name": "Invoice line 01", + "price_unit": 1, + "quantity": 1, + "account_id": cls.account_account_01.id, + }, + ) + ], + } + ) + + def test_01(self): + """ + Data: + - A draft invoice with a journal and a fiscal position + - The fiscal position has no allowed journal + Test case: + - Validate the invoice + Expected result: + - The invoice is validated + """ + self.assertEqual(self.invoice_01.state, "draft") + self.invoice_01.post() + self.assertEqual(self.invoice_01.state, "posted") + + def test_02(self): + """ + Data: + - A draft invoice with a journal and a fiscal position + - The fiscal position has an allowed journal, which is not + the one selected on the invoice + Test case: + - Validate the invoice + Expected result: + - UseError is raised + """ + self.fiscal_position_01.allowed_journal_ids = [(6, 0, self.journal_02.ids)] + self.assertEqual(self.invoice_01.state, "draft") + with self.assertRaises(UserError): + self.invoice_01.post() + self.assertEqual(self.invoice_01.state, "draft") + + def test_03(self): + """ + Data: + - A draft invoice with a journal and a fiscal position + - The fiscal position has an allowed journal, which is the one + selected on the invoice + Test case: + - Validate the invoice + Expected result: + - This invoice is validated + """ + self.fiscal_position_01.allowed_journal_ids = [(6, 0, self.journal_01.ids)] + self.assertEqual(self.invoice_01.state, "draft") + self.invoice_01.post() + self.assertEqual(self.invoice_01.state, "posted") + + def test_04(self): + """ + Data: + - A draft invoice with a journal and no fiscal position + - The fiscal position has an allowed journal, which is not the one + selected on the invoice + Test case: + - Set the fiscal position on the invoice, trigger the onchange + Expected result: + - The journal is replaced by the on on the fiscal position + """ + self.fiscal_position_01.allowed_journal_ids = [(6, 0, self.journal_02.ids)] + self.assertEqual(self.invoice_01.state, "draft") + self.assertNotIn( + self.invoice_01.journal_id, self.fiscal_position_01.allowed_journal_ids + ) + self.invoice_01._onchange_fiscal_position_allowed_journal() + self.assertEqual( + self.invoice_01.journal_id, self.fiscal_position_01.allowed_journal_ids[0] + ) diff --git a/account_fiscal_position_allowed_journal/views/account_fiscal_position.xml b/account_fiscal_position_allowed_journal/views/account_fiscal_position.xml new file mode 100644 index 000000000..37bf32f54 --- /dev/null +++ b/account_fiscal_position_allowed_journal/views/account_fiscal_position.xml @@ -0,0 +1,17 @@ + + + + + account.fiscal.position.form (in account_fiscal_position_allowed_journal) + account.fiscal.position + + + + + + + + diff --git a/setup/account_fiscal_position_allowed_journal/odoo/addons/account_fiscal_position_allowed_journal b/setup/account_fiscal_position_allowed_journal/odoo/addons/account_fiscal_position_allowed_journal new file mode 120000 index 000000000..45decc950 --- /dev/null +++ b/setup/account_fiscal_position_allowed_journal/odoo/addons/account_fiscal_position_allowed_journal @@ -0,0 +1 @@ +../../../../account_fiscal_position_allowed_journal \ No newline at end of file diff --git a/setup/account_fiscal_position_allowed_journal/setup.py b/setup/account_fiscal_position_allowed_journal/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/account_fiscal_position_allowed_journal/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)