From 168b2ed31ab625bd1fe61a230a0bbe84056d8ae5 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_ups/__init__.py | 1 + delivery_partner_ups/__manifest__.py | 19 +++++++++++++++++++ delivery_partner_ups/models/__init__.py | 1 + delivery_partner_ups/models/delivery.py | 19 +++++++++++++++++++ delivery_partner_ups/views/delivery_views.xml | 13 +++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 delivery_partner_ups/__init__.py create mode 100755 delivery_partner_ups/__manifest__.py create mode 100644 delivery_partner_ups/models/__init__.py create mode 100644 delivery_partner_ups/models/delivery.py create mode 100644 delivery_partner_ups/views/delivery_views.xml diff --git a/delivery_partner_ups/__init__.py b/delivery_partner_ups/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/delivery_partner_ups/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py new file mode 100755 index 00000000..42e225d5 --- /dev/null +++ b/delivery_partner_ups/__manifest__.py @@ -0,0 +1,19 @@ +{ + 'name': 'UPS Partner Shipping Accounts', + 'author': 'Hibou Corp. ', + 'version': '11.0.1.0.0', + 'category': 'Stock', + 'sequence': 95, + 'summary': 'UPS Partner Shipping Accounts', + 'description': """ + """, + 'website': 'https://hibou.io/', + 'depends': [ + 'delivery_partner', + ], + 'data': [ + 'views/delivery_views.xml', + ], + 'installable': True, + 'application': False, +} diff --git a/delivery_partner_ups/models/__init__.py b/delivery_partner_ups/models/__init__.py new file mode 100644 index 00000000..be8cabd6 --- /dev/null +++ b/delivery_partner_ups/models/__init__.py @@ -0,0 +1 @@ +from . import delivery diff --git a/delivery_partner_ups/models/delivery.py b/delivery_partner_ups/models/delivery.py new file mode 100644 index 00000000..fef70cd2 --- /dev/null +++ b/delivery_partner_ups/models/delivery.py @@ -0,0 +1,19 @@ +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=[('ups', 'UPS')]) + ups_zip = fields.Char(string='UPS Account ZIP') + + def ups_check_validity(self): + m = re.search('^[\dA-Z]{6}$', self.name or '') + if not m: + raise ValidationError('UPS Account numbers must be 6 Alpha-numeric characters.') + m = re.search('^\d{5}$', self.ups_zip or '') + if not m: + raise ValidationError('UPS requires the 5 digit account ZIP.') diff --git a/delivery_partner_ups/views/delivery_views.xml b/delivery_partner_ups/views/delivery_views.xml new file mode 100644 index 00000000..d5c8a4e7 --- /dev/null +++ b/delivery_partner_ups/views/delivery_views.xml @@ -0,0 +1,13 @@ + + + + partner.shipping.account.form.inherit + partner.shipping.account + + + + + + + + From f9754052bf6a5ad2a6dd1e8de22837ca9216c330 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:58:23 -0700 Subject: [PATCH 02/10] Add README.rst --- delivery_partner_ups/README.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 delivery_partner_ups/README.rst diff --git a/delivery_partner_ups/README.rst b/delivery_partner_ups/README.rst new file mode 100644 index 00000000..632af9f7 --- /dev/null +++ b/delivery_partner_ups/README.rst @@ -0,0 +1,25 @@ +*************************************** +Hibou - UPS Partner Shipping Accounts +*************************************** + +Adds UPS shipping accounts. + +For more information and add-ons, visit `Hibou.io `_. + + +============= +Main Features +============= + +* Adds UPS to the delivery type selection field. +* Adds new required field of UPS Account ZIP. +* Validates entered UPS account numbers are the correct length. + + +======= +License +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2018 From 62ed96d60c49a3d462eec6e6770305ac77f5bbd9 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:25:16 -0700 Subject: [PATCH 03/10] Add screenshot. --- delivery_partner_ups/README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/delivery_partner_ups/README.rst b/delivery_partner_ups/README.rst index 632af9f7..5896d237 100644 --- a/delivery_partner_ups/README.rst +++ b/delivery_partner_ups/README.rst @@ -15,6 +15,10 @@ Main Features * Adds new required field of UPS Account ZIP. * Validates entered UPS account numbers are the correct length. +.. image:: https://user-images.githubusercontent.com/15882954/41176879-e7dc5a66-6b16-11e8-82a2-9b6cd0c909fd.png + :alt: 'Register Payment Detail' + :width: 988 + :align: left ======= License From 4d8714e614e07d7a3a34b9c0e10a998eaea75dc9 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 2 Apr 2019 10:41:41 -0700 Subject: [PATCH 04/10] MIG `delivery_partner_ups` to 12.0 --- delivery_partner_ups/__manifest__.py | 2 +- delivery_partner_ups/models/delivery.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index 42e225d5..4639f374 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'UPS Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'UPS Partner Shipping Accounts', diff --git a/delivery_partner_ups/models/delivery.py b/delivery_partner_ups/models/delivery.py index fef70cd2..dd9a3239 100644 --- a/delivery_partner_ups/models/delivery.py +++ b/delivery_partner_ups/models/delivery.py @@ -11,9 +11,9 @@ class PartnerShippingAccount(models.Model): ups_zip = fields.Char(string='UPS Account ZIP') def ups_check_validity(self): - m = re.search('^[\dA-Z]{6}$', self.name or '') + m = re.search(r'^[\dA-Z]{6}$', self.name or '') if not m: raise ValidationError('UPS Account numbers must be 6 Alpha-numeric characters.') - m = re.search('^\d{5}$', self.ups_zip or '') + m = re.search(r'^\d{5}$', self.ups_zip or '') if not m: raise ValidationError('UPS requires the 5 digit account ZIP.') From 09c8bd8984c480789efe06a3081f4381edeea676 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 18:44:19 -0500 Subject: [PATCH 05/10] [MIG] delivery_partner_ups: migrate to Odoo 13.0 Added tests --- delivery_partner_ups/__manifest__.py | 2 +- delivery_partner_ups/tests/__init__.py | 1 + .../tests/test_ups_account.py | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 delivery_partner_ups/tests/__init__.py create mode 100644 delivery_partner_ups/tests/test_ups_account.py diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index 4639f374..b9cff5ac 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'UPS Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'UPS Partner Shipping Accounts', diff --git a/delivery_partner_ups/tests/__init__.py b/delivery_partner_ups/tests/__init__.py new file mode 100644 index 00000000..9df4d58c --- /dev/null +++ b/delivery_partner_ups/tests/__init__.py @@ -0,0 +1 @@ +from . import test_ups_account diff --git a/delivery_partner_ups/tests/test_ups_account.py b/delivery_partner_ups/tests/test_ups_account.py new file mode 100644 index 00000000..f4391039 --- /dev/null +++ b/delivery_partner_ups/tests/test_ups_account.py @@ -0,0 +1,61 @@ +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_ups_account_information(self): + # Create object and confirm that validation error raises if ups account number is blank or not 8 digits + with self.assertRaises(ValidationError): + wrong_account_number = self.PartnerShippingAccount.create({ + 'name': '1234567', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'ups', + 'note': 'This is a note', + 'ups_zip': '12345' + }) + + with self.assertRaises(ValidationError): + no_account_number = self.PartnerShippingAccount.create({ + 'name': '', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'ups', + 'note': 'This is a note', + 'ups_zip': '12345' + }) + # Create object and confirm that validation error raises if zipcode is blank or not 5 digits + with self.assertRaises(ValidationError): + wrong_zip_code = self.PartnerShippingAccount.create({ + 'name': '123456', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'ups', + 'note': 'This is a note', + 'ups_zip': '1234' + }) + + with self.assertRaises(ValidationError): + no_zip_code = self.PartnerShippingAccount.create({ + 'name': '123456', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'ups', + 'note': 'This is a note', + 'ups_zip': '' + }) + + _ = self.PartnerShippingAccount.create({ + 'name': '123456', + 'description': 'Error Account', + 'partner_id': self.partner.id, + 'delivery_type': 'ups', + 'note': 'This is a note', + 'ups_zip': '12345' + }) From 70733536c1969b68dc7eea24b0c211674fcf7888 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Mon, 9 Nov 2020 09:10:12 -0500 Subject: [PATCH 06/10] [MIG] delivery_partner_ups: migrate delivery_partner_module to Odoo 14.0 --- delivery_partner_ups/__manifest__.py | 2 +- delivery_partner_ups/models/delivery.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index b9cff5ac..8f0470dd 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'UPS Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'UPS Partner Shipping Accounts', diff --git a/delivery_partner_ups/models/delivery.py b/delivery_partner_ups/models/delivery.py index dd9a3239..257e2503 100644 --- a/delivery_partner_ups/models/delivery.py +++ b/delivery_partner_ups/models/delivery.py @@ -7,7 +7,7 @@ from odoo.exceptions import ValidationError class PartnerShippingAccount(models.Model): _inherit = 'partner.shipping.account' - delivery_type = fields.Selection(selection_add=[('ups', 'UPS')]) + delivery_type = fields.Selection(selection_add=[('ups', 'UPS')], ondelete={'ups': 'set default'}) ups_zip = fields.Char(string='UPS Account ZIP') def ups_check_validity(self): From b47c35d536ea3a699ac5d59ca89b09a11aa6c07f Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 07:25:09 -0700 Subject: [PATCH 07/10] [MIG] delivery_partner_ups: to Odoo 15.0 --- delivery_partner_ups/__manifest__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index 8f0470dd..b4659cb6 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,7 +1,8 @@ { 'name': 'UPS 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': 'UPS Partner Shipping Accounts', From f955ccf9a415e1f35fb1108502010b1f5a3cec3d 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_ups/i18n/es.po | 47 +++++++++++++++++++++++++ delivery_partner_ups/models/delivery.py | 6 ++-- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 delivery_partner_ups/i18n/es.po diff --git a/delivery_partner_ups/i18n/es.po b/delivery_partner_ups/i18n/es.po new file mode 100644 index 00000000..1dbe5f59 --- /dev/null +++ b/delivery_partner_ups/i18n/es.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_partner_ups +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-12 01:10+0000\n" +"PO-Revision-Date: 2021-10-12 01:10+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_ups +#: model:ir.model.fields,field_description:delivery_partner_ups.field_partner_shipping_account__delivery_type +msgid "Carrier" +msgstr "Transportista" + +#. module: delivery_partner_ups +#: model:ir.model,name:delivery_partner_ups.model_partner_shipping_account +msgid "Partner Shipping Account" +msgstr "Cuenta de Envío del Socio" + +#. module: delivery_partner_ups +#: model:ir.model.fields.selection,name:delivery_partner_ups.selection__partner_shipping_account__delivery_type__ups +msgid "UPS" +msgstr "UPS" + +#. module: delivery_partner_ups +#: model:ir.model.fields,field_description:delivery_partner_ups.field_partner_shipping_account__ups_zip +msgid "UPS Account ZIP" +msgstr "Código postal de la cuenta UPS" +#. module: delivery_partner_ups +#: code:addons/delivery_partner_ups/models/delivery.py:0 +#, python-format +msgid "UPS Account numbers must be 6 Alpha-numeric characters." +msgstr "Los números de cuenta de UPS deben tener 6 caracteres alfanuméricos." + +#. module: delivery_partner_ups +#: code:addons/delivery_partner_ups/models/delivery.py:0 +#, python-format +msgid "UPS requires the 5 digit account ZIP." +msgstr "UPS requiere el código postal de 5 dígitos de la cuenta." diff --git a/delivery_partner_ups/models/delivery.py b/delivery_partner_ups/models/delivery.py index 257e2503..93d5ce56 100644 --- a/delivery_partner_ups/models/delivery.py +++ b/delivery_partner_ups/models/delivery.py @@ -1,6 +1,6 @@ import re -from odoo import fields, models +from odoo import fields, models, _ from odoo.exceptions import ValidationError @@ -13,7 +13,7 @@ class PartnerShippingAccount(models.Model): def ups_check_validity(self): m = re.search(r'^[\dA-Z]{6}$', self.name or '') if not m: - raise ValidationError('UPS Account numbers must be 6 Alpha-numeric characters.') + raise ValidationError(_('UPS Account numbers must be 6 Alpha-numeric characters.')) m = re.search(r'^\d{5}$', self.ups_zip or '') if not m: - raise ValidationError('UPS requires the 5 digit account ZIP.') + raise ValidationError(_('UPS requires the 5 digit account ZIP.')) From 90ab575d26ec0d9fa0b97ccdded72675a3c121f7 Mon Sep 17 00:00:00 2001 From: Leo Pinedo Date: Wed, 19 Oct 2022 23:09:56 +0000 Subject: [PATCH 09/10] [MIG] delivery_partner_ups: to 16 --- delivery_partner_ups/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index b4659cb6..5f32574a 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'UPS 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 dd2c57a9b36f5c512991ad4d271f5e1079e91d24 Mon Sep 17 00:00:00 2001 From: Salomon Chambi Date: Fri, 3 Nov 2023 20:37:43 +0000 Subject: [PATCH 10/10] [MIG] delivery_partner_ups: to 17.0 --- delivery_partner_ups/__manifest__.py | 9 +++++++-- delivery_partner_ups/views/delivery_views.xml | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/delivery_partner_ups/__manifest__.py b/delivery_partner_ups/__manifest__.py index 5f32574a..ee2f7945 100755 --- a/delivery_partner_ups/__manifest__.py +++ b/delivery_partner_ups/__manifest__.py @@ -1,12 +1,17 @@ { 'name': 'UPS 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': 'UPS Partner Shipping Accounts', 'description': """ +UPS Partner Shipping Accounts +============================= +This module adds UPS to the delivery type selection dropdown on the Partner Shipping Account model. +Additionally, it adds a new required field UPS Account ZIP, as well as validation of entered UPS account number. + """, 'website': 'https://hibou.io/', 'depends': [ diff --git a/delivery_partner_ups/views/delivery_views.xml b/delivery_partner_ups/views/delivery_views.xml index d5c8a4e7..1845c5ad 100644 --- a/delivery_partner_ups/views/delivery_views.xml +++ b/delivery_partner_ups/views/delivery_views.xml @@ -6,7 +6,9 @@ - +