From c4f64767c96b17919bce61aab9fa41b99daa0d1c Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Wed, 25 Apr 2018 19:22:17 +0200
Subject: [PATCH] various fixes

---
 stock_request/views/stock_request_menu.xml  | 34 ++++++++++++++++-----
 stock_request/views/stock_request_views.xml | 12 ++++++--
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/stock_request/views/stock_request_menu.xml b/stock_request/views/stock_request_menu.xml
index d5c411ae1..c08c1105c 100644
--- a/stock_request/views/stock_request_menu.xml
+++ b/stock_request/views/stock_request_menu.xml
@@ -7,21 +7,39 @@
         sequence="100"/>
 
     <menuitem
-        id="menu_stock_request"
-        action="action_stock_request_form"
-        name="Stock Requests" parent="menu_stock_request_root"
-        sequence="20"/>
+        id="menu_stock_request_operations"
+        parent="menu_stock_request_root"
+        name="Operations"
+        sequence="10"/>
 
     <menuitem id="stock_request_order_menu"
-              name="Stock Requests Orders"
-              parent="menu_stock_request_root"
+              name="Stock Request Orders"
+              parent="menu_stock_request_operations"
               action="stock_request_order_action"
               groups="group_stock_request_order"
-              sequence="10"/>
+              sequence="20"/>
+
+    <menuitem
+        id="menu_stock_request"
+        action="action_stock_request_form"
+        name="Stock Requests" parent="menu_stock_request_operations"
+        sequence="30"/>
+
+    <menuitem
+        id="menu_stock_request_master_data"
+        parent="menu_stock_request_root"
+        name="Master Data"
+        sequence="100"/>
+
+    <menuitem
+        id="menu_stock_request_master_data"
+        parent="menu_stock_request_root"
+        name="Master Data"
+        sequence="100"/>
 
     <menuitem id="menu_stock_request_config" name="Settings"
               parent="menu_stock_request_root"
-              sequence="99" action="action_stock_request_config"
+              sequence="999" action="action_stock_request_config"
               groups="base.group_system"/>
 
 </odoo>
diff --git a/stock_request/views/stock_request_views.xml b/stock_request/views/stock_request_views.xml
index 6cb4fc96a..385321446 100644
--- a/stock_request/views/stock_request_views.xml
+++ b/stock_request/views/stock_request_views.xml
@@ -89,8 +89,6 @@
                         </group>
                         <group>
                             <field name="warehouse_id" widget="selection" groups="stock.group_stock_multi_locations"/>
-                            <field name="product_uom_id"
-                                   options="{'no_open': True, 'no_create': True}" groups="product.group_uom"/>
                             <field name="location_id" groups="stock.group_stock_multi_locations"
                                    domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
                             <field name="route_id"
@@ -101,7 +99,15 @@
                             <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                         </group>
                         <group name="quantities">
-                            <field name="product_uom_qty"/>
+                            <label for="product_uom_qty"/>
+                            <div>
+                                <field name="product_uom_qty"
+                                       class="oe_inline"/>
+                                <field name="product_uom_id"
+                                       class="oe_inline"
+                                       options="{'no_open': True, 'no_create': True}"
+                                       groups="product.group_uom"/>
+                            </div>
                             <field name="qty_in_progress" />
                             <field name="qty_done" />
                         </group>