diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 23d2c556f40..5e601f863a2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -175,8 +175,8 @@
                     <group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
-                            <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
-                            <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
+                            <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
+                            <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>