From 294fd19e253f80d236ecdbcd8ba4275bc653c263 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Tue, 7 Dec 2010 18:32:48 +0530
Subject: [PATCH] [IMP]: Warehouse Dashboard.

bzr revid: rch@rch-desktop-20101207130248-o133n2sqjtfwzqoh
---
 .../procurement/board_mrp_procurement_view.xml   |  8 ++++----
 addons/stock/board_warehouse_view.xml            | 16 ++++++++--------
 addons/stock/report/report_stock_move_view.xml   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index 3b18a876f4f..bf11fe79166 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -8,16 +8,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
-			<field name="view_id" ref="procurement.procurement_tree_view_board"/>            
+			<field name="view_id" ref="procurement.procurement_tree_view_board"/>
         </record>
         <record id="board_mrp_procurement_form" model="ir.ui.view">
             <field name="name">board.mrp.procurement.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="stock.board_warehouse_form"/>              
+			<field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" />
+      		<xpath expr="/form/hpaned/child1/action[@string='Incoming Product']" position="before">
+				<action colspan="4" name="%(procurement_action_board)d" string="Procurements in Exception" width="510" />
 			</xpath>
             </field>
         </record>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index fd68f0a2eb5..b073be73575 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -12,7 +12,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
+            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
@@ -22,7 +22,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
+            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
@@ -30,7 +30,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','in')]</field>
+            <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
             <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
@@ -38,7 +38,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','out')]</field>
+            <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
             <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
@@ -50,13 +50,13 @@
                 <form string="Warehouse board">
                     <hpaned position="200">
                         <child1>
-                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
-                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
+                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product"  width="510"/>
+                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" width="510"/>
                         </child1>
 
                         <child2>
-                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
-                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
+                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" />
+                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 507f475a13e..5de557ebc01 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -33,7 +33,7 @@
                 <field name="value"  sum="Total value"/>
                 <field name="day_diff1"/>
                 <field name="day_diff"/>
-                <field name="day_diff2"/>
+                <field name="day_diff2" string="Delay(Days)"/>
            </tree>
         </field>
     </record>
@@ -56,7 +56,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="day"/>
-                 <field name="day_diff2" operator="+"/>
+                 <field name="day_diff2" operator="+" string="Delay(Days)"/>
              </graph>
          </field>
     </record>