From e0c1071d59ab142a31abf313f8bf81daa1e5b44c Mon Sep 17 00:00:00 2001
From: Florian Damhaut <flda@odoo.com>
Date: Wed, 8 Dec 2021 10:29:27 +0000
Subject: [PATCH] [FIX] uom: Correct uom creation link

Since 6f182eeeab082b094563836a7a3dc2f4e56375f0 UoM should be created through the UoM category tab as the UoM form view is now unusable.
To ensure that this is the case, we remove menu link to the form view and update the other to lead to UoM category instead.

opw-2702953

closes odoo/odoo#81221

X-original-commit: 58a3954d606d48b2a4cf678eb0bf13d6e28b1aef
Signed-off-by: Damhaut Florian (flda) <flda@odoo.com>
---
 addons/purchase/views/purchase_views.xml               | 2 +-
 addons/sale/views/res_config_settings_views.xml        | 2 +-
 addons/sale_management/views/sale_management_views.xml | 3 ---
 addons/stock/views/res_config_settings_views.xml       | 2 +-
 addons/stock/views/stock_menu_views.xml                | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 7da7e035cee..fdf682124f4 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -43,7 +43,7 @@
             parent="menu_purchase_config" sequence="40" groups="uom.group_uom" />
 
         <menuitem
-              action="uom.product_uom_form_action" id="menu_purchase_uom_form_action"
+              action="uom.product_uom_form_action" id="menu_purchase_uom_form_action" active="False"
               parent="purchase.menu_unit_of_measure_in_config_purchase" sequence="5" groups="base.group_no_one"/>
 
         <menuitem
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 09eb46b66e0..bbf000397bb 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -61,7 +61,7 @@
                                 </div>
                                 <div class="content-group" attrs="{'invisible': [('group_uom','=',False)]}">
                                     <div class="mt8">
-                                        <button name="%(uom.product_uom_form_action)d" icon="fa-arrow-right" type="action" string="Units of Measure" class="btn-link"/>
+                                        <button name="%(uom.product_uom_categ_form_action)d" icon="fa-arrow-right" type="action" string="Units of Measure" class="btn-link"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/sale_management/views/sale_management_views.xml b/addons/sale_management/views/sale_management_views.xml
index 6b838a04e0f..a099504ed27 100644
--- a/addons/sale_management/views/sale_management_views.xml
+++ b/addons/sale_management/views/sale_management_views.xml
@@ -27,9 +27,6 @@
     <record id="sale.next_id_16" model="ir.ui.menu">
         <field name="active" eval="True"/>
     </record>
-    <record id="sale.menu_product_uom_form_action" model="ir.ui.menu">
-        <field name="active" eval="True"/>
-    </record>
     <record id="sale.menu_product_uom_categ_form_action" model="ir.ui.menu">
         <field name="active" eval="True"/>
     </record>
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index afce5fce190..f72fa104a5f 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -298,7 +298,7 @@
                                     </div>
                                     <div class="content-group">
                                         <div class="mt8" attrs="{'invisible': [('group_uom', '=', False)]}">
-                                            <button name="%(uom.product_uom_form_action)d" icon="fa-arrow-right" type="action" string="Units Of Measure" class="btn-link"/>
+                                            <button name="%(uom.product_uom_categ_form_action)d" icon="fa-arrow-right" type="action" string="Units Of Measure" class="btn-link"/>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/stock/views/stock_menu_views.xml b/addons/stock/views/stock_menu_views.xml
index 8a0abc412b3..c21707ca377 100644
--- a/addons/stock/views/stock_menu_views.xml
+++ b/addons/stock/views/stock_menu_views.xml
@@ -35,7 +35,7 @@
         parent="stock.menu_product_in_config_stock"  sequence="35" groups="uom.group_uom"/>
 
     <menuitem id="menu_stock_uom_form_action" action="uom.product_uom_form_action"
-        name="UoM"
+        name="UoM" active="False"
         parent="product_uom_menu" sequence="35" groups="base.group_no_one"/>
 
     <menuitem id="menu_stock_inventory_control" name="Products" parent="menu_stock_root" sequence="4"/>