From 1224eecce93b5d41900683f7c3da2912c72cfc4b Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Tue, 2 Apr 2019 16:40:46 +0200
Subject: [PATCH] use partner_shipping-carrier_id for sales order; make
 property_delivery_carrier_id visible in quick_form

---
 ext/custom-addons/dp_custom/models/sale.py              | 7 +++++++
 ext/custom-addons/dp_custom/views/res_partner_views.xml | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 47d95700..f287458a 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -107,6 +107,13 @@ class SaleOrder(models.Model):
             if record.partner_invoice_id.is_retailer:
                 record.payment_term_id = record.partner_invoice_id.property_payment_term_id
 
+    @api.multi
+    @api.onchange('partner_shipping_id')
+    def onchange_partner_shipping_id(self):
+        res = super(SaleOrder, self).onchange_partner_shipping_id()
+        self.carrier_id = self.partner_shipping_id.property_delivery_carrier_id
+        return {}
+
     @api.multi
     def _compute_weight_total(self):
         for record in self:
diff --git a/ext/custom-addons/dp_custom/views/res_partner_views.xml b/ext/custom-addons/dp_custom/views/res_partner_views.xml
index b4810cb3..ae48c57a 100644
--- a/ext/custom-addons/dp_custom/views/res_partner_views.xml
+++ b/ext/custom-addons/dp_custom/views/res_partner_views.xml
@@ -12,6 +12,9 @@
                             class="btn-danger" attrs="{'invisible':[('portal_pending','=',False)]}"/>
                 </header>
             </xpath>
+            <xpath expr="//group/field[@name='name']" position="after">
+                    <field name="property_delivery_carrier_id"/>
+            </xpath>
             <xpath expr="//field[@name='parent_id']/.." position="before">
                 <h3>
                     <field name="name2" placeholder="Unternehmen 2"/>