diff --git a/delivery_partner_dhl/README.rst b/delivery_partner_dhl/README.rst
new file mode 100644
index 00000000..7d08930e
--- /dev/null
+++ b/delivery_partner_dhl/README.rst
@@ -0,0 +1,28 @@
+*************************************
+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.
+
+.. image:: https://user-images.githubusercontent.com/15882954/41176760-825c6802-6b16-11e8-91b6-188b32146626.png
+ :alt: 'Register Payment Detail'
+ :width: 988
+ :align: left
+
+=======
+License
+=======
+
+Please see `LICENSE `_.
+
+Copyright Hibou Corp. 2018
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..5d199717
--- /dev/null
+++ b/delivery_partner_dhl/__manifest__.py
@@ -0,0 +1,18 @@
+{
+ 'name': 'DHL Partner Shipping Accounts',
+ 'author': 'Hibou Corp. ',
+ 'version': '13.0.1.0.0',
+ 'category': 'Stock',
+ 'sequence': 95,
+ 'summary': 'DHL 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..6de6583a
--- /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(r'^(\d{8}|\d{9}|\d{10})$', self.name or '')
+ if not m:
+ raise ValidationError('DHL Account numbers must be 8-10 decimal numbers.')
+
+
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'
+ })