diff --git a/account_move_base_import/i18n/account_move_base_import.pot b/account_move_base_import/i18n/account_move_base_import.pot index 7217c8d0..891d451e 100644 --- a/account_move_base_import/i18n/account_move_base_import.pot +++ b/account_move_base_import/i18n/account_move_base_import.pot @@ -178,6 +178,11 @@ msgstr "" msgid "File Name" msgstr "" +#. module: account_move_base_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on SO number)" +msgstr "" + #. module: account_move_base_import #: selection:account.move.completion.rule,function_to_call:0 msgid "From line name (based on customer invoice number)" diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst new file mode 100644 index 00000000..24c93f6c --- /dev/null +++ b/account_move_so_import/README.rst @@ -0,0 +1,78 @@ +=================================== +Journal Entry Sale Order completion +=================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/12.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-12-0/account-reconcile-12-0-account_move_so_import + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/98/12.0 + :alt: Try me on Runbot + +|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 smashing 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..4c497083 --- /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': '12.0.1.0.0', + 'author': "Camptocamp,Odoo Community Association (OCA)", + 'maintainer': 'Camptocamp', + 'category': 'Finance', + 'complexity': 'easy', + 'depends': ['account_move_base_import', 'sale'], + 'website': 'http://www.camptocamp.com', + '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..7ef4271c --- /dev/null +++ b/account_move_so_import/data/completion_rule_data.xml @@ -0,0 +1,10 @@ + + + + + Match from line name (based on SO number) + 50 + get_from_name_and_so + + + 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..9b7fe79e --- /dev/null +++ b/account_move_so_import/i18n/account_move_so_import.pot @@ -0,0 +1,66 @@ +# 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: <>\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 +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on SO number)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_so_import +#: code:addons/account_move_so_import/models/account_move.py:42 +#, 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 +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +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..32c193df --- /dev/null +++ b/account_move_so_import/i18n/es.po @@ -0,0 +1,75 @@ +# 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 +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on SO number)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_so_import +#: code:addons/account_move_so_import/models/account_move.py:42 +#, fuzzy, python-format +msgid "" +"Line named \"%s\" was matched by more than one partner while looking on SO " +"by ref." +msgstr "" +"La línea llamada \"%s\" (Ref: %s) se casó con más de una empresa al buscar " +"por referencia de pedido." + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_so_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +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..8ac192f1 --- /dev/null +++ b/account_move_so_import/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 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..4aea64b7 --- /dev/null +++ b/account_move_so_import/models/account_move.py @@ -0,0 +1,47 @@ +# 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)') + ]) + + # 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, + + ...} + """ + res = {} + so_obj = self.env['sale.order'] + orders = so_obj.search([('name', '=', 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..015d2f5f --- /dev/null +++ b/account_move_so_import/static/description/index.html @@ -0,0 +1,424 @@ + + + + + + +Journal Entry Sale Order completion + + + +
+

Journal Entry Sale Order completion

+ + +

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

+

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 smashing 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..40b614ec --- /dev/null +++ b/account_move_so_import/tests/test_completion_so.py @@ -0,0 +1,70 @@ +# Copyright 2011-2019 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from odoo.tests.common import SavepointCase + + +class TestCompliteSO(SavepointCase): + + @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, + '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') + # 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([ + ('user_type_id', '=', + cls.env.ref('account.data_account_type_payable').id), + ], limit=1) + + def test_completion_so(self): + self.order.action_confirm() + aml = self.env['account.move.line'].create( + { + 'name': self.order.name, + 'account_id': self.account_payable.id, + 'move_id': self.move.id, + 'credit': 0.0, + } + ) + aml.with_context(check_move_validity=False).write({ + 'credit': 1, + }) + self.assertFalse(self.move.partner_id) + self.move.button_auto_completion() + self.assertEqual(self.move.partner_id, self.partner,) diff --git a/account_move_transactionid_import/i18n/account_move_transactionid_import.pot b/account_move_transactionid_import/i18n/account_move_transactionid_import.pot index 4809bbd2..179eae6c 100644 --- a/account_move_transactionid_import/i18n/account_move_transactionid_import.pot +++ b/account_move_transactionid_import/i18n/account_move_transactionid_import.pot @@ -23,6 +23,11 @@ msgstr "" msgid "Choose here the method by which you want to import account moves for this journal." msgstr "" +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on SO number)" +msgstr "" + #. module: account_move_transactionid_import #: selection:account.move.completion.rule,function_to_call:0 msgid "From line name (based on customer invoice number)" diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index ae984d1d..20513549 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -12.0.20190813.1 \ No newline at end of file +12.0.20190813.2 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index d7f05599..e7fd8244 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -12,6 +12,7 @@ setuptools.setup( 'odoo12-addon-account_mass_reconcile', 'odoo12-addon-account_move_base_import', 'odoo12-addon-account_move_reconcile_helper', + 'odoo12-addon-account_move_so_import', 'odoo12-addon-account_move_transactionid_import', 'odoo12-addon-account_partner_reconcile', 'odoo12-addon-account_reconcile_restrict_partner_mismatch', 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, +)