From d942227f7eb513c15774fd8d5dfe4a74c4601960 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 1/5] Add `delivery_partner`, `delivery_partner_dhl`, `delivery_partner_fedex`, `delivery_partner_ups` --- delivery_partner_fedex/__init__.py | 1 + delivery_partner_fedex/__manifest__.py | 18 ++++++++++++++++++ delivery_partner_fedex/models/__init__.py | 1 + delivery_partner_fedex/models/delivery.py | 17 +++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 delivery_partner_fedex/__init__.py create mode 100755 delivery_partner_fedex/__manifest__.py create mode 100644 delivery_partner_fedex/models/__init__.py create mode 100644 delivery_partner_fedex/models/delivery.py diff --git a/delivery_partner_fedex/__init__.py b/delivery_partner_fedex/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/delivery_partner_fedex/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py new file mode 100755 index 00000000..5f18d279 --- /dev/null +++ b/delivery_partner_fedex/__manifest__.py @@ -0,0 +1,18 @@ +{ + 'name': 'Fedex 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_fedex/models/__init__.py b/delivery_partner_fedex/models/__init__.py new file mode 100644 index 00000000..be8cabd6 --- /dev/null +++ b/delivery_partner_fedex/models/__init__.py @@ -0,0 +1 @@ +from . import delivery diff --git a/delivery_partner_fedex/models/delivery.py b/delivery_partner_fedex/models/delivery.py new file mode 100644 index 00000000..b9c264be --- /dev/null +++ b/delivery_partner_fedex/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=[('fedex', 'FedEx')]) + + def fedex_check_validity(self): + m = re.search('^\d{9}$', self.name or '') + if not m: + raise ValidationError('FedEx Account numbers must be 9 decimal numbers.') + + From d9cd731e5fb18aa43a387c931df72a430f8527ac Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:54:50 -0700 Subject: [PATCH 2/5] Add README. --- delivery_partner_fedex/README.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 delivery_partner_fedex/README.rst diff --git a/delivery_partner_fedex/README.rst b/delivery_partner_fedex/README.rst new file mode 100644 index 00000000..60ba104c --- /dev/null +++ b/delivery_partner_fedex/README.rst @@ -0,0 +1,23 @@ +*************************************** +Hibou - FedEx Partner Shipping Accounts +*************************************** + +Adds FedEx shipping accounts. + +For more information and add-ons, visit `Hibou.io `_. + + +============= +Main Features +============= + +* Adds FedEx to the delivery type selection field. +* Validates entered FedEx account numbers are the correct length. + +======= +License +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2018 From 98f66a1b942e56f81b013b7e3e05dcbf11c034b8 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:24:07 -0700 Subject: [PATCH 3/5] Add screenshot --- delivery_partner_fedex/README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/delivery_partner_fedex/README.rst b/delivery_partner_fedex/README.rst index 60ba104c..17dfbcfd 100644 --- a/delivery_partner_fedex/README.rst +++ b/delivery_partner_fedex/README.rst @@ -14,6 +14,11 @@ Main Features * Adds FedEx to the delivery type selection field. * Validates entered FedEx account numbers are the correct length. +.. image:: https://user-images.githubusercontent.com/15882954/41176817-b7353356-6b16-11e8-8545-3e59b7b350ae.png + :alt: 'Register Payment Detail' + :width: 988 + :align: left + ======= License ======= From d02a351da1e18171a123601e8a13382cbc4c3c7d Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 2 Apr 2019 10:37:25 -0700 Subject: [PATCH 4/5] MIG `delivery_partner_fedex` to 12.0 --- delivery_partner_fedex/__manifest__.py | 2 +- delivery_partner_fedex/models/delivery.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index 5f18d279..e149d0a4 100755 --- a/delivery_partner_fedex/__manifest__.py +++ b/delivery_partner_fedex/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Fedex Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Fedex Partner Shipping Accounts', diff --git a/delivery_partner_fedex/models/delivery.py b/delivery_partner_fedex/models/delivery.py index b9c264be..f6da8910 100644 --- a/delivery_partner_fedex/models/delivery.py +++ b/delivery_partner_fedex/models/delivery.py @@ -10,7 +10,7 @@ class PartnerShippingAccount(models.Model): delivery_type = fields.Selection(selection_add=[('fedex', 'FedEx')]) def fedex_check_validity(self): - m = re.search('^\d{9}$', self.name or '') + m = re.search(r'^\d{9}$', self.name or '') if not m: raise ValidationError('FedEx Account numbers must be 9 decimal numbers.') From 3e4aacda3e68125a41c2e02078c7c6a5438ee906 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 17:54:29 -0500 Subject: [PATCH 5/5] [MIG] delivery_partner_fedex: migrate module to Odoo 13.0 Added tests --- delivery_partner_fedex/__manifest__.py | 2 +- delivery_partner_fedex/tests/__init__.py | 1 + .../tests/test_fedex_account.py | 38 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 delivery_partner_fedex/tests/__init__.py create mode 100644 delivery_partner_fedex/tests/test_fedex_account.py diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index e149d0a4..b2150cba 100755 --- a/delivery_partner_fedex/__manifest__.py +++ b/delivery_partner_fedex/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Fedex Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Fedex Partner Shipping Accounts', diff --git a/delivery_partner_fedex/tests/__init__.py b/delivery_partner_fedex/tests/__init__.py new file mode 100644 index 00000000..7e86b3ce --- /dev/null +++ b/delivery_partner_fedex/tests/__init__.py @@ -0,0 +1 @@ +from . import test_fedex_account diff --git a/delivery_partner_fedex/tests/test_fedex_account.py b/delivery_partner_fedex/tests/test_fedex_account.py new file mode 100644 index 00000000..777c0747 --- /dev/null +++ b/delivery_partner_fedex/tests/test_fedex_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_fedex_account_information(self): + # Create object and confirm that validation error raises if fedex account is blank or not 8 digits + with self.assertRaises(ValidationError): + wrong_account_number = self.PartnerShippingAccount.create({ + 'name': '12345678', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'fedex', + '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': 'fedex', + 'note': 'This is a note' + }) + + _ = self.PartnerShippingAccount.create({ + 'name': '123456789', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'fedex', + 'note': 'This is a note' + })