From 1f80440e8dfec583d060227d55603158f1c790a7 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 24 May 2016 11:51:51 +0200 Subject: [PATCH 01/14] Remane import modules --- account_move_so_import/README.rst | 55 +++++++++++++++++ account_move_so_import/__init__.py | 4 ++ account_move_so_import/__openerp__.py | 22 +++++++ .../data/completion_rule_data.xml | 10 ++++ .../i18n/account_statement_so_completion.pot | 28 +++++++++ account_move_so_import/i18n/es.po | 33 +++++++++++ account_move_so_import/models/__init__.py | 4 ++ account_move_so_import/models/account_move.py | 50 ++++++++++++++++ .../test/completion_so_test.yml | 59 +++++++++++++++++++ 9 files changed, 265 insertions(+) create mode 100644 account_move_so_import/README.rst create mode 100644 account_move_so_import/__init__.py create mode 100644 account_move_so_import/__openerp__.py create mode 100644 account_move_so_import/data/completion_rule_data.xml create mode 100644 account_move_so_import/i18n/account_statement_so_completion.pot create mode 100644 account_move_so_import/i18n/es.po create mode 100644 account_move_so_import/models/__init__.py create mode 100644 account_move_so_import/models/account_move.py create mode 100644 account_move_so_import/test/completion_so_test.yml diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst new file mode 100644 index 00000000..f82d0ad1 --- /dev/null +++ b/account_move_so_import/README.rst @@ -0,0 +1,55 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +==================================== +Bank statement Sale Order completion +==================================== + +This module extends the functionality of account_statement_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. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/98/9.0 + +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. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Joël Grand-Guillaume +* Leonardo Pistone +* Matthieu Dietrich + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_move_so_import/__init__.py b/account_move_so_import/__init__.py new file mode 100644 index 00000000..f85f8bc3 --- /dev/null +++ b/account_move_so_import/__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 models diff --git a/account_move_so_import/__openerp__.py b/account_move_so_import/__openerp__.py new file mode 100644 index 00000000..55126b6b --- /dev/null +++ b/account_move_so_import/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +{ + 'name': "Bank statement Sale Order completion", + 'version': '9.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', + ], + 'test': [ + 'test/completion_so_test.yml'], + 'installable': True, + 'images': [], + '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_statement_so_completion.pot b/account_move_so_import/i18n/account_statement_so_completion.pot new file mode 100644 index 00000000..69bf8c28 --- /dev/null +++ b/account_move_so_import/i18n/account_statement_so_completion.pot @@ -0,0 +1,28 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_statement_so_completion +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-21 12:04+0000\n" +"PO-Revision-Date: 2014-01-21 12:04+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_statement_so_completion +#: code:addons/account_statement_so_completion/statement.py:77 +#, python-format +msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner while looking on SO by ref." +msgstr "" + +#. module: account_statement_so_completion +#: model:ir.model,name:account_statement_so_completion.model_account_statement_completion_rule +msgid "account.statement.completion.rule" +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..4ff0d2ad --- /dev/null +++ b/account_move_so_import/i18n/es.po @@ -0,0 +1,33 @@ +# 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: FULL NAME \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" +"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_statement_so_completion +#: code:addons/account_statement_so_completion/statement.py:77 +#, python-format +msgid "" +"Line named \"%s\" (Ref:%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_statement_so_completion +#: model:ir.model,name:account_statement_so_completion.model_account_statement_completion_rule +msgid "account.statement.completion.rule" +msgstr "account.statement.completion.rule" 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..c4317167 --- /dev/null +++ b/account_move_so_import/models/account_move.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import _, models +from openerp.addons.account_move_base_import.models.account_move \ + import ErrorTooManyPartner + + +class AccountMoveCompletionRule(models.Model): + + _name = "account.move.completion.rule" + _inherit = "account.move.completion.rule" + + def _get_functions(self): + res = super(AccountMoveCompletionRule, self)._get_functions() + res.append( + ('get_from_name_and_so', 'From line name (based on SO number)') + ) + return res + + # Should be private but data are initialised 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/test/completion_so_test.yml b/account_move_so_import/test/completion_so_test.yml new file mode 100644 index 00000000..e445b507 --- /dev/null +++ b/account_move_so_import/test/completion_so_test.yml @@ -0,0 +1,59 @@ +- + I import account minimal data +- + !python {model: account.invoice}: | + openerp.tools.convert_file(cr, + 'account', + openerp.modules.get_module_resource( + 'account', + 'test', + 'account_minimal_test.xml'), + {}, 'init', False, 'test') +- + In order to test the banking framework for Sale Orders, I first need to + create a profile +- + !record {model: account.journal, id: account.bank_journal}: + used_for_completion: True + rule_ids: + - account_statement_base_import.bank_statement_completion_rule_4 + - account_statement_base_import.bank_statement_completion_rule_5 + - account_statement_base_import.bank_statement_completion_rule_2 + - account_statement_base_import.bank_statement_completion_rule_3 + - bank_statement_completion_rule_1 +- + Now I create a statement. I create statment lines separately because I need + to find each one by XML id +- + !record {model: account.move, id: move_test_sale1}: + name: Statement for SO + journal_id: account.bank_journal + company_id: base.main_company +- + I create a move line for a SO +- + !record {model: account.move.line, id: move_line_so}: + name: SO007 + account_id: account.a_sale + move_id: move_test_sale1 + date_maturity: '2013-12-20' + credit: 0.0 +- + and add the correct name +- + !python {model: account.move.line}: | + context['check_move_validity'] = False + model.write(cr, uid, [ref('move_line_so')], + {'credit': 14981.0}, + context) +- + I run the auto complete +- + !python {model: account.move}: | + result = self.button_auto_completion(cr, uid, [ref("move_test_sale1")]) +- + Now I can check that all is nice and shiny, line 1. I expect the Sale Order + Number to be recognised. +- + !assert {model: account.move.line, id: move_line_so, string: Check completion by SO number}: + - partner_id.name == u'China Export' From 369703d1e30bc0db8dbb37d71597cb8d4bc2371e Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 24 May 2016 13:47:33 +0200 Subject: [PATCH 02/14] Rename last values --- account_move_so_import/i18n/es.po | 8 ++++---- account_move_so_import/models/account_move.py | 10 ++++------ account_move_so_import/test/completion_so_test.yml | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/account_move_so_import/i18n/es.po b/account_move_so_import/i18n/es.po index 4ff0d2ad..2e52cf6e 100644 --- a/account_move_so_import/i18n/es.po +++ b/account_move_so_import/i18n/es.po @@ -17,8 +17,8 @@ msgstr "" "X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" "X-Generator: Launchpad (build 17031)\n" -#. module: account_statement_so_completion -#: code:addons/account_statement_so_completion/statement.py:77 +#. module: account_move_so_import +#: code:addons/account_move_so_import/statement.py:77 #, python-format msgid "" "Line named \"%s\" (Ref:%s) was matched by more than one partner while " @@ -27,7 +27,7 @@ msgstr "" "La línea llamada \"%s\" (Ref: %s) se casó con más de una empresa al buscar " "por referencia de pedido." -#. module: account_statement_so_completion -#: model:ir.model,name:account_statement_so_completion.model_account_statement_completion_rule +#. module: account_move_so_import +#: model:ir.model,name:account_move_so_import.model_account_statement_completion_rule msgid "account.statement.completion.rule" msgstr "account.statement.completion.rule" diff --git a/account_move_so_import/models/account_move.py b/account_move_so_import/models/account_move.py index c4317167..4a86367f 100644 --- a/account_move_so_import/models/account_move.py +++ b/account_move_so_import/models/account_move.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import _, models +from openerp import _, fields, models from openerp.addons.account_move_base_import.models.account_move \ import ErrorTooManyPartner @@ -11,12 +11,10 @@ class AccountMoveCompletionRule(models.Model): _name = "account.move.completion.rule" _inherit = "account.move.completion.rule" - def _get_functions(self): - res = super(AccountMoveCompletionRule, self)._get_functions() - res.append( + function_to_call = fields.Selection( + selection_add=[ ('get_from_name_and_so', 'From line name (based on SO number)') - ) - return res + ]) # Should be private but data are initialised with no update XML def get_from_name_and_so(self, line): diff --git a/account_move_so_import/test/completion_so_test.yml b/account_move_so_import/test/completion_so_test.yml index e445b507..dea8601e 100644 --- a/account_move_so_import/test/completion_so_test.yml +++ b/account_move_so_import/test/completion_so_test.yml @@ -16,10 +16,10 @@ !record {model: account.journal, id: account.bank_journal}: used_for_completion: True rule_ids: - - account_statement_base_import.bank_statement_completion_rule_4 - - account_statement_base_import.bank_statement_completion_rule_5 - - account_statement_base_import.bank_statement_completion_rule_2 - - account_statement_base_import.bank_statement_completion_rule_3 + - account_move_base_import.bank_statement_completion_rule_4 + - account_move_base_import.bank_statement_completion_rule_5 + - account_move_base_import.bank_statement_completion_rule_2 + - account_move_base_import.bank_statement_completion_rule_3 - bank_statement_completion_rule_1 - Now I create a statement. I create statment lines separately because I need From 9bcfc5a790a5833c60c455243178997ee41cbf38 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Fri, 27 May 2016 09:59:45 +0200 Subject: [PATCH 03/14] Remove last mentions of statement --- account_move_so_import/README.rst | 8 ++++---- account_move_so_import/__openerp__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst index f82d0ad1..f9966f48 100644 --- a/account_move_so_import/README.rst +++ b/account_move_so_import/README.rst @@ -2,11 +2,11 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -==================================== -Bank statement Sale Order completion -==================================== +=================================== +Journal Entry Sale Order completion +=================================== -This module extends the functionality of account_statement_base_import +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/__openerp__.py b/account_move_so_import/__openerp__.py index 55126b6b..104f783d 100644 --- a/account_move_so_import/__openerp__.py +++ b/account_move_so_import/__openerp__.py @@ -2,7 +2,7 @@ # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) { - 'name': "Bank statement Sale Order completion", + 'name': "Journal Entry Sale Order completion", 'version': '9.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', From 1491aec18d1393d274d850e61364dde9fc4dd5be Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:48:11 +0200 Subject: [PATCH 04/14] [MIG] Make modules uninstallable --- account_move_so_import/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_so_import/__openerp__.py b/account_move_so_import/__openerp__.py index 104f783d..50761554 100644 --- a/account_move_so_import/__openerp__.py +++ b/account_move_so_import/__openerp__.py @@ -15,7 +15,7 @@ ], 'test': [ 'test/completion_so_test.yml'], - 'installable': True, + 'installable': False, 'images': [], 'auto_install': False, 'license': 'AGPL-3', From d820430a8c2c490e0c1a3ee517eda30c0cc2962c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:48:14 +0200 Subject: [PATCH 05/14] [MIG] Rename manifest files --- account_move_so_import/{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename account_move_so_import/{__openerp__.py => __manifest__.py} (100%) diff --git a/account_move_so_import/__openerp__.py b/account_move_so_import/__manifest__.py similarity index 100% rename from account_move_so_import/__openerp__.py rename to account_move_so_import/__manifest__.py From 0a40f8f1ec56fb93ac42c93bd7aa2073b62d5117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Fri, 15 Jun 2018 23:01:20 +0200 Subject: [PATCH 06/14] remove obsolete .pot files [ci skip] --- .../i18n/account_statement_so_completion.pot | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 account_move_so_import/i18n/account_statement_so_completion.pot diff --git a/account_move_so_import/i18n/account_statement_so_completion.pot b/account_move_so_import/i18n/account_statement_so_completion.pot deleted file mode 100644 index 69bf8c28..00000000 --- a/account_move_so_import/i18n/account_statement_so_completion.pot +++ /dev/null @@ -1,28 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_statement_so_completion -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-21 12:04+0000\n" -"PO-Revision-Date: 2014-01-21 12:04+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_statement_so_completion -#: code:addons/account_statement_so_completion/statement.py:77 -#, python-format -msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner while looking on SO by ref." -msgstr "" - -#. module: account_statement_so_completion -#: model:ir.model,name:account_statement_so_completion.model_account_statement_completion_rule -msgid "account.statement.completion.rule" -msgstr "" - From 74488c9b6a1469fee86687617ddad2cc1bbbe9b0 Mon Sep 17 00:00:00 2001 From: Iryna Vyshnevska Date: Wed, 10 Jul 2019 19:53:00 +0300 Subject: [PATCH 07/14] [12.0][MIG] account_move_so_import: migrate --- account_move_so_import/README.rst | 65 ++- account_move_so_import/__init__.py | 3 - account_move_so_import/__manifest__.py | 10 +- .../i18n/account_move_so_import.pot | 66 +++ account_move_so_import/i18n/es.po | 58 ++- account_move_so_import/models/account_move.py | 9 +- .../readme/CONTRIBUTORS.rst | 3 + account_move_so_import/readme/DESCRIPTION.rst | 4 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 424 ++++++++++++++++++ .../test/completion_so_test.yml | 59 --- account_move_so_import/tests/__init__.py | 1 + .../tests/test_completion_so.py | 70 +++ 13 files changed, 669 insertions(+), 103 deletions(-) create mode 100644 account_move_so_import/i18n/account_move_so_import.pot create mode 100644 account_move_so_import/readme/CONTRIBUTORS.rst create mode 100644 account_move_so_import/readme/DESCRIPTION.rst create mode 100644 account_move_so_import/static/description/icon.png create mode 100644 account_move_so_import/static/description/index.html delete mode 100644 account_move_so_import/test/completion_so_test.yml create mode 100644 account_move_so_import/tests/__init__.py create mode 100644 account_move_so_import/tests/test_completion_so.py diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst index f9966f48..24c93f6c 100644 --- a/account_move_so_import/README.rst +++ b/account_move_so_import/README.rst @@ -1,55 +1,78 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - =================================== 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. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/98/9.0 +**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. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Camptocamp Contributors ------------- +~~~~~~~~~~~~ * Joël Grand-Guillaume * Leonardo Pistone * Matthieu Dietrich -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - 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. -To contribute to this module, please visit https://odoo-community.org. +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 index f85f8bc3..0650744f 100644 --- a/account_move_so_import/__init__.py +++ b/account_move_so_import/__init__.py @@ -1,4 +1 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import models diff --git a/account_move_so_import/__manifest__.py b/account_move_so_import/__manifest__.py index 50761554..4c497083 100644 --- a/account_move_so_import/__manifest__.py +++ b/account_move_so_import/__manifest__.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA +# 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': '9.0.1.0.0', + 'version': '12.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', 'category': 'Finance', @@ -13,10 +12,7 @@ 'data': [ 'data/completion_rule_data.xml', ], - 'test': [ - 'test/completion_so_test.yml'], - 'installable': False, - 'images': [], + 'installable': True, 'auto_install': False, 'license': 'AGPL-3', } 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 index 2e52cf6e..32c193df 100644 --- a/account_move_so_import/i18n/es.po +++ b/account_move_so_import/i18n/es.po @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: banking-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \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" @@ -18,16 +19,57 @@ msgstr "" "X-Generator: Launchpad (build 17031)\n" #. module: account_move_so_import -#: code:addons/account_move_so_import/statement.py:77 -#, python-format +#: 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\" (Ref:%s) was matched by more than one partner while " -"looking on SO by ref." +"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 -#: model:ir.model,name:account_move_so_import.model_account_statement_completion_rule -msgid "account.statement.completion.rule" -msgstr "account.statement.completion.rule" +#: 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/account_move.py b/account_move_so_import/models/account_move.py index 4a86367f..4aea64b7 100644 --- a/account_move_so_import/models/account_move.py +++ b/account_move_so_import/models/account_move.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA +# Copyright 2011-2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import _, fields, models -from openerp.addons.account_move_base_import.models.account_move \ +from odoo import _, fields, models +from odoo.addons.account_move_base_import.models.account_move \ import ErrorTooManyPartner @@ -16,7 +15,7 @@ class AccountMoveCompletionRule(models.Model): ('get_from_name_and_so', 'From line name (based on SO number)') ]) - # Should be private but data are initialised with no update XML + # 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 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 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_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/test/completion_so_test.yml b/account_move_so_import/test/completion_so_test.yml deleted file mode 100644 index dea8601e..00000000 --- a/account_move_so_import/test/completion_so_test.yml +++ /dev/null @@ -1,59 +0,0 @@ -- - I import account minimal data -- - !python {model: account.invoice}: | - openerp.tools.convert_file(cr, - 'account', - openerp.modules.get_module_resource( - 'account', - 'test', - 'account_minimal_test.xml'), - {}, 'init', False, 'test') -- - In order to test the banking framework for Sale Orders, I first need to - create a profile -- - !record {model: account.journal, id: account.bank_journal}: - used_for_completion: True - rule_ids: - - account_move_base_import.bank_statement_completion_rule_4 - - account_move_base_import.bank_statement_completion_rule_5 - - account_move_base_import.bank_statement_completion_rule_2 - - account_move_base_import.bank_statement_completion_rule_3 - - bank_statement_completion_rule_1 -- - Now I create a statement. I create statment lines separately because I need - to find each one by XML id -- - !record {model: account.move, id: move_test_sale1}: - name: Statement for SO - journal_id: account.bank_journal - company_id: base.main_company -- - I create a move line for a SO -- - !record {model: account.move.line, id: move_line_so}: - name: SO007 - account_id: account.a_sale - move_id: move_test_sale1 - date_maturity: '2013-12-20' - credit: 0.0 -- - and add the correct name -- - !python {model: account.move.line}: | - context['check_move_validity'] = False - model.write(cr, uid, [ref('move_line_so')], - {'credit': 14981.0}, - context) -- - I run the auto complete -- - !python {model: account.move}: | - result = self.button_auto_completion(cr, uid, [ref("move_test_sale1")]) -- - Now I can check that all is nice and shiny, line 1. I expect the Sale Order - Number to be recognised. -- - !assert {model: account.move.line, id: move_line_so, string: Check completion by SO number}: - - partner_id.name == u'China Export' 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,) From f9de78e6e5d1c76dfd8869d7bb33dddf1df322f2 Mon Sep 17 00:00:00 2001 From: Bole Date: Thu, 5 Mar 2020 14:59:09 +0000 Subject: [PATCH 08/14] Added translation using Weblate (Croatian) --- account_move_so_import/i18n/hr.po | 67 +++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 account_move_so_import/i18n/hr.po diff --git a/account_move_so_import/i18n/hr.po b/account_move_so_import/i18n/hr.po new file mode 100644 index 00000000..847c3fac --- /dev/null +++ b/account_move_so_import/i18n/hr.po @@ -0,0 +1,67 @@ +# 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 +#: 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 "" From 2250957fd7584a44b50a93f6e0ba61ccd1b2fac2 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 11 May 2021 17:40:18 +0200 Subject: [PATCH 09/14] [IMP] account_move_so_import: black, isort, prettier --- account_move_so_import/__manifest__.py | 26 ++-- .../data/completion_rule_data.xml | 2 +- account_move_so_import/models/__init__.py | 1 - account_move_so_import/models/account_move.py | 24 ++-- .../tests/test_completion_so.py | 123 +++++++++++------- .../odoo/addons/account_move_so_import | 1 + setup/account_move_so_import/setup.py | 6 + 7 files changed, 108 insertions(+), 75 deletions(-) create mode 120000 setup/account_move_so_import/odoo/addons/account_move_so_import create mode 100644 setup/account_move_so_import/setup.py diff --git a/account_move_so_import/__manifest__.py b/account_move_so_import/__manifest__.py index 4c497083..d1bfd5b4 100644 --- a/account_move_so_import/__manifest__.py +++ b/account_move_so_import/__manifest__.py @@ -1,18 +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', + "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": "https://github.com/OCA/account-reconcile", + "data": [ + "data/completion_rule_data.xml", ], - 'installable': True, - 'auto_install': False, - 'license': 'AGPL-3', + "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 index 7ef4271c..a6701d89 100644 --- a/account_move_so_import/data/completion_rule_data.xml +++ b/account_move_so_import/data/completion_rule_data.xml @@ -1,4 +1,4 @@ - + diff --git a/account_move_so_import/models/__init__.py b/account_move_so_import/models/__init__.py index 8ac192f1..721ad319 100644 --- a/account_move_so_import/models/__init__.py +++ b/account_move_so_import/models/__init__.py @@ -1,4 +1,3 @@ -# -*- 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 index 4aea64b7..6e3d707a 100644 --- a/account_move_so_import/models/account_move.py +++ b/account_move_so_import/models/account_move.py @@ -1,8 +1,8 @@ # 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 + +from odoo.addons.account_move_base_import.models.account_move import ErrorTooManyPartner class AccountMoveCompletionRule(models.Model): @@ -11,9 +11,8 @@ class AccountMoveCompletionRule(models.Model): _inherit = "account.move.completion.rule" function_to_call = fields.Selection( - selection_add=[ - ('get_from_name_and_so', 'From line name (based on SO number)') - ]) + 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): @@ -35,13 +34,16 @@ class AccountMoveCompletionRule(models.Model): ...} """ res = {} - so_obj = self.env['sale.order'] - orders = so_obj.search([('name', '=', line.name)]) + 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) + _( + '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 + res["partner_id"] = orders[0].partner_id.id return res diff --git a/account_move_so_import/tests/test_completion_so.py b/account_move_so_import/tests/test_completion_so.py index 40b614ec..7b3b3053 100644 --- a/account_move_so_import/tests/test_completion_so.py +++ b/account_move_so_import/tests/test_completion_so.py @@ -5,66 +5,91 @@ 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.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, ) - 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( + 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, + "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, } ) - 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,) + self.assertEqual( + self.move.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, +) From 64c9ecf7504122cf69b878a8ebdc97908eaa970a Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 11 May 2021 17:40:18 +0200 Subject: [PATCH 10/14] [MIG] account_move_so_import: Migration to 14.0 --- account_move_so_import/README.rst | 10 ++--- account_move_so_import/__manifest__.py | 2 +- .../static/description/index.html | 8 ++-- .../tests/test_completion_so.py | 40 +++++++++++++------ 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst index 24c93f6c..0fd83832 100644 --- a/account_move_so_import/README.rst +++ b/account_move_so_import/README.rst @@ -14,13 +14,13 @@ Journal Entry Sale Order completion :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 + :target: https://github.com/OCA/account-reconcile/tree/14.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 + :target: https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-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 + :target: https://runbot.odoo-community.org/runbot/98/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -73,6 +73,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/account-reconcile `_ project on GitHub. +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/__manifest__.py b/account_move_so_import/__manifest__.py index d1bfd5b4..24ab6b89 100644 --- a/account_move_so_import/__manifest__.py +++ b/account_move_so_import/__manifest__.py @@ -2,7 +2,7 @@ # 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", + "version": "14.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "maintainer": "Camptocamp", "category": "Finance", diff --git a/account_move_so_import/static/description/index.html b/account_move_so_import/static/description/index.html index 015d2f5f..1ccd04a3 100644 --- a/account_move_so_import/static/description/index.html +++ b/account_move_so_import/static/description/index.html @@ -3,7 +3,7 @@ - + Journal Entry Sale Order completion