diff --git a/account_move_so_import/README.rst b/account_move_so_import/README.rst index 6d35626b..dc7e94bf 100644 --- a/account_move_so_import/README.rst +++ b/account_move_so_import/README.rst @@ -7,7 +7,7 @@ Journal Entry Sale Order completion !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:b21e36a4103c74dd0b68e98cac8cf4584f950238f81db6b10e05eeb556acc8c5 + !! source digest: sha256:b908437dbdf6d9e1284ff6d521333a844e99a805f1b28925f28c6d5398ac77df !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_move_so_import/__manifest__.py b/account_move_so_import/__manifest__.py index 24ab6b89..e6b9a017 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": "14.0.1.0.0", + "version": "16.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "maintainer": "Camptocamp", "category": "Finance", diff --git a/account_move_so_import/i18n/account_move_so_import.pot b/account_move_so_import/i18n/account_move_so_import.pot index 9b7fe79e..fc5b20a3 100644 --- a/account_move_so_import/i18n/account_move_so_import.pot +++ b/account_move_so_import/i18n/account_move_so_import.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_move_so_import +# * account_move_so_import # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,48 +19,25 @@ msgid "Account move completion method" msgstr "" #. module: account_move_so_import -#: selection:account.move.completion.rule,function_to_call:0 +#: 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 -#: selection:account.move.completion.rule,function_to_call:0 -msgid "From line name (based on customer invoice number)" +#: 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 -#: 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 +#. 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 -#: 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" +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 index 32c193df..93f1b3c8 100644 --- a/account_move_so_import/i18n/es.po +++ b/account_move_so_import/i18n/es.po @@ -25,49 +25,23 @@ msgid "Account move completion method" msgstr "account.statement.completion.rule" #. module: account_move_so_import -#: selection:account.move.completion.rule,function_to_call:0 +#: 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 -#: selection:account.move.completion.rule,function_to_call:0 -msgid "From line name (based on customer invoice number)" +#: 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 -#: 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 +#. 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 " +"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 diff --git a/account_move_so_import/i18n/hr.po b/account_move_so_import/i18n/hr.po index 847c3fac..a46602e7 100644 --- a/account_move_so_import/i18n/hr.po +++ b/account_move_so_import/i18n/hr.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_move_so_import +# * account_move_so_import # msgid "" msgstr "" @@ -12,8 +12,8 @@ msgstr "" "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" +"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 @@ -21,44 +21,22 @@ msgid "Account move completion method" msgstr "" #. module: account_move_so_import -#: selection:account.move.completion.rule,function_to_call:0 +#: 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 -#: selection:account.move.completion.rule,function_to_call:0 -msgid "From line name (based on customer invoice number)" +#: 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 -#: 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 +#. 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 -#: 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" +msgid "" +"Line named \"%s\" was matched by more than one partner while looking on SO " +"by ref." msgstr "" #. module: account_move_so_import diff --git a/account_move_so_import/static/description/index.html b/account_move_so_import/static/description/index.html index cb17f528..9f45017f 100644 --- a/account_move_so_import/static/description/index.html +++ b/account_move_so_import/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:b21e36a4103c74dd0b68e98cac8cf4584f950238f81db6b10e05eeb556acc8c5 +!! source digest: sha256:b908437dbdf6d9e1284ff6d521333a844e99a805f1b28925f28c6d5398ac77df !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module extends the functionality of account_move_base_import diff --git a/account_move_so_import/tests/test_completion_so.py b/account_move_so_import/tests/test_completion_so.py index e7dcfa10..42fbe2a8 100644 --- a/account_move_so_import/tests/test_completion_so.py +++ b/account_move_so_import/tests/test_completion_so.py @@ -1,10 +1,10 @@ # Copyright 2011-2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from odoo.tests.common import SavepointCase +from odoo.tests.common import TransactionCase -class TestCompliteSO(SavepointCase): +class TestCompliteSO(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -66,24 +66,10 @@ class TestCompliteSO(SavepointCase): {"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, + [("account_type", "=", "liability_payable")], limit=1 ) cls.account_bank = cls.env["account.account"].search( - [ - ( - "user_type_id", - "=", - cls.env.ref("account.data_account_type_liquidity").id, - ), - ], - limit=1, + [("account_type", "=", "asset_cash")], limit=1 ) cls.order.action_confirm()