From 52ddfd73dcc2d4f06371c8bbc2027c8d4cff2952 Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Mon, 13 Sep 2021 09:57:25 +0200
Subject: [PATCH] treat shipping_type information from imos

---
 ext/custom-addons/dp_custom/models/sale.py      | 17 +++++++++++++++--
 .../dp_custom/views/sale_views.xml              |  1 +
 .../models/delivery_carrier.py                  |  2 ++
 .../views/delivery_carrier.xml                  |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 457511a2..358e1b92 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -481,6 +481,19 @@ class SaleOrder(models.Model):
         if dv:
             vals['desired_delivery_date'] = datetime.strptime(dv,'%d.%m.%Y').date()
 
+        shipping_type = vals.get('shipping_type',False)
+        carrier_id = False
+        if shipping_type:
+            carrier_ids = self.env['delivery.carrier'].search([('key_mapping','=',shipping_type)])
+            if carrier_ids:
+                carrier_id = carrier_ids[0].id
+
+        if not carrier_id:
+            carrier_id = delivery_partner.property_delivery_carrier_id.id
+
+        if not carrier_id:
+            carrier_id = partner.property_delivery_carrier_id.id
+
         confirmed = self.env['res.confirmation_queue'].search([('origin', '=', vals['origin']),('confirmation_processed','=',False)])
         if confirmed:
             vals['confirmation_nr'] = confirmed.confirmation_nr
@@ -494,7 +507,7 @@ class SaleOrder(models.Model):
             'payment_term_id': payment_term.id,
             'partner_shipping_id': delivery_partner.id,
             'incoterm': partner.sale_incoterm_id.id,
-            'carrier_id': delivery_partner.property_delivery_carrier_id.id
+            'carrier_id': carrier_id
         })
 #        print('9')
         order_id = self.create(vals)
@@ -585,7 +598,7 @@ class SaleOrder(models.Model):
     @api.model
     def _get_specified_fields(self):
         return ['origin', 'client_order_ref', 'note', 'date_order', 'assembled', 'line_id', 'partner_id',
-                'fiscal_position_id', 'user_id', 'payment_term_id', 'partner_delivery_id', 'partner_invoice_id',
+                'fiscal_position_id', 'user_id', 'payment_term_id', 'partner_delivery_id', 'partner_invoice_id', 'shipping_type',
                 'assembly_state', 'confirmation_nr', 'confirm_order', 'order_type', 'internal_notes', 'from_designbox', 'discount', 'hide_discount', 'desired_delivery_date', 'sequence']
 
     @api.model
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 1809a603..e4bee529 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -28,6 +28,7 @@
                 <div style="height:5px;">
                 </div>
                 <field name="editor_id" options="{'no_create': True, 'no_open': True}"/>
+                <field name="carrier_id" options="{'no_create': True}"/>
             </field>
             <field name="delivery_date" position="before">
                 <field name="delivery_date_warning" position="before" attrs="{'readonly':True, 'invisible':True}"/>
diff --git a/ext/custom-addons/tz_carrier_show_integration/models/delivery_carrier.py b/ext/custom-addons/tz_carrier_show_integration/models/delivery_carrier.py
index 2772f3fa..76f9e093 100644
--- a/ext/custom-addons/tz_carrier_show_integration/models/delivery_carrier.py
+++ b/ext/custom-addons/tz_carrier_show_integration/models/delivery_carrier.py
@@ -11,3 +11,5 @@ class DeliveryCarrier(models.Model):
                                           ('rate_and_ship', 'Get Rate and Create Shipment')],
                                          string="Integration Level", default='none',
                                          help="Action while validating Delivery Orders")
+
+    key_mapping = fields.Char('Mapping',track_visibility='onchange')
diff --git a/ext/custom-addons/tz_carrier_show_integration/views/delivery_carrier.xml b/ext/custom-addons/tz_carrier_show_integration/views/delivery_carrier.xml
index b4e6ccf5..05802bcf 100644
--- a/ext/custom-addons/tz_carrier_show_integration/views/delivery_carrier.xml
+++ b/ext/custom-addons/tz_carrier_show_integration/views/delivery_carrier.xml
@@ -19,6 +19,9 @@
                     <field name="integration_level" widget="radio"/>
                 </group>
             </field>
+            <field name="product_id" position='after'>
+                <field name="key_mapping" string="Mapping" placeholder="Mapping" groups="dp_custom.group_allow_change_pg_status"/>
+            </field>
         </field>
     </record>