From 8fc8753fd49b6871adc4dcca25cb4cf7bbca71e7 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 1/9] Add `delivery_partner`, `delivery_partner_dhl`, `delivery_partner_fedex`, `delivery_partner_ups` --- delivery_partner/__init__.py | 1 + delivery_partner/__manifest__.py | 24 +++++ delivery_partner/models/__init__.py | 1 + delivery_partner/models/delivery.py | 44 +++++++++ delivery_partner/security/ir.model.access.csv | 2 + delivery_partner/views/delivery_views.xml | 90 +++++++++++++++++++ 6 files changed, 162 insertions(+) create mode 100644 delivery_partner/__init__.py create mode 100755 delivery_partner/__manifest__.py create mode 100644 delivery_partner/models/__init__.py create mode 100644 delivery_partner/models/delivery.py create mode 100644 delivery_partner/security/ir.model.access.csv create mode 100644 delivery_partner/views/delivery_views.xml diff --git a/delivery_partner/__init__.py b/delivery_partner/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/delivery_partner/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py new file mode 100755 index 00000000..ca0582e6 --- /dev/null +++ b/delivery_partner/__manifest__.py @@ -0,0 +1,24 @@ +{ + 'name': 'Partner Shipping Accounts', + 'author': 'Hibou Corp. ', + 'version': '11.0.1.0.0', + 'category': 'Stock', + 'sequence': 95, + 'summary': 'Record shipping account numbers on partners.', + 'description': """ +Record shipping account numbers on partners. + +* Customer Shipping Account Model + """, + 'website': 'https://hibou.io/', + 'depends': [ + 'delivery', + 'contacts', + ], + 'data': [ + 'security/ir.model.access.csv', + 'views/delivery_views.xml', + ], + 'installable': True, + 'application': False, +} diff --git a/delivery_partner/models/__init__.py b/delivery_partner/models/__init__.py new file mode 100644 index 00000000..be8cabd6 --- /dev/null +++ b/delivery_partner/models/__init__.py @@ -0,0 +1 @@ +from . import delivery diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py new file mode 100644 index 00000000..5950e759 --- /dev/null +++ b/delivery_partner/models/delivery.py @@ -0,0 +1,44 @@ +from odoo import api, fields, models + + +class Partner(models.Model): + _inherit = 'res.partner' + + shipping_account_ids = fields.One2many('partner.shipping.account', 'partner_id', string='Shipping Accounts') + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + shipping_account_id = fields.Many2one('partner.shipping.account', string='Shipping Account') + + +class PartnerShippingAccount(models.Model): + _name = 'partner.shipping.account' + + name = fields.Char(string='Account Num.', required=True) + partner_id = fields.Many2one('res.partner', string='Partner', help='Leave blank to allow as a generic 3rd party shipper.') + delivery_type = fields.Selection([ + ('other', 'Other'), + ], string='Carrier', required=True) + note = fields.Text(string='Internal Note') + + @api.multi + def name_get(self): + delivery_types = self._fields['delivery_type']._description_selection(self.env) + + def get_name(value): + name = [n for v, n in delivery_types if v == value] + return name[0] if name else 'Undefined' + + res = [] + for acc in self: + res.append((acc.id, '%s: %s' % (get_name(acc.delivery_type), acc.name))) + return res + + @api.constrains('name', 'delivery_type') + def _check_validity(self): + for acc in self: + check = getattr(acc, acc.delivery_type + '_check_validity', None) + if check: + return check() diff --git a/delivery_partner/security/ir.model.access.csv b/delivery_partner/security/ir.model.access.csv new file mode 100644 index 00000000..3db88333 --- /dev/null +++ b/delivery_partner/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_partner_shipping_account,partner.shipping.account,model_partner_shipping_account,base.group_partner_manager,1,1,1,1 diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml new file mode 100644 index 00000000..d422ebea --- /dev/null +++ b/delivery_partner/views/delivery_views.xml @@ -0,0 +1,90 @@ + + + + partner.shipping.account.tree + partner.shipping.account + + + + + + + + + + + partner.shipping.account.form + partner.shipping.account + +
+ + + + + + + + + + + +
+ + + + + partner.shipping.account.search + partner.shipping.account + + + + + + + + + + + Shipping Accounts + partner.shipping.account + form + tree,form + +

+ No accounts +

+ + + + + + + + res.partner.carrier.property.form.inherit + res.partner + + + + + + + + + + + + + + + delivery.sale.order.form.view.with_carrier.inherit + sale.order + + + + + + + + From ef42e407ae6a17fef2f7dd90af98b48826f6c679 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 11 May 2018 18:26:33 -0700 Subject: [PATCH 2/9] Improve presentation by adding `description` to the shipping account by the end user. --- delivery_partner/models/delivery.py | 6 +++++- delivery_partner/views/delivery_views.xml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py index 5950e759..6838d384 100644 --- a/delivery_partner/models/delivery.py +++ b/delivery_partner/models/delivery.py @@ -17,6 +17,7 @@ class PartnerShippingAccount(models.Model): _name = 'partner.shipping.account' name = fields.Char(string='Account Num.', required=True) + description = fields.Char(string='Description') partner_id = fields.Many2one('res.partner', string='Partner', help='Leave blank to allow as a generic 3rd party shipper.') delivery_type = fields.Selection([ ('other', 'Other'), @@ -33,7 +34,10 @@ class PartnerShippingAccount(models.Model): res = [] for acc in self: - res.append((acc.id, '%s: %s' % (get_name(acc.delivery_type), acc.name))) + if acc.description: + res.append((acc.id, acc.description)) + else: + res.append((acc.id, '%s: %s' % (get_name(acc.delivery_type), acc.name))) return res @api.constrains('name', 'delivery_type') diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml index d422ebea..7f888688 100644 --- a/delivery_partner/views/delivery_views.xml +++ b/delivery_partner/views/delivery_views.xml @@ -5,6 +5,7 @@ partner.shipping.account + @@ -21,6 +22,7 @@ + @@ -37,6 +39,7 @@ partner.shipping.account + @@ -69,6 +72,7 @@ + From 4972e87d38c5efdeea1dae97b0396d1efae46102 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:52:51 -0700 Subject: [PATCH 3/9] Add README. --- delivery_partner/README.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 delivery_partner/README.rst diff --git a/delivery_partner/README.rst b/delivery_partner/README.rst new file mode 100644 index 00000000..c3eace22 --- /dev/null +++ b/delivery_partner/README.rst @@ -0,0 +1,24 @@ +********************************* +Hibou - Partner Shipping Accounts +********************************* + +Records shipping account numbers on partners. + +For more information and add-ons, visit `Hibou.io `_. + + +============= +Main Features +============= + +* New model: Customer Shipping Account +* Includes manager-level access permissions. + + +======= +License +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2018 From f639f32bbee63832cdb7da1a5a318b6dd17e2049 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:21:10 -0700 Subject: [PATCH 4/9] Add screenshot. --- delivery_partner/README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/delivery_partner/README.rst b/delivery_partner/README.rst index c3eace22..e527d2bc 100644 --- a/delivery_partner/README.rst +++ b/delivery_partner/README.rst @@ -14,6 +14,11 @@ Main Features * New model: Customer Shipping Account * Includes manager-level access permissions. +.. image:: https://user-images.githubusercontent.com/15882954/41176601-e40f8558-6b15-11e8-998e-6a7ee5709c0f.png + :alt: 'Register Payment Detail' + :width: 988 + :align: left + ======= License From 0e8e8555fc23911058f8d4b85bff7d571245d725 Mon Sep 17 00:00:00 2001 From: Bhoomi Date: Mon, 23 Sep 2019 16:11:37 -0400 Subject: [PATCH 5/9] MIG `delivery_partner` For Odoo 13.0 --- delivery_partner/__manifest__.py | 2 +- delivery_partner/models/delivery.py | 1 - delivery_partner/views/delivery_views.xml | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py index ca0582e6..52bb240d 100755 --- a/delivery_partner/__manifest__.py +++ b/delivery_partner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Record shipping account numbers on partners.', diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py index 6838d384..72361774 100644 --- a/delivery_partner/models/delivery.py +++ b/delivery_partner/models/delivery.py @@ -24,7 +24,6 @@ class PartnerShippingAccount(models.Model): ], string='Carrier', required=True) note = fields.Text(string='Internal Note') - @api.multi def name_get(self): delivery_types = self._fields['delivery_type']._description_selection(self.env) diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml index 7f888688..edfded9b 100644 --- a/delivery_partner/views/delivery_views.xml +++ b/delivery_partner/views/delivery_views.xml @@ -81,12 +81,12 @@ - - delivery.sale.order.form.view.with_carrier.inherit + + sale.order.form.inherit sale.order - + - + From 614408d8c494c97756934e15376c9655d8edf1ed Mon Sep 17 00:00:00 2001 From: Bhoomi Date: Fri, 4 Oct 2019 13:10:22 -0400 Subject: [PATCH 6/9] FIX `delivery_partner` Resolve View Type error. --- delivery_partner/views/delivery_views.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml index edfded9b..3bf8176c 100644 --- a/delivery_partner/views/delivery_views.xml +++ b/delivery_partner/views/delivery_views.xml @@ -50,7 +50,6 @@ Shipping Accounts partner.shipping.account - form tree,form

From b3442bd92382b4d3fd2f49a04f44ec1631596e22 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 21:28:12 -0500 Subject: [PATCH 7/9] [MIG] delivery_partner: migrate module to Odoo 14 --- delivery_partner/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py index 52bb240d..b5029da8 100755 --- a/delivery_partner/__manifest__.py +++ b/delivery_partner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Record shipping account numbers on partners.', From fd4c870ce5636cacde8faea0d6f0947ade6bc3f8 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Mon, 9 Nov 2020 09:10:12 -0500 Subject: [PATCH 8/9] [MIG] delivery_partner_ups: migrate delivery_partner_module to Odoo 14.0 --- delivery_partner/models/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py index 72361774..4bac5907 100644 --- a/delivery_partner/models/delivery.py +++ b/delivery_partner/models/delivery.py @@ -21,7 +21,7 @@ class PartnerShippingAccount(models.Model): partner_id = fields.Many2one('res.partner', string='Partner', help='Leave blank to allow as a generic 3rd party shipper.') delivery_type = fields.Selection([ ('other', 'Other'), - ], string='Carrier', required=True) + ], string='Carrier', required=True, default='other') note = fields.Text(string='Internal Note') def name_get(self): From 67fbab9ff290dcbc5bfaaec17dbfefaca10b5599 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 07:02:12 -0700 Subject: [PATCH 9/9] [MIG] delivery_partner: to Odoo 15.0 --- delivery_partner/__manifest__.py | 2 +- delivery_partner/views/delivery_views.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py index b5029da8..752b6abd 100755 --- a/delivery_partner/__manifest__.py +++ b/delivery_partner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '14.0.1.0.0', + 'version': '15.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Record shipping account numbers on partners.', diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml index 3bf8176c..4850c4a9 100644 --- a/delivery_partner/views/delivery_views.xml +++ b/delivery_partner/views/delivery_views.xml @@ -69,7 +69,7 @@ - +