From 7c554aee336dd2ae33c3ec0dccf4ed6f1b83973c Mon Sep 17 00:00:00 2001
From: chafique-delli <chafique.delli@akretion.com>
Date: Thu, 9 Mar 2017 18:02:04 +0100
Subject: [PATCH] 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 @@
             <field name="parent_id" invisible="1"/>
         </xpath>
         <xpath expr="//field[@name='partner_shipping_id']" position="attributes">
-            <attribute name="domain">['|', ('id', '=', partner_id), '&amp;', ('type','=', 'delivery'), '|', ('parent_id', '=', partner_id), '&amp;', ('parent_id', '=', parent_id), ('parent_id', '!=', False)]</attribute>
+            <attribute name="domain">['|',
+            ('id', '=', partner_id), '&amp;',
+            ('type','=', 'delivery'), '|',
+            ('parent_id', '=', partner_id), '&amp;',
+            ('parent_id', '=', partner_parent_id), ('parent_id', '!=', False)]</attribute>
         </xpath>
     </field>
 </record>