From 79ae96be00fd5c8983a0b235ea90883bdc08134d Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 7 Jan 2015 15:59:49 +0100
Subject: [PATCH] [IMP] warehouse: cleaner menus and filters added

---
 addons/procurement/procurement_view.xml       |  17 ++-
 addons/product/product_view.xml               |  42 ++++---
 addons/stock/stock_view.xml                   | 109 ++++++++++++------
 .../stock_landed_costs_view.xml               |   5 +-
 4 files changed, 117 insertions(+), 56 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 09bfcf1a779..ddc6ceed00f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -158,16 +158,16 @@
         </record>
         
         <record id="procurement_exceptions" model="ir.actions.act_window">
-            <field name="name">Procurements</field>
+            <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                 Click to create a Procurement.
+                 Click to create a Procurement Exception, or remove the filter on the search bar to display all the procurements.
               </p>
               <p>
                 <b>Procurement Orders</b> represent the need for a certain quantity of products, at a given time, in a given location.
@@ -192,6 +192,17 @@
         </record>
 
         <!-- Procurement Rules -->
+
+        <record id="view_procurement_rule_filter" model="ir.ui.view">
+            <field name="name">procurement.rule.select</field>
+            <field name="model">procurement.rule</field>
+            <field name="arch" type="xml">
+                <search string="Search Procurement">
+                    <filter string="Global" name="route_false" domain="[('route_id','=',False)]" help="If the route is global"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_procurement_rule_tree">
             <field name="name">procurement.rule.tree</field>
             <field name="model">procurement.rule</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 294861c1689..a1ea0d13ca7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -560,7 +560,7 @@
             parent="base.menu_product"
             sequence="30" groups="base.group_no_one"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
-            <field name="name">Internal Categories</field>
+            <field name="name">Product Categories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.category</field>
             <field name="view_type">form</field>
@@ -734,12 +734,18 @@
         <menuitem
             action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
+        <record model="ir.actions.act_window" id="action_packaging_view">
+            <field name="name">Packagings</field>
+            <field name="res_model">product.packaging</field>
+        </record>
+
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
                     <field name="sequence" widget="handle"/>
+                    <field name="name"/>
                     <field name="product_tmpl_id"/>
                     <field name="barcode"/>
                     <field name="qty"/>
@@ -768,22 +774,24 @@
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <form string="Packaging">
-                    <group col="4">
-                        <field name="product_tmpl_id"/>
-                        <newline/>
-                        <field name="barcode"/>
-                        <field name="sequence" invisible="1"/>
-                        <newline/>
-                        <field name="qty"/>
-                        <field name="ul"/>
-                        <separator colspan="4" string="Palletization"/>
-                        <field name="ul_qty"/>
-                        <field name="rows"/>
-                        <field name="ul_container"/>
-                        <field name="weight"/>
-                        <separator colspan="4" string="Other Info"/>
-                        <field colspan="4" name="name"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="product_tmpl_id"/>
+                            <newline/>
+                            <field name="barcode"/>
+                            <field name="sequence" invisible="1"/>
+                            <newline/>
+                            <field name="qty"/>
+                            <field name="ul"/>
+                            <separator colspan="4" string="Palletization"/>
+                            <field name="ul_qty"/>
+                            <field name="rows"/>
+                            <field name="ul_container"/>
+                            <field name="weight"/>
+                            <separator colspan="4" string="Other Info"/>
+                            <field colspan="4" name="name"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9447f35e613..6886569f72a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -9,29 +9,32 @@
             sequence="70"/>
 
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
-        <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
-            parent="stock.menu_stock_product" sequence="2" groups="base.group_no_one"/>
-        <menuitem action="product.product_template_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_no_one"/>
-        <menuitem id="menu_schedulers_config" name="Schedulers Management" parent="stock.menu_stock_configuration" sequence="2" groups="base.group_no_one"/>
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_reordering_rules_config" name="Schedulers Management" parent="menu_stock_configuration" sequence="3" groups="base.group_no_one"/>
+        <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_configuration" sequence="2" groups="base.group_no_one"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+
+
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
         <menuitem
             id="menu_product_in_config_stock" name="Products"
-            parent="stock.menu_stock_configuration" sequence="3" groups="base.group_no_one"/>
+            parent="stock.menu_stock_configuration" sequence="4" groups="base.group_no_one"/>
+        <menuitem
+            id="menu_packs_config" name="Packs"
+            parent="stock.menu_stock_configuration" sequence="5" groups="base.group_no_one"/>
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_stock"
             parent="stock.menu_product_in_config_stock" sequence="2"/>
         <menuitem
-            action="product.product_normal_action" id="menu_product_variant_config_stock"
-            parent="stock.menu_stock_product" sequence="3"/>
+            action="product.product_normal_action" id="menu_product_variant_config_stock" name="Products"
+            parent="stock.menu_traceability" sequence="5"/>
         <menuitem
             action="product.product_template_action" id="menu_product_template_config_stock"
             parent="stock.menu_product_in_config_stock" sequence="1"/>
         <menuitem
             action="product.product_ul_form_action" groups="product.group_stock_packaging"
-            id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="3"/>
+            id="menu_product_packaging_stock_action" parent="stock.menu_packs_config" sequence="99"/>
         <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
             parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
@@ -186,10 +189,6 @@
         </record>
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
-
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
-            sequence="3"/>
-
         <record id="view_production_lot_form" model="ir.ui.view">
             <field name="name">stock.production.lot.form</field>
             <field name="model">stock.production.lot</field>
@@ -276,7 +275,7 @@
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
             parent="menu_traceability" groups="stock.group_production_lot"
-            sequence="2"/>
+            sequence="1"/>
 
         #
         # Lot composition (history)
@@ -425,6 +424,16 @@
             </field>
         </record>
 
+        <record id="stock_location_path_filter" model="ir.ui.view">
+            <field name="name">stock.location.path.select</field>
+            <field name="model">stock.location.path</field>
+            <field name="arch" type="xml">
+                <search string="Search Stock Location Paths">
+                    <filter string="Global" name="route_false" domain="[('route_id','=',False)]" help="If the route is global"/>
+                </search>
+            </field>
+        </record>
+
         <record id="stock_location_path_tree" model="ir.ui.view">
             <field name="name">stock.location.path.tree</field>
             <field name="model">stock.location.path</field>
@@ -447,6 +456,7 @@
                             <field name="name"/>
                             <field name="location_from_id"/>
                             <field name="location_dest_id"/>
+                            <field name="route_id"/>
                         </group>
                         <group>
                             <field name="company_id" groups="base.group_multi_company" />
@@ -781,6 +791,8 @@
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
 
+        <menuitem id="all_picking" name="All Transfers" parent="menu_stock_warehouse_mgmt" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
+
         <record id="action_picking_tree_done" model="ir.actions.act_window">
             <field name="name">Done Transfers</field>
             <field name="res_model">stock.picking</field>
@@ -1196,7 +1208,7 @@
             <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1" groups="stock.group_locations"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="18" groups="stock.group_locations"/>
 
         <!--
             Receipt Picking (By Stock Move)
@@ -1305,7 +1317,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="4"/>
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="5"/>
 
          <record id="view_pickingtype_filter" model="ir.ui.view">
             <field name="name">stock.picking.type.filter</field>
@@ -1357,7 +1369,6 @@
             </field>
         </record>
 
-
         <record id="stock_picking_type_kanban" model="ir.ui.view">
             <field name="name">stock.picking.type.kanban</field>
             <field name="model">stock.picking.type</field>
@@ -1399,11 +1410,11 @@
                                                 <field name="last_done_picking" widget="sparkline_bar" options="{'type': 'tristate', 'colorMap': {'0': 'orange', '-1': 'red', '1': 'green'}}">Last 10 Done Operations</field>
                                             </a>
                                             <t t-if="record.count_picking_waiting.raw_value &gt; 0">
-                                                 <a name="%(action_picking_tree_waiting)d" type="action" class="col-md-12">
-                                                     <field name="count_picking_waiting"/> Waiting Availability
-                                                 </a>
-                                             </t>
-                                             <a class="col-md-9" name="%(action_picking_tree)d" type="action">All Operations</a>
+                                                <a name="%(action_picking_tree_waiting)d" type="action" class="col-md-12">
+                                                    <field name="count_picking_waiting"/> Waiting Availability
+                                                </a>
+                                            </t>
+                                            <a class="col-md-9" name="%(action_picking_tree)d" type="action">Transfers</a>
                                         </div>
                                     </div>
                                     <div class="row">
@@ -1425,7 +1436,7 @@
         </record>
 
         <record id="action_picking_type_form" model="ir.actions.act_window">
-            <field name="name">All Operations</field>
+            <field name="name">Overview</field>
             <field name="res_model">stock.picking.type</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1441,6 +1452,22 @@
               </p>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="view_picking_type_list">
+            <field name="name">stock.picking.type.list</field>
+            <field name="model">stock.picking.type</field>
+            <field name="arch" type="xml">
+                <tree string="Picking Types">
+                    <field name="name"/>
+                    <field name="sequence_id"/>
+                    <field name="warehouse_id"/>
+                    <field name="code" on_change="onchange_picking_code(code)"/>
+                    <field name="return_picking_type_id"/>
+                    <field name="default_location_src_id" attrs="{'required': [('code', '=', 'internal')]}"/>
+                    <field name="default_location_dest_id" attrs="{'required': [('code', 'in', ('internal', 'incoming'))]}"/>
+                </tree>
+            </field>
+        </record>
         
         <record id="action_picking_type_list" model="ir.actions.act_window">
             <field name="name">All Operations</field>
@@ -1450,6 +1477,8 @@
             <field name="view_mode">list,form</field>            
         </record>
 
+        <menuitem id="stock_picking_type_config" action="action_picking_type_list" name="Picking Types" parent="stock.menu_routes_config" sequence="2" groups="base.group_no_one"/>
+
         <menuitem
             action="action_picking_type_form"
             id="menu_action_picking_type_form"
@@ -1632,10 +1661,16 @@
         </record>
         
         <record model="ir.actions.act_window" id="procrules">
-            <field name="context">{}</field>
+            <field name="context">{'search_default_route_false':1}</field>
             <field name="name">Pull Rules</field>
             <field name="res_model">procurement.rule</field>
         </record>
+
+        <record model="ir.actions.act_window" id="stolocpath">
+            <field name="context">{'search_default_route_false':1}</field>
+            <field name="name">Push Rules</field>
+            <field name="res_model">stock.location.path</field>
+        </record>
         
         <record id="quant_search_view" model="ir.ui.view">
             <field name="name">stock.quant.search</field>
@@ -1736,16 +1771,17 @@
         </record>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="stock.group_stock_manager"/>
+        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="3" groups="stock.group_stock_manager"/>
         <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" groups="base.group_no_one" sequence="2"/>
         <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/>
         <menuitem action="procurement.procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
-        <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_schedulers_config" sequence="1"/>
+        <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_reordering_rules_config" sequence="1"/>
         <menuitem id="stock.next_id_61" name="Warehouse" sequence="40" parent="base.menu_reporting" groups="group_stock_manager"/>
-        <menuitem id="menu_quants" name="Quants" parent="menu_traceability" sequence="20" action="quantsact" groups="base.group_no_one"/>
-        <menuitem id="menu_procurement_rules" name="Procurement Rules" parent="stock.menu_schedulers_config" action="procrules" groups="base.group_no_one" sequence="2"/>
-        <menuitem id="menu_pickingtype" name="Operations Types" parent="stock.menu_warehouse_config" action="action_picking_type_list" sequence="3"/>
+        <menuitem id="menu_quants" name="Quantitative Valuation" parent="menu_traceability" sequence="20" action="quantsact" groups="base.group_no_one"/>
+        <menuitem id="menu_procurement_rules" name="Global Procurement Rules" parent="stock.menu_routes_config" action="procrules" groups="base.group_no_one" sequence="3"/>
+        <menuitem id="menu_stock_location_path" name="Global Push Rules" parent="stock.menu_routes_config" action="stolocpath" groups="base.group_no_one" sequence="4"/>
+        <menuitem id="menu_pickingtype" name="Operations Types" parent="stock.menu_warehouse_config" action="action_picking_type_list" sequence="4"/>
 
 
         <record model="ir.actions.act_window" id="product_open_orderpoint">
@@ -1768,7 +1804,10 @@
                 <form string="Package">
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="unpack" string="Unpack" type="object"/>
+                            <button class="oe_inline" name="unpack" string="Unpack" type="object"/>
+                            <button class="oe_inline oe_stat_button" name="%(action_picking_tree_all)d"
+                            string="Package Transfers" type="action" 
+                            widget="statinfo" icon="fa-dropbox"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" string="Package Reference" class="oe_edit_only"/>
@@ -1859,7 +1898,11 @@
                 </p>
             </field>
         </record>
-        <menuitem id="menu_package" name="Packages" parent="menu_stock_product" action="action_package_view" groups="stock.group_tracking_lot" sequence="4"/>
+        <menuitem id="menu_package" name="Packages" parent="menu_traceability" action="action_package_view" groups="stock.group_tracking_lot" sequence="2"/>
+        <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="menu_traceability" 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"/>
+
         
         
         <!--Routes-->
@@ -1935,7 +1978,7 @@
         </record>
         
         <menuitem action="action_routes_form" id="menu_stock_routes"
-            parent="stock.menu_schedulers_config" sequence="3" />
+            parent="stock.menu_routes_config" sequence="1" />
 
         <record id="do_view_pickings" model="ir.actions.act_window">
             <field name="name">Pickings for Groups</field>
diff --git a/addons/stock_landed_costs/stock_landed_costs_view.xml b/addons/stock_landed_costs/stock_landed_costs_view.xml
index 028740f3499..17a7c414508 100644
--- a/addons/stock_landed_costs/stock_landed_costs_view.xml
+++ b/addons/stock_landed_costs/stock_landed_costs_view.xml
@@ -154,8 +154,7 @@
         </record>
 
         <!-- Stock Landed Cost Menu -->
-        <menuitem name="Landed Costs" parent="stock.menu_stock_root" id="menu_stock_landed_cost_main" sequence="1"/>
-        <menuitem action="action_stock_landed_cost" name="Landed Costs" parent="menu_stock_landed_cost_main" id="menu_stock_landed_cost" sequence="1"/>
+        <menuitem action="action_stock_landed_cost" name="Landed Costs" parent="stock.menu_stock_inventory_control" id="menu_stock_landed_cost" sequence="99"/>
 
         <!-- Stock Landed Cost Type View -->
         <record id="view_stock_landed_cost_type_form" model="ir.ui.view">
@@ -251,7 +250,7 @@
            <field name="act_window_id" ref="stock_landed_cost_type_action"/>
         </record>
 
-	<menuitem action="stock_landed_cost_type_action" name="Landed Cost Type" parent="stock.menu_warehouse_config" id="menu_stock_landed_cost_type" sequence="5"/>
+	<menuitem action="stock_landed_cost_type_action" name="Landed Cost Type" parent="stock.menu_warehouse_config" id="menu_stock_landed_cost_type" sequence="3"/>
 
     </data>
 </openerp>