diff --git a/purchase.py b/purchase.py
index 1e1e1ee3a3..b704eb0cd0 100644
--- a/purchase.py
+++ b/purchase.py
@@ -202,10 +202,20 @@ class AmendmentLine(ModelSQL, ModelView):
             'invisible': Eval('action') != 'party',
             'required': Eval('action') == 'party',
             })
+    invoice_party = fields.Many2One(
+        'party.party', "Invoice Party",
+        states={
+            'readonly': Eval('state') != 'draft',
+            'invisible': Eval('action') != 'party',
+            },
+        search_context={
+            'related_party': Eval('party'),
+            })
     invoice_address = fields.Many2One(
         'party.address', "Invoice Address",
         domain=[
-            ('party', '=', Eval('party')),
+            ('party', '=', If(Eval('invoice_party'),
+                    Eval('invoice_party'), Eval('party'))),
             ],
         states={
             'readonly': Eval('state') != 'draft',
@@ -301,6 +311,7 @@ class AmendmentLine(ModelSQL, ModelView):
         '_parent_amendment.purchase',
         '_parent_amendment._parent_purchase.payment_term',
         '_parent_amendment._parent_purchase.party',
+        '_parent_amendment._parent_purchase.invoice_party',
         '_parent_amendment._parent_purchase.invoice_address',
         '_parent_amendment._parent_purchase.warehouse')
     def on_change_amendment(self):
@@ -308,6 +319,7 @@ class AmendmentLine(ModelSQL, ModelView):
             self.payment_term = self.amendment.purchase.payment_term
 
             self.party = self.amendment.purchase.party
+            self.invoice_party = self.amendment.purchase.invoice_party
             self.invoice_address = self.amendment.purchase.invoice_address
 
             self.warehouse = self.amendment.purchase.warehouse
@@ -355,10 +367,20 @@ class AmendmentLine(ModelSQL, ModelView):
             self.product = self.product_supplier = self.description = None
             self.quantity = self.unit = self.unit_price = None
 
-    @fields.depends('party')
+    @fields.depends('party', 'invoice_party')
     def on_change_party(self):
-        self.invoice_address = None
+        if not self.invoice_party:
+            self.invoice_address = None
         if self.party:
+            if not self.invoice_address:
+                self.invoice_address = self.party.address_get(type='invoice')
+
+    @fields.depends('party', 'invoice_party')
+    def on_change_invoice_party(self):
+        if self.invoice_party:
+            self.invoice_address = self.invoice_party.address_get(
+                type='invoice')
+        elif self.party:
             self.invoice_address = self.party.address_get(type='invoice')
 
     @fields.depends('line')
@@ -389,6 +411,7 @@ class AmendmentLine(ModelSQL, ModelView):
 
     def _apply_party(self, purchase, purchase_line):
         purchase.party = self.party
+        purchase.invoice_party = self.invoice_party
         purchase.invoice_address = self.invoice_address
 
     def _apply_warehouse(self, purchase, purchase_line):
diff --git a/view/purchase_amendment_line_form.xml b/view/purchase_amendment_line_form.xml
index a680ffbc12..c66532cab6 100644
--- a/view/purchase_amendment_line_form.xml
+++ b/view/purchase_amendment_line_form.xml
@@ -14,6 +14,9 @@ this repository contains the full copyright notices and license terms. -->
     <newline/>
     <label name="party"/>
     <field name="party"/>
+    <newline/>
+    <label name="invoice_party"/>
+    <field name="invoice_party"/>
     <label name="invoice_address"/>
     <field name="invoice_address"/>
     <newline/>