From ad114aa4bea3516c026f26693ef4f517ff7159eb Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Fri, 1 Oct 2010 17:51:35 +0530
Subject: [PATCH] [IMP]: Purchase Dashboard.

bzr revid: rch_open_erp-20101001122135-gt5spyszlo18tttp
---
 addons/account/board_account_view.xml     |  2 +-
 addons/purchase/board_purchase_view.xml   | 99 ++++++++++++++++++++++-
 addons/purchase/report/purchase_report.py |  3 +
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index cc6c6187a83..9823960b0e2 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -48,8 +48,8 @@
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f5b131a69f5..6bbbe0e73e7 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -8,7 +8,7 @@
             parent="base.next_id_73" sequence="0"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
-            <field name="name">Draft Purchases</field>
+            <field name="name">Request for Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Quotation Request</field>
+            <field name="name">Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -26,6 +26,92 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
 
+		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+            <field name="name">purchase.order.monthly.categ.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Monthly Purchase by Category">
+                    <field name="month"/>
+                    <field name="price_total"/>
+                    <field name="category_id"/>
+                </tree>
+            </field>
+        </record>
+    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+            <field name="name">purchase.order.monthly.categ.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Monthly Purchase by Category" type="bar">
+                    <field name="month"/>
+                    <field name="price_total" operator="+"/>
+                    <field name="category_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+	    <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
+	        <field name="name">Monthly Purchase by Category</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
+            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
+	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
+            <field name="name">negotiation.by.supplier.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Negotiation by Supplier">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
+            <field name="name">negotiation.by.supplier.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Negotiation by Supplier" type="bar">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </graph>
+            </field>
+        </record>
+		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
+	        <field name="name">Negotiation by Supplier</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
+            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
@@ -34,13 +120,22 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_current_purchases)d" string="Current purchases"  width="510"/>
                             <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
+                        -->
+                        	<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations"  width="510"/>
+                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Waiting Approval"  width="510"/>
                         </child1>
                         <child2>
+                        	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
+                            <action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier"  />
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
                             <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
                             <action colspan="4" height="220" name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"  />
+                        -->
+
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 612ea134b4e..f30d65d8f28 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -65,6 +65,7 @@ class purchase_report(osv.osv):
         'nbr': fields.integer('# of Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'category_id': fields.many2one('product.category', 'Category', readonly=True)
 
     }
     _order = 'name desc,price_total desc'
@@ -90,6 +91,7 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     l.product_id,
+                    t.categ_id as category_id,
                     l.product_uom as product_uom,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
@@ -123,6 +125,7 @@ class purchase_report(osv.osv):
                     s.validator,
                     s.dest_address_id,
                     l.product_id,
+                    t.categ_id,
                     s.date_order,
                     to_char(s.date_order, 'YYYY'),
                     to_char(s.date_order, 'MM'),