From 709bde8fb7548051aaf0d9131b2eb1d2fb4cb7d6 Mon Sep 17 00:00:00 2001 From: chafique-delli Date: Tue, 7 Mar 2017 18:42:07 +0100 Subject: [PATCH 1/5] add sale_partner_shipping_filter_with_customer module --- .../__init__.py | 3 +++ .../__openerp__.py | 21 +++++++++++++++++++ .../sale_view.xml | 17 +++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 sale_partner_shipping_filter_with_customer/__init__.py create mode 100644 sale_partner_shipping_filter_with_customer/__openerp__.py create mode 100644 sale_partner_shipping_filter_with_customer/sale_view.xml diff --git a/sale_partner_shipping_filter_with_customer/__init__.py b/sale_partner_shipping_filter_with_customer/__init__.py new file mode 100644 index 0000000..d587150 --- /dev/null +++ b/sale_partner_shipping_filter_with_customer/__init__.py @@ -0,0 +1,3 @@ +# coding: utf-8 +# © 2017 Chafique DELLI @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/sale_partner_shipping_filter_with_customer/__openerp__.py b/sale_partner_shipping_filter_with_customer/__openerp__.py new file mode 100644 index 0000000..56e0755 --- /dev/null +++ b/sale_partner_shipping_filter_with_customer/__openerp__.py @@ -0,0 +1,21 @@ +# coding: utf-8 +# © 2017 Chafique DELLI @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + 'name': 'Partner Shipping Filter with Customer', + 'summary': "Shows only delivery addresses that are linked " + "with the customer", + 'version': '8.0.1.0.0', + 'category': 'Sale Management', + 'website': 'http://akretion.com', + 'author': 'Akretion, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'installable': True, + 'depends': [ + 'sale', + ], + 'data': [ + 'sale_view.xml', + ] +} diff --git a/sale_partner_shipping_filter_with_customer/sale_view.xml b/sale_partner_shipping_filter_with_customer/sale_view.xml new file mode 100644 index 0000000..af88a74 --- /dev/null +++ b/sale_partner_shipping_filter_with_customer/sale_view.xml @@ -0,0 +1,17 @@ + + + + + + + sale.order + + + + ['|', ('parent_id', '=', partner_id), ('id', '=', partner_id)] + + + + + + From 60beb99580108c23d3a16605114f0e85a27fe406 Mon Sep 17 00:00:00 2001 From: chafique-delli Date: Tue, 7 Mar 2017 19:13:30 +0100 Subject: [PATCH 2/5] fix domain --- sale_partner_shipping_filter_with_customer/sale_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale_partner_shipping_filter_with_customer/sale_view.xml b/sale_partner_shipping_filter_with_customer/sale_view.xml index af88a74..84e1335 100644 --- a/sale_partner_shipping_filter_with_customer/sale_view.xml +++ b/sale_partner_shipping_filter_with_customer/sale_view.xml @@ -7,8 +7,8 @@ sale.order - - ['|', ('parent_id', '=', partner_id), ('id', '=', partner_id)] + + ['|', ('id', '=', partner_id), '&', ('parent_id', '=', partner_id), ('type','=', 'delivery')] From 07c81e441d4f3f448d2ff82f28b88ca1e10ba32f Mon Sep 17 00:00:00 2001 From: chafique-delli Date: Thu, 9 Mar 2017 15:14:05 +0100 Subject: [PATCH 3/5] domain improvement --- .../__init__.py | 2 ++ .../__openerp__.py | 2 +- .../models/__init__.py | 5 +++++ .../models/sale.py | 12 ++++++++++++ .../{ => views}/sale_view.xml | 5 ++++- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 sale_partner_shipping_filter_with_customer/models/__init__.py create mode 100644 sale_partner_shipping_filter_with_customer/models/sale.py rename sale_partner_shipping_filter_with_customer/{ => views}/sale_view.xml (60%) diff --git a/sale_partner_shipping_filter_with_customer/__init__.py b/sale_partner_shipping_filter_with_customer/__init__.py index d587150..947f3a3 100644 --- a/sale_partner_shipping_filter_with_customer/__init__.py +++ b/sale_partner_shipping_filter_with_customer/__init__.py @@ -1,3 +1,5 @@ # coding: utf-8 # © 2017 Chafique DELLI @ Akretion # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/sale_partner_shipping_filter_with_customer/__openerp__.py b/sale_partner_shipping_filter_with_customer/__openerp__.py index 56e0755..b1850b7 100644 --- a/sale_partner_shipping_filter_with_customer/__openerp__.py +++ b/sale_partner_shipping_filter_with_customer/__openerp__.py @@ -16,6 +16,6 @@ 'sale', ], 'data': [ - 'sale_view.xml', + 'views/sale_view.xml', ] } diff --git a/sale_partner_shipping_filter_with_customer/models/__init__.py b/sale_partner_shipping_filter_with_customer/models/__init__.py new file mode 100644 index 0000000..68faef7 --- /dev/null +++ b/sale_partner_shipping_filter_with_customer/models/__init__.py @@ -0,0 +1,5 @@ +# coding: utf-8 +# © 2017 Chafique DELLI @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import sale diff --git a/sale_partner_shipping_filter_with_customer/models/sale.py b/sale_partner_shipping_filter_with_customer/models/sale.py new file mode 100644 index 0000000..f9f8d40 --- /dev/null +++ b/sale_partner_shipping_filter_with_customer/models/sale.py @@ -0,0 +1,12 @@ +# coding: utf-8 +# © 2017 Chafique DELLI @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + parent_id = fields.Many2one(related='partner_id.parent_id', + readonly=True) diff --git a/sale_partner_shipping_filter_with_customer/sale_view.xml b/sale_partner_shipping_filter_with_customer/views/sale_view.xml similarity index 60% rename from sale_partner_shipping_filter_with_customer/sale_view.xml rename to sale_partner_shipping_filter_with_customer/views/sale_view.xml index 84e1335..14a8c80 100644 --- a/sale_partner_shipping_filter_with_customer/sale_view.xml +++ b/sale_partner_shipping_filter_with_customer/views/sale_view.xml @@ -7,8 +7,11 @@ sale.order + + + - ['|', ('id', '=', partner_id), '&', ('parent_id', '=', partner_id), ('type','=', 'delivery')] + ['|', ('id', '=', partner_id), '&', ('type','=', 'delivery'), '|', ('parent_id', '=', partner_id), '&', ('parent_id', '=', parent_id), ('parent_id', '!=', False)] From 7c554aee336dd2ae33c3ec0dccf4ed6f1b83973c Mon Sep 17 00:00:00 2001 From: chafique-delli Date: Thu, 9 Mar 2017 18:02:04 +0100 Subject: [PATCH 4/5] fix after @bealdav's comment --- sale_partner_shipping_filter_with_customer/models/sale.py | 2 +- .../views/sale_view.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sale_partner_shipping_filter_with_customer/models/sale.py b/sale_partner_shipping_filter_with_customer/models/sale.py index f9f8d40..bb01b9f 100644 --- a/sale_partner_shipping_filter_with_customer/models/sale.py +++ b/sale_partner_shipping_filter_with_customer/models/sale.py @@ -8,5 +8,5 @@ from openerp import models, fields class SaleOrder(models.Model): _inherit = 'sale.order' - parent_id = fields.Many2one(related='partner_id.parent_id', + partner_parent_id = fields.Many2one(related='partner_id.parent_id', readonly=True) diff --git a/sale_partner_shipping_filter_with_customer/views/sale_view.xml b/sale_partner_shipping_filter_with_customer/views/sale_view.xml index 14a8c80..a88c72b 100644 --- a/sale_partner_shipping_filter_with_customer/views/sale_view.xml +++ b/sale_partner_shipping_filter_with_customer/views/sale_view.xml @@ -11,7 +11,11 @@ - ['|', ('id', '=', partner_id), '&', ('type','=', 'delivery'), '|', ('parent_id', '=', partner_id), '&', ('parent_id', '=', parent_id), ('parent_id', '!=', False)] + ['|', + ('id', '=', partner_id), '&', + ('type','=', 'delivery'), '|', + ('parent_id', '=', partner_id), '&', + ('parent_id', '=', partner_parent_id), ('parent_id', '!=', False)] From a9c6f9ed69557aacf83992b7b0038f146c45f603 Mon Sep 17 00:00:00 2001 From: chafique-delli Date: Thu, 13 Apr 2017 21:50:12 +0200 Subject: [PATCH 5/5] replace partner_parent_id by commercial_partner_id --- sale_partner_shipping_filter_with_customer/models/sale.py | 4 ++-- .../views/sale_view.xml | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sale_partner_shipping_filter_with_customer/models/sale.py b/sale_partner_shipping_filter_with_customer/models/sale.py index bb01b9f..796a009 100644 --- a/sale_partner_shipping_filter_with_customer/models/sale.py +++ b/sale_partner_shipping_filter_with_customer/models/sale.py @@ -8,5 +8,5 @@ from openerp import models, fields class SaleOrder(models.Model): _inherit = 'sale.order' - partner_parent_id = fields.Many2one(related='partner_id.parent_id', - readonly=True) + commercial_partner_id = fields.Many2one( + related='partner_id.commercial_partner_id', readonly=True) diff --git a/sale_partner_shipping_filter_with_customer/views/sale_view.xml b/sale_partner_shipping_filter_with_customer/views/sale_view.xml index a88c72b..b48d00d 100644 --- a/sale_partner_shipping_filter_with_customer/views/sale_view.xml +++ b/sale_partner_shipping_filter_with_customer/views/sale_view.xml @@ -8,14 +8,13 @@ - + ['|', ('id', '=', partner_id), '&', - ('type','=', 'delivery'), '|', - ('parent_id', '=', partner_id), '&', - ('parent_id', '=', partner_parent_id), ('parent_id', '!=', False)] + ('type','=', 'delivery'), '&', + ('id', 'child_of', commercial_partner_id), ('parent_id', '!=', False)]