[FIX] stock_ux: duplicated field product_uom_id in tree view

X-original-commit: 937c204
ingadhoc · Apr 19, 2024 · c44635c · c44635c
1 parent d3edbc8
commit c44635c
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/stock_ux/views/stock_move_line_views.xml b/stock_ux/views/stock_move_line_views.xml
@@ -87,6 +87,7 @@
                 <attribute name="invisible">1</attribute>
             </field>
             <field name="product_id" position="after">
+<<<<<<< HEAD
                 <field name="package_id" column_invisible="True"/>
                 <field name="result_package_id" column_invisible="True"/>
                 <field name="quantity" invisible="1"/>
@@ -95,6 +96,25 @@
                 <field name="product_uom_category_id" column_invisible="True"/>
                 <field name="product_uom_id" string="Unit of Measure" groups="uom.group_uom" readonly="1"/>
                 <field name="lots_visible" column_invisible="True"/>
+||||||| parent of e55559fe (temp)
+                <field name="package_id" invisible="1"/>
+                <field name="result_package_id" invisible="1"/>
+                <field name="reserved_qty" invisible="1"/>
+                <field name="picking_id" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="product_uom_category_id" invisible="1"/>
+                <field name="product_uom_id" string="Unit of Measure" groups="uom.group_uom" readonly="1"/>
+                <field name="lots_visible" invisible="1"/>
+=======
+                <field name="package_id" invisible="1"/>
+                <field name="result_package_id" invisible="1"/>
+                <field name="reserved_qty" invisible="1"/>
+                <field name="picking_id" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="product_uom_category_id" invisible="1"/>
+                <field name="product_uom_id" position="move"/>
+                <field name="lots_visible" invisible="1"/>
+>>>>>>> e55559fe (temp)
                 <field name="owner_id" readonly="1"/>
             </field>
             <field name="lot_id" position="attributes">