From 3d06776f100582ccd02d55dae55d1a64f7f5913b Mon Sep 17 00:00:00 2001 From: David Date: Wed, 9 Nov 2022 09:44:31 +0100 Subject: [PATCH] [MIG] delivery_cttexpress: Migration to 15.0 TT39099 --- delivery_cttexpress/__manifest__.py | 2 +- .../i18n/delivery_cttexpress.pot | 10 +++------- delivery_cttexpress/i18n/es.po | 18 +++++++----------- delivery_cttexpress/models/delivery_carrier.py | 7 ++++--- .../tests/test_delivery_cttexpress.py | 2 +- requirements.txt | 2 ++ .../odoo/addons/delivery_cttexpress | 1 + setup/delivery_cttexpress/setup.py | 6 ++++++ 8 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 requirements.txt create mode 120000 setup/delivery_cttexpress/odoo/addons/delivery_cttexpress create mode 100644 setup/delivery_cttexpress/setup.py diff --git a/delivery_cttexpress/__manifest__.py b/delivery_cttexpress/__manifest__.py index 2896bf2947..9a41d02c44 100644 --- a/delivery_cttexpress/__manifest__.py +++ b/delivery_cttexpress/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Delivery CTT Express", "summary": "Delivery Carrier implementation for CTT Express API", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/delivery_cttexpress/i18n/delivery_cttexpress.pot b/delivery_cttexpress/i18n/delivery_cttexpress.pot index 84f4a6b841..20838b3320 100644 --- a/delivery_cttexpress/i18n/delivery_cttexpress.pot +++ b/delivery_cttexpress/i18n/delivery_cttexpress.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-11-08 10:01+0000\n" +"PO-Revision-Date: 2022-11-08 10:01+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -191,8 +193,6 @@ msgstr "" #. module: delivery_cttexpress #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_manifest_wizard__display_name #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_pickup_wizard__display_name -#: model:ir.model.fields,field_description:delivery_cttexpress.field_delivery_carrier__display_name -#: model:ir.model.fields,field_description:delivery_cttexpress.field_stock_picking__display_name msgid "Display Name" msgstr "" @@ -270,8 +270,6 @@ msgstr "" #. module: delivery_cttexpress #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_manifest_wizard__id #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_pickup_wizard__id -#: model:ir.model.fields,field_description:delivery_cttexpress.field_delivery_carrier__id -#: model:ir.model.fields,field_description:delivery_cttexpress.field_stock_picking__id msgid "ID" msgstr "" @@ -283,8 +281,6 @@ msgstr "" #. module: delivery_cttexpress #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_manifest_wizard____last_update #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_pickup_wizard____last_update -#: model:ir.model.fields,field_description:delivery_cttexpress.field_delivery_carrier____last_update -#: model:ir.model.fields,field_description:delivery_cttexpress.field_stock_picking____last_update msgid "Last Modified on" msgstr "" diff --git a/delivery_cttexpress/i18n/es.po b/delivery_cttexpress/i18n/es.po index 38e43774f8..edf839a748 100644 --- a/delivery_cttexpress/i18n/es.po +++ b/delivery_cttexpress/i18n/es.po @@ -4,18 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-08 10:02+0000\n" -"PO-Revision-Date: 2022-11-08 11:04+0100\n" +"POT-Creation-Date: 2022-11-09 09:48+0000\n" +"PO-Revision-Date: 2022-11-09 09:48+0000\n" "Last-Translator: \n" "Language-Team: \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"X-Generator: Poedit 3.1.1\n" #. module: delivery_cttexpress #: model:ir.model.fields.selection,name:delivery_cttexpress.selection__delivery_carrier__cttexpress_shipping_type__10h @@ -396,7 +394,7 @@ msgstr "Envío" #. module: delivery_cttexpress #: model:ir.model,name:delivery_cttexpress.model_delivery_carrier msgid "Shipping Methods" -msgstr "" +msgstr "Métodos de envío" #. module: delivery_cttexpress #: model:ir.model.fields,field_description:delivery_cttexpress.field_delivery_carrier__cttexpress_shipping_type @@ -434,11 +432,9 @@ msgstr "Comprobar conexión" #: code:addons/delivery_cttexpress/models/delivery_carrier.py:0 #, python-format msgid "" -"This CTT Express service (%s) isn't allowed for this account configuration. Please choose one of the followings\n" -"%s" +"This CTT Express service (%(service_name)s) isn't allowed for this account configuration. Please choose one of the followings\n" +"%(type_descriptions)s" msgstr "" -"Este servicio de CTT Express (%s) no está permitido para esta configuración de cuenta. Por favor, escoja uno de los siguientes\n" -"%s" #. module: delivery_cttexpress #: model:ir.model.fields,field_description:delivery_cttexpress.field_cttexpress_manifest_wizard__to_date diff --git a/delivery_cttexpress/models/delivery_carrier.py b/delivery_cttexpress/models/delivery_carrier.py index 5231f4580c..44b81b73e2 100644 --- a/delivery_cttexpress/models/delivery_carrier.py +++ b/delivery_cttexpress/models/delivery_carrier.py @@ -127,9 +127,10 @@ def _onchange_cttexpress_shipping_type(self): )[self.cttexpress_shipping_type] raise UserError( _( - "This CTT Express service (%s) isn't allowed for this account " - "configuration. Please choose one of the followings\n%s" - % (service_name, type_descriptions) + "This CTT Express service (%(service_name)s) isn't allowed for " + "this account configuration. Please choose one of the followings\n" + "%(type_descriptions)s", + (service_name, type_descriptions), ) ) diff --git a/delivery_cttexpress/tests/test_delivery_cttexpress.py b/delivery_cttexpress/tests/test_delivery_cttexpress.py index d41a7580d8..9618706ea3 100644 --- a/delivery_cttexpress/tests/test_delivery_cttexpress.py +++ b/delivery_cttexpress/tests/test_delivery_cttexpress.py @@ -4,7 +4,7 @@ from odoo.tests import Form, common -class TestDeliveryCTTExpress(common.SavepointCase): +class TestDeliveryCTTExpress(common.TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..a23257d63e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +zeep diff --git a/setup/delivery_cttexpress/odoo/addons/delivery_cttexpress b/setup/delivery_cttexpress/odoo/addons/delivery_cttexpress new file mode 120000 index 0000000000..9543622798 --- /dev/null +++ b/setup/delivery_cttexpress/odoo/addons/delivery_cttexpress @@ -0,0 +1 @@ +../../../../delivery_cttexpress \ No newline at end of file diff --git a/setup/delivery_cttexpress/setup.py b/setup/delivery_cttexpress/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/delivery_cttexpress/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)