From e483833a33e7595e6217c9043ff68dca295bc8ac Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 01/10] 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 0e6bb9a34c52b36f21d37cde6c1fee8a15c47cc4 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:54:50 -0700 Subject: [PATCH 02/10] 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 09fc9fd60cfc29196faaba8844fff44657420b4d Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:24:07 -0700 Subject: [PATCH 03/10] 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 a004c3e35f3f00e3722f42dd1be191acae04ea27 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 2 Apr 2019 10:37:25 -0700 Subject: [PATCH 04/10] 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 9b04a91742f33381e6805c47f0217f96eb8632b8 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 17:54:29 -0500 Subject: [PATCH 05/10] [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' + }) From 3981e3f21688e2bd77306d17cf2ea0f090857fcb Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Mon, 9 Nov 2020 09:56:12 -0500 Subject: [PATCH 06/10] [MIG] delivery_partner_fedex: migrate to odoo 14.0 Added 'ondelete' option. It's now required when the selection_add parameter is used. --- delivery_partner_fedex/__manifest__.py | 2 +- delivery_partner_fedex/models/delivery.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index b2150cba..7449b318 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': '13.0.1.0.0', + 'version': '14.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 f6da8910..a1eec67f 100644 --- a/delivery_partner_fedex/models/delivery.py +++ b/delivery_partner_fedex/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=[('fedex', 'FedEx')]) - + + delivery_type = fields.Selection(selection_add=[('fedex', 'FedEx')], ondelete={'fedex': 'set default'}) + def fedex_check_validity(self): m = re.search(r'^\d{9}$', self.name or '') if not m: raise ValidationError('FedEx Account numbers must be 9 decimal numbers.') - - From 10f7ba474e009a985b1421b54f98e20df05477f9 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 07:23:14 -0700 Subject: [PATCH 07/10] [MIG] delivery_partner_fedex: to Odoo 15.0 --- delivery_partner_fedex/__manifest__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index 7449b318..4a74f13c 100755 --- a/delivery_partner_fedex/__manifest__.py +++ b/delivery_partner_fedex/__manifest__.py @@ -1,7 +1,8 @@ { 'name': 'Fedex 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': 'Fedex Partner Shipping Accounts', From 90092470de2c6fdfbcff76d3e1b3039d3e028554 Mon Sep 17 00:00:00 2001 From: Mishael De La Cruz Date: Tue, 2 Nov 2021 09:58:15 -0500 Subject: [PATCH 08/10] [I18N] multi: Initial Translations 15.0 --- delivery_partner_fedex/i18n/es.po | 37 +++++++++++++++++++++++ delivery_partner_fedex/models/delivery.py | 4 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 delivery_partner_fedex/i18n/es.po diff --git a/delivery_partner_fedex/i18n/es.po b/delivery_partner_fedex/i18n/es.po new file mode 100644 index 00000000..6468eca3 --- /dev/null +++ b/delivery_partner_fedex/i18n/es.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_partner_fedex +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-12 01:11+0000\n" +"PO-Revision-Date: 2021-10-12 01:11+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_fedex +#: model:ir.model.fields,field_description:delivery_partner_fedex.field_partner_shipping_account__delivery_type +msgid "Carrier" +msgstr "Transportista" + +#. module: delivery_partner_fedex +#: model:ir.model.fields.selection,name:delivery_partner_fedex.selection__partner_shipping_account__delivery_type__fedex +msgid "FedEx" +msgstr "FedEx" + +#. module: delivery_partner_fedex +#: code:addons/delivery_partner_fedex/models/delivery.py:0 +#, python-format +msgid "FedEx Account numbers must be 9 decimal numbers." +msgstr "Los números de cuenta FedEx deben ser 9 números decimales" + +#. module: delivery_partner_fedex +#: model:ir.model,name:delivery_partner_fedex.model_partner_shipping_account +msgid "Partner Shipping Account" +msgstr "Cuenta de Envío del Socio" diff --git a/delivery_partner_fedex/models/delivery.py b/delivery_partner_fedex/models/delivery.py index a1eec67f..77767710 100644 --- a/delivery_partner_fedex/models/delivery.py +++ b/delivery_partner_fedex/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 fedex_check_validity(self): m = re.search(r'^\d{9}$', self.name or '') if not m: - raise ValidationError('FedEx Account numbers must be 9 decimal numbers.') + raise ValidationError(_('FedEx Account numbers must be 9 decimal numbers.')) From 6d9ef58f3da77d6e8e52512d7fac5de895353776 Mon Sep 17 00:00:00 2001 From: Leo Pinedo Date: Wed, 19 Oct 2022 22:56:16 +0000 Subject: [PATCH 09/10] [MIG] delivery_partner_fedex: to 16 --- delivery_partner_fedex/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index 4a74f13c..36b0e956 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': '15.0.1.0.0', + 'version': '16.0.1.0.0', 'license': 'LGPL-3', 'category': 'Stock', 'sequence': 95, From da61a45f720162072f04b84d4b699dfcd011adc3 Mon Sep 17 00:00:00 2001 From: Salomon Chambi Date: Mon, 6 Nov 2023 22:06:11 +0000 Subject: [PATCH 10/10] [MIG] delivery_partner_fedex: to 17.0 --- delivery_partner_fedex/README.rst | 2 +- delivery_partner_fedex/__manifest__.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/delivery_partner_fedex/README.rst b/delivery_partner_fedex/README.rst index 17dfbcfd..a48bf266 100644 --- a/delivery_partner_fedex/README.rst +++ b/delivery_partner_fedex/README.rst @@ -25,4 +25,4 @@ License Please see `LICENSE `_. -Copyright Hibou Corp. 2018 +Copyright Hibou Corp. 2023 diff --git a/delivery_partner_fedex/__manifest__.py b/delivery_partner_fedex/__manifest__.py index 36b0e956..b93618d2 100755 --- a/delivery_partner_fedex/__manifest__.py +++ b/delivery_partner_fedex/__manifest__.py @@ -1,12 +1,17 @@ { 'name': 'Fedex 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': 'Fedex Partner Shipping Accounts', 'description': """ +Fedex Partner Shipping Accounts +=============================== +This module adds FedEx to delivery type selection dropdown on the Partner Shipping Account model. +Additionally, it validates entered FedEx account numbers are the correct length. + """, 'website': 'https://hibou.io/', 'depends': [