diff --git a/addons/sale/models/account_invoice.py b/addons/sale/models/account_invoice.py
index d984f1d4a11..43591607a45 100644
--- a/addons/sale/models/account_invoice.py
+++ b/addons/sale/models/account_invoice.py
@@ -45,12 +45,12 @@ class AccountMove(models.Model):
     @api.onchange('partner_id')
     def _onchange_partner_id(self):
         # OVERRIDE
-        res = super(AccountMove, self)._onchange_partner_id()
-
         # Recompute 'partner_shipping_id' based on 'partner_id'.
         addr = self.partner_id.address_get(['delivery'])
         self.partner_shipping_id = addr and addr.get('delivery')
 
+        res = super(AccountMove, self)._onchange_partner_id()
+
         # Recompute 'narration' based on 'company.invoice_terms'.
         if self.type == 'out_invoice':
             self.narration = self.company_id.with_context(lang=self.partner_id.lang).invoice_terms