From 4c13b11230533df378be13c2cb2585bb458ccfb1 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 28 Sep 2015 14:51:48 +0200
Subject: [PATCH] [IMP] stock: menuitems displayed twice

Rename 'Serial Numbers' menuitem into 'Serial Numbers / Lots'
Move Ugly Unpack button on the header in stock.quant.package form view
Remove doublon menuitem for action 'product_uom_form_action'
---
 addons/stock/stock_view.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 74846cb4a1f..26d72aaef96 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -18,9 +18,6 @@
         <menuitem
             id="menu_product_in_config_stock" name="Products"
             parent="stock.menu_stock_config_settings" sequence="4"/>
-        <menuitem
-            id="menu_packs_config" name="Packs"
-            parent="stock.menu_stock_config_settings" sequence="5" groups="base.group_no_one"/>
         <menuitem
             action="product.product_uom_form_action" id="menu_stock_uom_form_action"
             parent="menu_stock_config_settings" sequence="35" groups="product.group_uom"/>
@@ -188,7 +185,8 @@
             <field name="name">stock.production.lot.form</field>
             <field name="model">stock.production.lot</field>
             <field name="arch" type="xml">
-                <form string="Serial Number">
+                <form string="Serial Number / Lots">
+                    <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button name="action_traceability" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="object" attrs="{'invisible': [('quant_ids','=',[])]}"/>
                     </div>
@@ -216,6 +214,7 @@
                              </field>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -223,7 +222,7 @@
             <field name="name">stock.production.lot.tree</field>
             <field name="model">stock.production.lot</field>
             <field name="arch" type="xml">
-                <tree string="Serial Number">
+                <tree string="Serial Number / Lots">
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="product_id"/>
@@ -247,7 +246,7 @@
         </record>
 
         <record id="action_production_lot_form" model="ir.actions.act_window">
-            <field name="name">Serial Numbers</field>
+            <field name="name">Serial Numbers / Lots</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.production.lot</field>
             <field name="view_type">form</field>
@@ -2068,9 +2067,11 @@
             <field eval="10" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Package">
+                    <header>
+                        <button name="unpack" string="Unpack" type="object" groups="base.group_no_one"/>
+                    </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="unpack" string="Unpack" type="object" groups="base.group_no_one"/>
                             <button class="oe_stat_button" name="%(action_picking_tree_all)d"
                             string="Package Transfers" type="action"
                             widget="statinfo" icon="fa-dropbox"/>
@@ -2158,9 +2159,7 @@
             </field>
         </record>
         <menuitem id="menu_package" name="Packages" parent="menu_stock_inventory_control" action="action_package_view" groups="stock.group_tracking_lot" sequence="102"/>
-        <menuitem id="menu_package_config" name="Packages" parent="menu_packs_config" action="action_package_view" groups="stock.group_tracking_lot" sequence="2"/>
         <menuitem id="menu_packagings" name="Packagings" parent="stock.menu_warehouse_report" action="product.action_packaging_view" groups="product.group_stock_packaging" sequence="3"/>
-        <menuitem id="menu_packagings_config" name="Packagings" parent="menu_packs_config" action="product.action_packaging_view" groups="product.group_stock_packaging" sequence="3"/>