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 @@
     <field name="model">sale.order</field>
     <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"/>
+        </xpath>
         <xpath expr="//field[@name='partner_shipping_id']" position="attributes">
-            <attribute name="domain">['|', ('id', '=', partner_id), '&amp;', ('parent_id', '=', partner_id), ('type','=', 'delivery')]</attribute>
+            <attribute name="domain">['|', ('id', '=', partner_id), '&amp;', ('type','=', 'delivery'), '|', ('parent_id', '=', partner_id), '&amp;', ('parent_id', '=', parent_id), ('parent_id', '!=', False)]</attribute>
         </xpath>
     </field>
 </record>