[FIX] stock_ux: duplicated field product_uom_id in tree view

X-original-commit: 937c204
ingadhoc · Apr 4, 2024 · c0787a1 · c0787a1
1 parent 9234298
commit c0787a1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/stock_ux/__manifest__.py b/stock_ux/__manifest__.py
@@ -19,7 +19,13 @@
 ##############################################################################
 {
     'name': 'Stock UX',
+<<<<<<< HEAD
     'version': "17.0.1.0.0",
+||||||| parent of e55559fe (temp)
+    'version': "16.0.2.18.0",
+=======
+    'version': "16.0.2.19.0",
+>>>>>>> e55559fe (temp)
     'category': 'Warehouse Management',
     'sequence': 14,
     'summary': '',

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">