From 108c2dd24e09379d77bf32d060488d4ed0d9868b Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 1/7] 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 1b3cdf2445edc8d11491f7de9674ecd7235f23f3 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Mon, 23 Apr 2018 13:54:24 -0700 Subject: [PATCH 2/7] 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 7d29981e0b5b558d8eb9b3b511a085810fcef30c Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:53:38 -0700 Subject: [PATCH 3/7] 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 cffaf1df77d831ffcb9236e86bacf37d396f2ec1 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:22:57 -0700 Subject: [PATCH 4/7] 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 e7e649d3ab5dcb99b3476c734f40a7bd57338f81 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 2 Apr 2019 10:38:19 -0700 Subject: [PATCH 5/7] 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 0e80470d3945bbc07b8717bb199c46e865e7cfd3 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 25 Jul 2019 15:14:33 -0700 Subject: [PATCH 6/7] 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 3a8ce4e84d7c8fd93cd1294715b69decc584055c Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 17:45:34 -0500 Subject: [PATCH 7/7] [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' + })