From 5ca8799846013953a1edf07eb405425f3cb572da Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 13 Apr 2018 09:52:13 -0700 Subject: [PATCH 01/12] 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 263930dde2aa367e2c639423ae79ab924e722c28 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 11 May 2018 18:26:33 -0700 Subject: [PATCH 02/12] 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 07818557858fd64ee7bbcb41282ef2ffaa7947d9 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 10:52:51 -0700 Subject: [PATCH 03/12] 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 611dc29dca436d2f1c9a7d3f470e4580d0bc7f5a Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 8 Jun 2018 12:21:10 -0700 Subject: [PATCH 04/12] 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 f6328be353119b9a74f4b48dc0f5e60d0fade50d Mon Sep 17 00:00:00 2001 From: Bhoomi Date: Mon, 23 Sep 2019 16:11:37 -0400 Subject: [PATCH 05/12] 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 550e02b7174bd83a2e1e08435172ba9c64fb7eb9 Mon Sep 17 00:00:00 2001 From: Bhoomi Date: Fri, 4 Oct 2019 13:10:22 -0400 Subject: [PATCH 06/12] 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 94f3d1374a8a420492b80aa225d3699edc1f0bb1 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Fri, 6 Nov 2020 21:28:12 -0500 Subject: [PATCH 07/12] [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 a5465d414e3912dd36bbaa43e32a4007459f33f8 Mon Sep 17 00:00:00 2001 From: Leighton Pennicott Date: Mon, 9 Nov 2020 09:10:12 -0500 Subject: [PATCH 08/12] [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 a60c989986699b84bb15303094c15c526d83c5a5 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 07:02:12 -0700 Subject: [PATCH 09/12] [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 @@ - + From 7b8cdd47d9c831c35c07a5999009821bc753a4ea Mon Sep 17 00:00:00 2001 From: Mishael De La Cruz Date: Tue, 2 Nov 2021 09:58:15 -0500 Subject: [PATCH 10/12] [I18N] multi: Initial Translations 15.0 --- delivery_partner/i18n/es.po | 135 ++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 delivery_partner/i18n/es.po diff --git a/delivery_partner/i18n/es.po b/delivery_partner/i18n/es.po new file mode 100644 index 00000000..19989003 --- /dev/null +++ b/delivery_partner/i18n/es.po @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-12 01:08+0000\n" +"PO-Revision-Date: 2021-10-12 01:08+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 +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__name +msgid "Account Num." +msgstr "Número de Cuenta" + +#. module: delivery_partner +#: model_terms:ir.ui.view,arch_db:delivery_partner.partner_shipping_account_view_form +msgid "Any additional notes..." +msgstr "Notas adicionales..." + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__delivery_type +msgid "Carrier" +msgstr "Transportista" + +#. module: delivery_partner +#: model:ir.model,name:delivery_partner.model_res_partner +msgid "Contact" +msgstr "Contacto" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__create_date +msgid "Created on" +msgstr "Creado el" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__description +msgid "Description" +msgstr "Descripción" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__display_name +msgid "Display Name" +msgstr "Nombre para mostrar" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__id +msgid "ID" +msgstr "ID" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__note +msgid "Internal Note" +msgstr "Nota Interna" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account____last_update +msgid "Last Modified on" +msgstr "Última Modificación el" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__write_uid +msgid "Last Updated by" +msgstr "Última Actualización por" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__write_date +msgid "Last Updated on" +msgstr "Última Actualización el" + +#. module: delivery_partner +#: model:ir.model.fields,help:delivery_partner.field_partner_shipping_account__partner_id +msgid "Leave blank to allow as a generic 3rd party shipper." +msgstr "Déjelo en blanco para permitirlo como una Transportista genérica de terceros" + +#. module: delivery_partner +#: model_terms:ir.actions.act_window,help:delivery_partner.partner_shipping_account_action_main +msgid "No accounts" +msgstr "Sin Cuentas" + +#. module: delivery_partner +#: model:ir.model.fields.selection,name:delivery_partner.selection__partner_shipping_account__delivery_type__other +msgid "Other" +msgstr "Otro" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_partner_shipping_account__partner_id +msgid "Partner" +msgstr "Socio" + +#. module: delivery_partner +#: model:ir.model,name:delivery_partner.model_partner_shipping_account +msgid "Partner Shipping Account" +msgstr "Cuenta de Envío del Socio" + +#. module: delivery_partner +#: model:ir.ui.menu,name:delivery_partner.partner_shipping_account_menu_main +msgid "Partner Shipping Accounts" +msgstr "Cuentas de Envío del Socio" + +#. module: delivery_partner +#: model:ir.model,name:delivery_partner.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + +#. module: delivery_partner +#: model:ir.model.fields,field_description:delivery_partner.field_sale_order__shipping_account_id +#: model_terms:ir.ui.view,arch_db:delivery_partner.partner_shipping_account_view_form +msgid "Shipping Account" +msgstr "Cuenta de Envío" + +#. module: delivery_partner +#: model_terms:ir.ui.view,arch_db:delivery_partner.partner_shipping_account_view_search +msgid "Shipping Account Search" +msgstr "Busqueda de Cuenta de Envío" + +#. module: delivery_partner +#: model:ir.actions.act_window,name:delivery_partner.partner_shipping_account_action_main +#: model:ir.model.fields,field_description:delivery_partner.field_res_partner__shipping_account_ids +#: model:ir.model.fields,field_description:delivery_partner.field_res_users__shipping_account_ids +#: model_terms:ir.ui.view,arch_db:delivery_partner.partner_shipping_account_view_tree +msgid "Shipping Accounts" +msgstr "Cuentas de Envío" From 31fa7e35bdd1914c7e8fe36e69e1c96082e8b4c5 Mon Sep 17 00:00:00 2001 From: Leo Pinedo Date: Wed, 19 Oct 2022 21:53:03 +0000 Subject: [PATCH 11/12] [MIG] delivery_partner: to 16 --- 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 752b6abd..36bf0698 100755 --- a/delivery_partner/__manifest__.py +++ b/delivery_partner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Partner Shipping Accounts', 'author': 'Hibou Corp. ', - 'version': '15.0.1.0.0', + 'version': '16.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Record shipping account numbers on partners.', From 285c8260381ab2f8436c62aa37332f20406a34da Mon Sep 17 00:00:00 2001 From: Salomon Chambi Date: Thu, 2 Nov 2023 23:15:42 +0000 Subject: [PATCH 12/12] [MIG] delivery_partner: to 17.0 --- delivery_partner/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py index 36bf0698..ad7795be 100755 --- a/delivery_partner/__manifest__.py +++ b/delivery_partner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Partner Shipping Accounts', - 'author': 'Hibou Corp. ', - 'version': '16.0.1.0.0', + 'author': 'Hibou Corp.', + 'version': '17.0.1.0.0', 'category': 'Stock', 'sequence': 95, 'summary': 'Record shipping account numbers on partners.',