From d273ed9110c91b7302b72125d3c8d33cc5d0a4c7 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Fri, 18 Feb 2022 15:33:58 -0800
Subject: [PATCH] [FIX] delivery_hibou: adding fields that are ambiguous breaks
 existing xpaths

---
 delivery_hibou/views/stock_views.xml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/delivery_hibou/views/stock_views.xml b/delivery_hibou/views/stock_views.xml
index fb564019..65f4310f 100644
--- a/delivery_hibou/views/stock_views.xml
+++ b/delivery_hibou/views/stock_views.xml
@@ -24,27 +24,33 @@
         </field>
     </record>
 
+    <record id="view_quant_package_tree_carrier" model="ir.ui.view">
+        <field name="name">stock.quant.package.tree.carrier</field>
+        <field name="model">stock.quant.package</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="carrier_id" />
+                <field name="carrier_tracking_ref" />
+                <button type="object" name="cancel_shipment" string="Cancel" />
+            </tree>
+        </field>
+    </record>
+
     <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
         <field name="name">hibou.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" eval="200" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='carrier_id']" position="before">
+            <xpath expr="//field[@name='carrier_id']" position="after">
                 <field name="commercial_partner_id" invisible="1" />
                 <field name="require_insurance" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
                 <field name="require_signature" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
                 <field name="package_carrier_tracking_ref" attrs="{'invisible': [('package_carrier_tracking_ref', '=', False)]}" />
                 <button name="clear_carrier_tracking_ref" type="object" string="Clear Tracking" attrs="{'invisible': [('carrier_tracking_ref', '!=', False)]}" />
                 <button name="reset_carrier_tracking_ref" type="object" string="Reset Tracking" attrs="{'invisible': [('package_carrier_tracking_ref', '!=', False)]}" />
-                <field name="package_ids" attrs="{'invisible': [('package_carrier_tracking_ref', '=', False)]}" context="{'active_id': id, 'active_model': 'stock.picking'}" nolabel="1" colspan="2">
-                    <tree>
-                        <field name="name" />
-                        <field name="carrier_id" />
-                        <field name="carrier_tracking_ref" />
-                        <button type="object" name="cancel_shipment" string="Cancel" />
-                    </tree>
-                </field>
+                <field name="package_ids" attrs="{'invisible': [('package_carrier_tracking_ref', '=', False)]}" context="{'active_id': id, 'active_model': 'stock.picking', 'tree_view_ref': 'delivery_hibou.view_quant_package_tree_carrier'}" nolabel="1" colspan="2"/>
             </xpath>
         </field>
     </record>