From 91bd864c1640ddc49986ed06ac69f552f4c952ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 13 Dec 2023 08:31:14 +0100
Subject: [PATCH] [FIX] delivery_purchase: Change the position of the carrier
 to the picking header

TT45656
---
 .../views/stock_picking_view.xml              | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/delivery_purchase/views/stock_picking_view.xml b/delivery_purchase/views/stock_picking_view.xml
index 79b6e7f969..db312aca79 100644
--- a/delivery_purchase/views/stock_picking_view.xml
+++ b/delivery_purchase/views/stock_picking_view.xml
@@ -4,14 +4,25 @@
         <field name="name">delivery.stock.picking_withcarrier.form.view</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
+        <field name="priority">99</field>
         <field name="arch" type="xml">
-            <field name="carrier_id" position="after">
+            <field name="carrier_id" position="replace" />
+            <field name="owner_id" position="after">
                 <field name="purchase_id" invisible="1" />
-                <field
-                    name="carrier_price"
-                    force_save="1"
-                    attrs="{'invisible': ['|', ('purchase_id', '=', False),('carrier_id', '=', False)]}"
-                />
+                <label for="carrier_id" />
+                <div class="d-flex">
+                    <field
+                        name="carrier_id"
+                        attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                        options="{'no_create': True, 'no_open': True}"
+                    />
+                    <span class="o_form_label mx-3" />
+                    <field
+                        name="carrier_price"
+                        force_save="1"
+                        attrs="{'invisible': ['|', ('purchase_id', '=', False),('carrier_id', '=', False)]}"
+                    />
+                </div>
             </field>
         </field>
     </record>