diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst new file mode 100644 index 00000000..dc7e94bf --- /dev/null +++ b/account_move_so_import/README.rst @@ -0,0 +1,81 @@ +=================================== +Journal Entry Sale Order completion +=================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b908437dbdf6d9e1284ff6d521333a844e99a805f1b28925f28c6d5398ac77df + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/16.0/account_move_so_import + :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-16-0/account-reconcile-16-0-account_move_so_import + :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=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of account_move_base_import +to add support for completion rules based on Sale Orders. This was initially +part of the module account_statement_base_completion, but is now separate to +keep dependencies separate. + +**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 +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Joël Grand-Guillaume +* Leonardo Pistone +* Matthieu Dietrich + +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/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_move_so_import/__init__.py b/account_move_so_import/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_move_so_import/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_move_so_import/__manifest__.py b/account_move_so_import/__manifest__.py new file mode 100644 index 00000000..e6b9a017 --- /dev/null +++ b/account_move_so_import/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2011-2019 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +{ + "name": "Journal Entry Sale Order completion", + "version": "16.0.1.0.0", + "author": "Camptocamp,Odoo Community Association (OCA)", + "maintainer": "Camptocamp", + "category": "Finance", + "complexity": "easy", + "depends": ["account_move_base_import", "sale"], + "website": "https://github.com/OCA/account-reconcile", + "data": [ + "data/completion_rule_data.xml", + ], + "installable": True, + "auto_install": False, + "license": "AGPL-3", +} diff --git a/account_move_so_import/data/completion_rule_data.xml b/account_move_so_import/data/completion_rule_data.xml new file mode 100644 index 00000000..3065ffc9 --- /dev/null +++ b/account_move_so_import/data/completion_rule_data.xml @@ -0,0 +1,16 @@ + + + + + Match from line name (based on SO number) + 50 + get_from_name_and_so + + + + Match from line name (based on SO payment reference) + 55 + get_from_name_and_so_payment_ref + + + diff --git a/account_move_so_import/i18n/account_move_so_import.pot b/account_move_so_import/i18n/account_move_so_import.pot new file mode 100644 index 00000000..fc5b20a3 --- /dev/null +++ b/account_move_so_import/i18n/account_move_so_import.pot @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_so_import +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \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_move_so_import +#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so +msgid "From line name (based on SO number)" +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref +msgid "From line name (based on SO payment ref)" +msgstr "" + +#. module: account_move_so_import +#. odoo-python +#: code:addons/account_move_so_import/models/account_move.py:0 +#, python-format +msgid "" +"Line named \"%s\" was matched by more than one partner while looking on SO " +"by ref." +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" diff --git a/account_move_so_import/i18n/es.po b/account_move_so_import/i18n/es.po new file mode 100644 index 00000000..93f1b3c8 --- /dev/null +++ b/account_move_so_import/i18n/es.po @@ -0,0 +1,49 @@ +# Spanish translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-21 12:04+0000\n" +"PO-Revision-Date: 2014-06-05 22:41+0000\n" +"Last-Translator: Pedro Manuel Baeza \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" +"X-Generator: Launchpad (build 17031)\n" + +#. module: account_move_so_import +#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule +#, fuzzy +msgid "Account move completion method" +msgstr "account.statement.completion.rule" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so +msgid "From line name (based on SO number)" +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref +msgid "From line name (based on SO payment ref)" +msgstr "" + +#. module: account_move_so_import +#. odoo-python +#: code:addons/account_move_so_import/models/account_move.py:0 +#, python-format +msgid "" +"Line named \"%s\" was matched by more than one partner while looking on SO " +"by ref." +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" diff --git a/account_move_so_import/i18n/hr.po b/account_move_so_import/i18n/hr.po new file mode 100644 index 00000000..a46602e7 --- /dev/null +++ b/account_move_so_import/i18n/hr.po @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_so_import +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: account_move_so_import +#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so +msgid "From line name (based on SO number)" +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref +msgid "From line name (based on SO payment ref)" +msgstr "" + +#. module: account_move_so_import +#. odoo-python +#: code:addons/account_move_so_import/models/account_move.py:0 +#, python-format +msgid "" +"Line named \"%s\" was matched by more than one partner while looking on SO " +"by ref." +msgstr "" + +#. module: account_move_so_import +#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" diff --git a/account_move_so_import/models/__init__.py b/account_move_so_import/models/__init__.py new file mode 100644 index 00000000..721ad319 --- /dev/null +++ b/account_move_so_import/models/__init__.py @@ -0,0 +1,3 @@ +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import account_move diff --git a/account_move_so_import/models/account_move.py b/account_move_so_import/models/account_move.py new file mode 100644 index 00000000..7d1e3ee1 --- /dev/null +++ b/account_move_so_import/models/account_move.py @@ -0,0 +1,74 @@ +# Copyright 2011-2019 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from odoo import _, fields, models + +from odoo.addons.account_move_base_import.models.account_move import ErrorTooManyPartner + + +class AccountMoveCompletionRule(models.Model): + + _name = "account.move.completion.rule" + _inherit = "account.move.completion.rule" + + function_to_call = fields.Selection( + selection_add=[ + ("get_from_name_and_so", "From line name (based on SO number)"), + ( + "get_from_name_and_so_payment_ref", + "From line name (based on SO payment ref)", + ), + ] + ) + + # Should be private but data are initialized with no update XML + def get_from_name_and_so(self, line): + """ + Match the partner based on the SO number and the reference of the + statement line. Then, call the generic get_values_for_line method to + complete other values. If more than one partner matched, raise the + ErrorTooManyPartner error. + + :param int/long st_line: read of the concerned + account.bank.statement.line + + :return: + A dict of value that can be passed directly to the write method of + the statement line or {} + {'partner_id': value, + 'account_id': value, + + ...} + """ + return self._get_from_name_and_so_generic(line, "name") + + # Should be private but data are initialized with no update XML + def get_from_name_and_so_payment_ref(self, line): + """ + :param int/long st_line: read of the concerned + account.bank.statement.line + + :return: + A dict of value that can be passed directly to the write method of + the statement line or {} + {'partner_id': value, + 'account_id': value, + + ...} + """ + return self._get_from_name_and_so_generic(line, "reference") + + def _get_from_name_and_so_generic(self, line, search_by): + res = {} + so_obj = self.env["sale.order"] + orders = so_obj.search([(search_by, "=", line.name)]) + if len(orders) > 1: + raise ErrorTooManyPartner( + _( + 'Line named "%s" was matched by more ' + "than one partner while looking on SO by ref." + ) + % line.name + ) + if len(orders) == 1: + res["partner_id"] = orders[0].partner_id.id + return res diff --git a/account_move_so_import/readme/CONTRIBUTORS.rst b/account_move_so_import/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..e7ea973f --- /dev/null +++ b/account_move_so_import/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Joël Grand-Guillaume +* Leonardo Pistone +* Matthieu Dietrich diff --git a/account_move_so_import/readme/DESCRIPTION.rst b/account_move_so_import/readme/DESCRIPTION.rst new file mode 100644 index 00000000..5194c014 --- /dev/null +++ b/account_move_so_import/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +This module extends the functionality of account_move_base_import +to add support for completion rules based on Sale Orders. This was initially +part of the module account_statement_base_completion, but is now separate to +keep dependencies separate. diff --git a/account_move_so_import/static/description/icon.png b/account_move_so_import/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/account_move_so_import/static/description/icon.png differ diff --git a/account_move_so_import/static/description/index.html b/account_move_so_import/static/description/index.html new file mode 100644 index 00000000..9f45017f --- /dev/null +++ b/account_move_so_import/static/description/index.html @@ -0,0 +1,426 @@ + + + + + + +Journal Entry Sale Order completion + + + +
+

Journal Entry Sale Order completion

+ + +

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

+

This module extends the functionality of account_move_base_import +to add support for completion rules based on Sale Orders. This was initially +part of the module account_statement_base_completion, but is now separate to +keep dependencies separate.

+

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.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

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.

+

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_move_so_import/tests/__init__.py b/account_move_so_import/tests/__init__.py new file mode 100644 index 00000000..ec88ebe3 --- /dev/null +++ b/account_move_so_import/tests/__init__.py @@ -0,0 +1 @@ +from . import test_completion_so diff --git a/account_move_so_import/tests/test_completion_so.py b/account_move_so_import/tests/test_completion_so.py new file mode 100644 index 00000000..42fbe2a8 --- /dev/null +++ b/account_move_so_import/tests/test_completion_so.py @@ -0,0 +1,128 @@ +# Copyright 2011-2019 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from odoo.tests.common import TransactionCase + + +class TestCompliteSO(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + + cls.partner = cls.env.ref("base.res_partner_1") + p = cls.env.ref("product.product_product_6") + cls.order = cls.env["sale.order"].create( + { + "name": "Test order", + "partner_id": cls.partner.id, + "reference": "test payment ref", + "order_line": [ + ( + 0, + 0, + { + "name": "Test autocomplet", + "product_id": p.id, + "product_uom_qty": 2, + "qty_to_invoice": 2, + "qty_delivered": 2, + "product_uom": p.uom_id.id, + "price_unit": p.list_price, + }, + ) + ], + } + ) + rule_ids = cls.env.ref( + "account_move_base_import." "bank_statement_completion_rule_5" + ) + rule_ids += cls.env.ref( + "account_move_base_import." "bank_statement_completion_rule_4" + ) + rule_ids += cls.env.ref( + "account_move_base_import." "bank_statement_completion_rule_3" + ) + rule_ids += cls.env.ref( + "account_move_base_import." "bank_statement_completion_rule_2" + ) + rule_ids += cls.env.ref( + "account_move_so_import." "bank_statement_completion_rule_1" + ) + rule_ids += cls.env.ref( + "account_move_so_import." "bank_statement_completion_rule_2" + ) + # create journal with profile + cls.journal = cls.env["account.journal"].create( + { + "name": "Company Bank journal", + "type": "bank", + "code": "BNKFB", + "rule_ids": [(4, comp_rule.id, False) for comp_rule in rule_ids], + "used_for_completion": True, + } + ) + cls.move = cls.env["account.move"].create( + {"name": "Test move", "journal_id": cls.journal.id} + ) + cls.account_payable = cls.env["account.account"].search( + [("account_type", "=", "liability_payable")], limit=1 + ) + cls.account_bank = cls.env["account.account"].search( + [("account_type", "=", "asset_cash")], limit=1 + ) + cls.order.action_confirm() + + def test_completion_so_name(self): + self.env["account.move.line"].create( + [ + { + "name": self.order.name, + "account_id": self.account_payable.id, + "move_id": self.move.id, + "credit": 1, + }, + { + "name": "counter part", + "account_id": self.account_bank.id, + "move_id": self.move.id, + "debit": 1, + }, + ] + ) + payable_aml = self.move.line_ids.filtered( + lambda line: line.account_id == self.account_payable + ) + self.assertFalse(self.move.partner_id) + self.move.button_auto_completion() + self.assertEqual( + payable_aml.partner_id, + self.partner, + ) + + def test_completion_so_payment_ref(self): + self.env["account.move.line"].create( + [ + { + "name": self.order.reference, + "account_id": self.account_payable.id, + "move_id": self.move.id, + "credit": 1, + }, + { + "name": "counter part", + "account_id": self.account_bank.id, + "move_id": self.move.id, + "debit": 1, + }, + ] + ) + payable_aml = self.move.line_ids.filtered( + lambda line: line.account_id == self.account_payable + ) + self.assertFalse(self.move.partner_id) + self.move.button_auto_completion() + self.assertEqual( + payable_aml.partner_id, + self.partner, + ) diff --git a/setup/account_move_so_import/odoo/addons/account_move_so_import b/setup/account_move_so_import/odoo/addons/account_move_so_import new file mode 120000 index 00000000..f4c4cd20 --- /dev/null +++ b/setup/account_move_so_import/odoo/addons/account_move_so_import @@ -0,0 +1 @@ +../../../../account_move_so_import \ No newline at end of file diff --git a/setup/account_move_so_import/setup.py b/setup/account_move_so_import/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_move_so_import/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)