From 9502276166f95c451773a7c7358c83a6d4703f6e Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 10 Feb 2014 11:07:27 +0100
Subject: [PATCH] [FIX]work on view for better usability

bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
---
 addons/delivery/delivery_view.xml             |  2 +-
 addons/product/product.py                     |  2 +-
 addons/sale_stock/stock_view.xml              | 11 --------
 addons/stock/stock.py                         |  4 +--
 addons/stock/stock_view.xml                   | 26 +++++++++++++++----
 addons/stock/wizard/stock_move_view.xml       |  3 +--
 .../stock_picking_wave/stock_picking_wave.py  |  5 +---
 .../stock_picking_wave_demo.xml               |  4 ---
 .../stock_picking_wave_view.xml               | 15 +----------
 9 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 237d18b5b49..d8560b2394c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -235,13 +235,13 @@
                     <group>
                         <field name="carrier_id"/>
                         <field name="carrier_tracking_ref"/>
-                        <field name="number_of_packages"/>
                     </group>
                     <group>
                         <label for="weight" string="Weight"/>
                         <div>
                             <field name="weight" class="oe_inline"/>
                             <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+                            <field name="number_of_packages"/>
                         </div>
                         <field name="weight_net" groups="base.group_no_one"/>
                     </group>
diff --git a/addons/product/product.py b/addons/product/product.py
index 2bb6dfe8c5e..bd5acf731e6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -130,7 +130,7 @@ class product_uom(osv.osv):
     _order = "name"
     _columns = {
         'name': fields.char('Unit of Measure', required=True, translate=True),
-        'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
+        'category_id': fields.many2one('product.uom.categ', 'Product Category', required=True, ondelete='cascade',
             help="Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."),
         'factor': fields.float('Ratio', required=True,digits=(12, 12),
             help='How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n'\
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index 9d03ecd3e57..2c7c80ba25f 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -30,17 +30,6 @@
                 </xpath>
             </field>
         </record>
-        <record id="stock_location_route_tree_inherit" model="ir.ui.view">
-            <field name="name">stock.location.route.tree.inherit</field>
-            <field name="inherit_id" ref="stock.stock_location_route_tree"/>
-            <field name="model">stock.location.route</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='warehouse_selectable']" position="after">
-                    <field name="sale_selectable"/>
-                </xpath>
-            </field>
-        </record>
-
 
     </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4ee6f3a926b..a275d8f35ae 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -111,7 +111,7 @@ class stock_location(osv.osv):
         'parent_right': fields.integer('Right Parent', select=1),
 
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
-        'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
+        'scrap_location': fields.boolean('Is a Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
         'removal_strategy_ids': fields.one2many('product.removal', 'location_id', 'Removal Strategies'),
         'putaway_strategy_ids': fields.one2many('product.putaway', 'location_id', 'Put Away Strategies'),
     }
@@ -2415,7 +2415,7 @@ class stock_warehouse(osv.osv):
     _description = "Warehouse"
 
     _columns = {
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Warehouse Name', size=128, required=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'partner_id': fields.many2one('res.partner', 'Address'),
         'view_location_id': fields.many2one('stock.location', 'View Location', required=True, domain=[('usage', '=', 'view')]),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 303785da294..de46d21dc2b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1016,6 +1016,18 @@
             </field>
         </record>
 
+        <record id="view_move_graph" model="ir.ui.view">
+            <field name="name">stock.move.graph</field>
+            <field name="model">stock.move</field>
+            <field name="arch" type="xml">
+                <graph string="Stock Moves Analysis" type="pivot">
+                    <field name="product_id" type="row"/>
+                    <field name="location_dest_id" groups="stock.group_locations" type="row"/>
+                    <field name="product_uom_qty" type="measure"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
@@ -1254,6 +1266,13 @@
         <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
+        <record model="ir.actions.act_window.view" id="action_stock_move_graph_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_move_graph"/>
+        <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3" groups="stock.group_locations"/>
 
         <record id="action_stock_stock_ui" model="ir.actions.client">
@@ -2072,9 +2091,6 @@
                 <tree string="Routes">
                     <field name="sequence" widget="handle" />
                     <field name="name"/>
-                    <field name="product_selectable"/>
-                    <field name="product_categ_selectable"/>
-                    <field name="warehouse_selectable"/>
                 </tree>
             </field>
         </record>
@@ -2093,10 +2109,10 @@
                     <group>
                         <group>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="sequence" string="Sequence" groups="base.group_no_one"/>
+                            <field name="active" groups="stock.group_adv_location" />
                         </group>
                         <group>
-                            <field name="active" groups="stock.group_adv_location" />
+                            <field name="sequence" string="Sequence" groups="base.group_no_one"/>
                         </group>
                     </group>
                     <separator string="Applicable On"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 8c90b27960f..c71db88a8e1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,7 +8,6 @@
             <field name="model">stock.move.scrap</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
                         <label for="product_qty"/>
@@ -22,7 +21,7 @@
                             domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
                     <footer>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        <button name="move_scrap" string="Scrap Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index fa70f61c3bd..5050fe06996 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -6,12 +6,9 @@ class stock_picking_wave(osv.osv):
     _name = "stock.picking.wave"
     _order = "name desc"
     _columns = {
-        'name': fields.char('name', required=True, help='Name of the picking wave'),
+        'name': fields.char('Picking wave name', required=True, help='Name of the picking wave'),
         'user_id': fields.many2one('res.users', 'Responsible', help='Person responsible for this wave'),
-        'time': fields.float('Time', help='Time it will take to perform the wave'),
         'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', help='List of picking associated to this wave'),
-        'capacity': fields.float('Capacity', help='The capacity of the transport used to get the goods'),
-        'capacity_uom': fields.many2one('product.uom', 'Unit of Measure', help='The Unity Of Measure of the transport capacity'),
         'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
     }
 
diff --git a/addons/stock_picking_wave/stock_picking_wave_demo.xml b/addons/stock_picking_wave/stock_picking_wave_demo.xml
index 0ef026422ec..890adf104f6 100644
--- a/addons/stock_picking_wave/stock_picking_wave_demo.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_demo.xml
@@ -6,15 +6,11 @@
 	        -->
 		<record id="stock_picking_wave_dry_1" model="stock.picking.wave">
 	        <field name="name">Picking Dry for John</field>
-	        <field name="capacity">15</field>
-	        <field name="capacity_uom" ref="product.product_uom_ton" />   
 			<field name="state">in_progress</field>   
 	    </record>
 	        
 		<record id="stock_picking_wave_freeze_1" model="stock.picking.wave">
 	        <field name="name">Picking Freeze for Mickael</field>
-	        <field name="capacity">600</field>   
-			<field name="capacity_uom" ref="product.product_uom_kgm" />			
 			<field name="state">in_progress</field>
 	    </record>
 	
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
index c6f920e01d2..450232603e1 100644
--- a/addons/stock_picking_wave/stock_picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -21,17 +21,7 @@
                             </h1>
                         </div>
                         <group>
-                            <group>
-                                <field name="user_id"/>
-                            </group>
-                            <group>
-                                <label for="capacity"/>
-                                <div>
-                                    <field name="capacity" class="oe_inline"/>
-                                    <field name="capacity_uom" class="oe_inline"/>
-                                </div>
-                                <field name="time" widget="float_time"/>
-                            </group>
+                            <field name="user_id"/>
                         </group>
                         <separator string="Pickings"/>
                         <field name="picking_ids" widget="many2many" domain="[('state', 'not in', ('done', 'cancel'))]">
@@ -60,9 +50,6 @@
                 <tree string="Stock Picking Waves" colors="black:state in ('in_progress','done');grey: state=='cancel'">
                     <field name="name"/>
                     <field name="user_id"/>
-                    <field name="capacity"/>
-                    <field name="capacity_uom"/>
-                    <field name="time" widget="float_time"/>
                     <field name="state"/>
                 </tree>
             </field>