From 56aacde0d217ef324c88ba9680770dd967db1995 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 01/12] Add `delivery_partner`, `delivery_partner_dhl`, `delivery_partner_fedex`, `delivery_partner_ups` --- delivery_partner_dhl/__init__.py | 1 + delivery_partner_dhl/__manifest__.py | 18 ++++++++++++++++++ delivery_partner_dhl/models/__init__.py | 1 + delivery_partner_dhl/models/delivery.py | 17 +++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 delivery_partner_dhl/__init__.py create mode 100755 delivery_partner_dhl/__manifest__.py create mode 100644 delivery_partner_dhl/models/__init__.py create mode 100644 delivery_partner_dhl/models/delivery.py diff --git a/delivery_partner_dhl/__init__.py b/delivery_partner_dhl/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/delivery_partner_dhl/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py new file mode 100755 index 00000000..babeee2c --- /dev/null +++ b/delivery_partner_dhl/__manifest__.py @@ -0,0 +1,18 @@ +{ + 'name': 'DHL Partner Shipping Accounts', + 'author': 'Hibou Corp. ', + 'version': '11.0.1.0.0', + 'category': 'Stock', + 'sequence': 95, + 'summary': 'Fedex Partner Shipping Accounts', + 'description': """ + """, + 'website': 'https://hibou.io/', + 'depends': [ + 'delivery_partner', + ], + 'data': [ + ], + 'installable': True, + 'application': False, +} diff --git a/delivery_partner_dhl/models/__init__.py b/delivery_partner_dhl/models/__init__.py new file mode 100644 index 00000000..be8cabd6 --- /dev/null +++ b/delivery_partner_dhl/models/__init__.py @@ -0,0 +1 @@ +from . import delivery diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py new file mode 100644 index 00000000..ceb51651 --- /dev/null +++ b/delivery_partner_dhl/models/delivery.py @@ -0,0 +1,17 @@ +import re + +from odoo import fields, models +from odoo.exceptions import ValidationError + + +class PartnerShippingAccount(models.Model): + _inherit = 'partner.shipping.account' + + delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')]) + + def dhl_check_validity(self): + m = re.search('^\d{10}$', self.name or '') + if not m: + raise ValidationError('DHL Account numbers must be 10 decimal numbers.') + + From ed4b0ca7c1fb9e52a9080c341049ad7562ea889d Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Mon, 23 Apr 2018 13:54:24 -0700 Subject: [PATCH 02/12] Update summary --- delivery_partner_dhl/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index babeee2c..26f40db0 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -4,7 +4,7 @@ 'version': '11.0.1.0.0', 'category': 'Stock', 'sequence': 95, - 'summary': 'Fedex Partner Shipping Accounts', + 'summary': 'DHL Partner Shipping Accounts', 'description': """ """, 'website': 'https://hibou.io/', From c5c8d8308be1604046c22220ef222b2cf99f6557 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:53:38 -0700 Subject: [PATCH 03/12] Add README. --- delivery_partner_dhl/README.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 delivery_partner_dhl/README.rst diff --git a/delivery_partner_dhl/README.rst b/delivery_partner_dhl/README.rst new file mode 100644 index 00000000..84830e5b --- /dev/null +++ b/delivery_partner_dhl/README.rst @@ -0,0 +1,23 @@ +************************************* +Hibou - DHL Partner Shipping Accounts +************************************* + +Adds DHL shipping accounts. + +For more information and add-ons, visit `Hibou.io `_. + + +============= +Main Features +============= + +* Adds DHL to the delivery type selection field. +* Validates entered DHL account numbers are the correct length. + +======= +License +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2018 From 93953ac4519fe10f20eeb855691d5408028a494d Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:22:57 -0700 Subject: [PATCH 04/12] Add screenshot. --- delivery_partner_dhl/README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/delivery_partner_dhl/README.rst b/delivery_partner_dhl/README.rst index 84830e5b..7d08930e 100644 --- a/delivery_partner_dhl/README.rst +++ b/delivery_partner_dhl/README.rst @@ -14,6 +14,11 @@ Main Features * Adds DHL to the delivery type selection field. * Validates entered DHL account numbers are the correct length. +.. image:: https://user-images.githubusercontent.com/15882954/41176760-825c6802-6b16-11e8-91b6-188b32146626.png + :alt: 'Register Payment Detail' + :width: 988 + :align: left + ======= License ======= From cc4a00d86f43a2b3dac48ef1e4575b93c9b69b0f Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 2 Apr 2019 10:38:19 -0700 Subject: [PATCH 05/12] MIG `delivery_partner_dhl` to 12.0 --- delivery_partner_dhl/__manifest__.py | 2 +- delivery_partner_dhl/models/delivery.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index 26f40db0..439d5e5a 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'DHL Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'DHL Partner Shipping Accounts', diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py index ceb51651..db975f51 100644 --- a/delivery_partner_dhl/models/delivery.py +++ b/delivery_partner_dhl/models/delivery.py @@ -10,7 +10,7 @@ class PartnerShippingAccount(models.Model): delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')]) def dhl_check_validity(self): - m = re.search('^\d{10}$', self.name or '') + m = re.search(r'^\d{10}$', self.name or '') if not m: raise ValidationError('DHL Account numbers must be 10 decimal numbers.') From 8e16dc4c36f4d1310567a9413ebc8df8dd419e75 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 25 Jul 2019 15:14:33 -0700 Subject: [PATCH 06/12] IMP `delivery_partner_dhl` Allow 8-10 digit account numbers. --- delivery_partner_dhl/models/delivery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py index db975f51..6de6583a 100644 --- a/delivery_partner_dhl/models/delivery.py +++ b/delivery_partner_dhl/models/delivery.py @@ -10,8 +10,8 @@ class PartnerShippingAccount(models.Model): delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')]) def dhl_check_validity(self): - m = re.search(r'^\d{10}$', self.name or '') + m = re.search(r'^(\d{8}|\d{9}|\d{10})$', self.name or '') if not m: - raise ValidationError('DHL Account numbers must be 10 decimal numbers.') + raise ValidationError('DHL Account numbers must be 8-10 decimal numbers.') From 8ef04297bbe5822bbbd9d733e5015e4d6dc00985 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 17:45:34 -0500 Subject: [PATCH 07/12] [MIG] delivery_partner_dhl: to Odoo 13.0 --- delivery_partner_dhl/__manifest__.py | 2 +- delivery_partner_dhl/tests/__init__.py | 1 + .../tests/test_dhl_account.py | 38 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 delivery_partner_dhl/tests/__init__.py create mode 100644 delivery_partner_dhl/tests/test_dhl_account.py diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index 439d5e5a..5d199717 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'DHL Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'DHL Partner Shipping Accounts', diff --git a/delivery_partner_dhl/tests/__init__.py b/delivery_partner_dhl/tests/__init__.py new file mode 100644 index 00000000..f1d64673 --- /dev/null +++ b/delivery_partner_dhl/tests/__init__.py @@ -0,0 +1 @@ +from . import test_dhl_account diff --git a/delivery_partner_dhl/tests/test_dhl_account.py b/delivery_partner_dhl/tests/test_dhl_account.py new file mode 100644 index 00000000..d60b367c --- /dev/null +++ b/delivery_partner_dhl/tests/test_dhl_account.py @@ -0,0 +1,38 @@ +from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError + + +class TestAccount(TransactionCase): + + def setUp(self): + super(TestAccount, self).setUp() + self.PartnerShippingAccount = self.env['partner.shipping.account'] + self.partner = self.env.ref('base.res_partner_12') + + def test_dhl_account_information(self): + # Create object and confirm + with self.assertRaises(ValidationError): + wrong_account_number = self.PartnerShippingAccount.create({ + 'name': '1234567', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'dhl', + 'note': 'This is a note' + }) + + with self.assertRaises(ValidationError): + no_account_number = self.PartnerShippingAccount.create({ + 'name': '', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'dhl', + 'note': 'This is a note' + }) + + _ = self.PartnerShippingAccount.create({ + 'name': '123456789', + 'description': 'Success', + 'partner_id': self.partner.id, + 'delivery_type': 'dhl', + 'note': 'This is a note' + }) From 8cd51d66642167963726b0b1c923be63af18b2de Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Mon, 9 Nov 2020 09:38:10 -0500 Subject: [PATCH 08/12] [MIG] delivery_partner_dhl: migrate to odoo 14.0 --- delivery_partner_dhl/__manifest__.py | 2 +- delivery_partner_dhl/models/delivery.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index 5d199717..cd5ca2f4 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'DHL Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'DHL Partner Shipping Accounts', diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py index 6de6583a..d4e82ea1 100644 --- a/delivery_partner_dhl/models/delivery.py +++ b/delivery_partner_dhl/models/delivery.py @@ -6,12 +6,10 @@ from odoo.exceptions import ValidationError class PartnerShippingAccount(models.Model): _inherit = 'partner.shipping.account' - - delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')]) - + + delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')], ondelete={'dhl': 'set default'}) + def dhl_check_validity(self): m = re.search(r'^(\d{8}|\d{9}|\d{10})$', self.name or '') if not m: raise ValidationError('DHL Account numbers must be 8-10 decimal numbers.') - - From 35abaacaa70055873643f66018264e4d5e564e68 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 07:20:27 -0700 Subject: [PATCH 09/12] [MIG] delivery_partner_dhl: for Odoo 15.0 --- delivery_partner_dhl/__manifest__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index cd5ca2f4..b5e6c6bd 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,7 +1,8 @@ { 'name': 'DHL Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '14.0.1.0.0', + 'version': '15.0.1.0.0', + 'license': 'LGPL-3', 'category': 'Stock', 'sequence': 95, 'summary': 'DHL Partner Shipping Accounts', From 22fd79c2a5ac962ad63d2735d5ea797ebaf65629 Mon Sep 17 00:00:00 2001 From: Mishael De La Cruz Date: Tue, 2 Nov 2021 09:58:15 -0500 Subject: [PATCH 10/12] [I18N] multi: Initial Translations 15.0 --- delivery_partner_dhl/i18n/es.po | 37 +++++++++++++++++++++++++ delivery_partner_dhl/models/delivery.py | 4 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 delivery_partner_dhl/i18n/es.po diff --git a/delivery_partner_dhl/i18n/es.po b/delivery_partner_dhl/i18n/es.po new file mode 100644 index 00000000..fe347333 --- /dev/null +++ b/delivery_partner_dhl/i18n/es.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_partner_dhl +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-12 01:09+0000\n" +"PO-Revision-Date: 2021-10-12 01:09+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: delivery_partner_dhl +#: model:ir.model.fields,field_description:delivery_partner_dhl.field_partner_shipping_account__delivery_type +msgid "Carrier" +msgstr "Transportista" + +#. module: delivery_partner_dhl +#: model:ir.model.fields.selection,name:delivery_partner_dhl.selection__partner_shipping_account__delivery_type__dhl +msgid "DHL" +msgstr "DHL" + +#. module: delivery_partner_dhl +#: code:addons/delivery_partner_dhl/models/delivery.py:0 +#, python-format +msgid "DHL Account numbers must be 8-10 decimal numbers." +msgstr "Los números de cuenta DHL deben ser entre 8-10 números decimales" + +#. module: delivery_partner_dhl +#: model:ir.model,name:delivery_partner_dhl.model_partner_shipping_account +msgid "Partner Shipping Account" +msgstr "Cuenta de Envío del Socio" diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py index d4e82ea1..548d2eaf 100644 --- a/delivery_partner_dhl/models/delivery.py +++ b/delivery_partner_dhl/models/delivery.py @@ -1,6 +1,6 @@ import re -from odoo import fields, models +from odoo import fields, models, _ from odoo.exceptions import ValidationError @@ -12,4 +12,4 @@ class PartnerShippingAccount(models.Model): def dhl_check_validity(self): m = re.search(r'^(\d{8}|\d{9}|\d{10})$', self.name or '') if not m: - raise ValidationError('DHL Account numbers must be 8-10 decimal numbers.') + raise ValidationError(_('DHL Account numbers must be 8-10 decimal numbers.')) From dc862b4866355fb05344a69fdee4673b9506b945 Mon Sep 17 00:00:00 2001 From: Leo Pinedo Date: Wed, 19 Oct 2022 22:41:11 +0000 Subject: [PATCH 11/12] [MIG] delivery_partner_dhl: to 16 --- delivery_partner_dhl/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index b5e6c6bd..066a7f9c 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'DHL Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '15.0.1.0.0', + 'version': '16.0.1.0.0', 'license': 'LGPL-3', 'category': 'Stock', 'sequence': 95, From 90c20dc5db9fae8faad12dd79c5377e848d846e9 Mon Sep 17 00:00:00 2001 From: Salomon Chambi Date: Tue, 7 Nov 2023 23:36:10 +0000 Subject: [PATCH 12/12] [MIG] delivery_partner_dhl: to 17.0 --- delivery_partner_dhl/README.rst | 2 +- delivery_partner_dhl/__manifest__.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/delivery_partner_dhl/README.rst b/delivery_partner_dhl/README.rst index 7d08930e..e524c2ac 100644 --- a/delivery_partner_dhl/README.rst +++ b/delivery_partner_dhl/README.rst @@ -25,4 +25,4 @@ License Please see `LICENSE `_. -Copyright Hibou Corp. 2018 +Copyright Hibou Corp. 2023 diff --git a/delivery_partner_dhl/__manifest__.py b/delivery_partner_dhl/__manifest__.py index 066a7f9c..f4801fe3 100755 --- a/delivery_partner_dhl/__manifest__.py +++ b/delivery_partner_dhl/__manifest__.py @@ -1,12 +1,17 @@ { 'name': 'DHL Partner Shipping Accounts', - 'author': 'Hibou Corp. ', - 'version': '16.0.1.0.0', + 'author': 'Hibou Corp.', + 'version': '17.0.1.0.0', 'license': 'LGPL-3', 'category': 'Stock', 'sequence': 95, 'summary': 'DHL Partner Shipping Accounts', 'description': """ +DHL Partner Shipping Accounts +=============================== +This module adds DHL to delivery type selection dropdown on the Partner Shipping Account model. +Additionally, it validates entered DHL account numbers are the correct length. + """, 'website': 'https://hibou.io/', 'depends': [