diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 43dbccef..714a6b46 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -52,6 +52,13 @@ class SaleOrder(models.Model):
     weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total')
     confirmation_nr = fields.Char('Freigabe-Nr.')
 
+    @api.multi
+    @api.onchange('partner_invoice_id')
+    def _onchange_partner_invoice_id(self):
+        for record in self:
+            if record.partner_invoice_id.retail_partner_id:
+                record.payment_term_id = record.partner_invoice_id.retail_partner_id.property_payment_term_id
+
     @api.multi
     def _compute_weight_total(self):
         for record in self:
@@ -175,11 +182,14 @@ class SaleOrder(models.Model):
         order_line_vals = vals.get('order_lines', False)
         vals = self.remove_not_specified_fields(vals)
         vals = self.correct_values(vals)
+        payment_term = partner.property_payment_term_id
+        if partner.retail_partner_id:
+            payment_term = partner.retail_partner_id.property_payment_term_id
         vals.update({
             'partner_id': partner.id,
             'fiscal_position_id': partner.property_account_position_id.id,
             'user_id': partner.user_id.id,
-            'payment_term_id': partner.property_payment_term_id.id,
+            'payment_term_id': payment_term.id,
             'partner_shipping_id': delivery_partner.id,
             'partner_invoice_id': partner.id,
             'incoterm': partner.sale_incoterm_id.id