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 @@
     <field name="inherit_id" ref="sale.view_order_form"/>
     <field name="arch" type="xml">
         <xpath expr="//field[@name='partner_id']" position="after">
-            <field name="parent_id" invisible="1"/>
+            <field name="commercial_partner_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', '=', partner_parent_id), ('parent_id', '!=', False)]</attribute>
+            ('type','=', 'delivery'), '&amp;',
+            ('id', 'child_of', commercial_partner_id), ('parent_id', '!=', False)]</attribute>
         </xpath>
     </field>
 </record>