From e4bd0cf2e5958f4197d4ed77f50c611b494d099d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 11 Dec 2011 12:28:50 +0100
Subject: [PATCH] [FIX] improvements in some dashboards

bzr revid: fp@tinyerp.com-20111211112850-y760tc5jupyjp34l
---
 addons/crm/board_crm_view.xml                 |   2 +-
 addons/document/board_document_view.xml       |  12 +--
 .../document/report/document_report_view.xml  |   8 --
 addons/event/board_association_view.xml       |   2 +-
 .../board_project_issue_view.xml              |  20 ++--
 addons/purchase/board_purchase_view.xml       | 100 +++++-------------
 addons/purchase/purchase_view.xml             |   7 +-
 .../purchase/report/purchase_report_view.xml  |  95 +----------------
 8 files changed, 45 insertions(+), 201 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index d8c4ddf159c..5d64bf20093 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -99,7 +99,7 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                     <form string="Sales Dashboard">
-                         <board style="1-1">
+                         <board style="2-1">
                             <column>
                                 <action string="My Opportunities"
                                     name="%(act_my_oppor)d" creatable="true"/>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 471b2966be5..335462c387f 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -7,20 +7,16 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1" >
+                     <board style="2-1" >
                         <column>
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
+                        </column>
+                        <column>
                             <action string="File Size by Month"
                                 name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
-                        </column>
-                        <column>
-                            <action string="Files by Resource Type"
-                                name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>
-
                             <action string="Files by Partner"
                                 name="%(document.action_view_files_by_partner)d"
                                 view_mode="graph,tree"/>
@@ -65,7 +61,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1">
+                     <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
                                 name="%(document.action_view_wall)d"
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e7fa4efb5be..e6e1847cd56 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -120,14 +120,6 @@
         </record>
 
 
-        <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph">
-            <field name="name">Files by Resource Type</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_document_by_resourcetype_graph"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
 <!--***************************************************************************************-->
 
     <record model="ir.ui.view" id="view_size_month">
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 47c5e65f196..02d45f03dc1 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -40,7 +40,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Association Dashboard">
-                    <board style="1-1">
+                    <board style="2-1">
                         <column>
                             <action string="Next Events"
                                 name="%(act_event_view)d"
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 216f01eba9f..4553276057f 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,14 +56,14 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Issues Dashboard">
+                    <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
                             <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
                         </column>
                         <column>
-	                        <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
                             <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
                         </column>
                     </board>
@@ -80,7 +80,7 @@
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
-         	icon="terp-graph"
+             icon="terp-graph"
             action="open_board_project_issue"/>
 
     <!-- For Project Dashboard -->
@@ -147,12 +147,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-						<action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
-            	</xpath>
-            	<xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-						<action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
-            	</xpath>
+                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
+                </xpath>
+                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 04a9b47abe3..0bb34e3713b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -13,7 +13,8 @@
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="context">{'quotation_only': True}</field>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -24,7 +25,7 @@
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
         </record>
 
-		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+        <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>
@@ -47,7 +48,7 @@
                 </tree>
             </field>
         </record>
-    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+        <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>
@@ -59,92 +60,41 @@
                 </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="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</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">
+        <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="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
+            <field name="domain">[('state','in',('approved','except_picking','except_invoice','done'))]</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>
+        <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="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</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>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Purchase Dashboard">
+                    <board style="2-1">
                         <column>
-                        <!--
-                            <action name="%(purchase.action_current_purchases)d" string="Current purchases"/>
-                            <action name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"/>
-                        -->
-                        	<action name="%(purchase_draft)d" string="Request for Quotations"/>
+                            <action name="%(purchase_draft)d" string="Request for Quotations"/>
                         </column>
                         <column>
-                        	<action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"/>
-                        <!--
-                            <action name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"/>
-                            <action name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"/>
-                            <action name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"/>
-                        -->
-
+                            <action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchases by Category"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 90acbf4ecfd..b61a33ed73b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -315,11 +315,10 @@
                     <field name="date_order" />
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="location_id"/>
-                    <field name="minimum_planned_date"/>
+                    <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
                     <field name="origin"/>
-                    <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="shipped_rate" widget="progressbar"/>
+                    <field name="invoiced_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
+                    <field name="shipped_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 68323bc9146..095f17090da 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -99,7 +99,7 @@
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
- 					<separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
@@ -187,98 +187,5 @@
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
-    <record model="ir.ui.view" id="view_purchase_by_supplier_graph">
-            <field name="name">purchase.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchase by supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_purchase_by_supplier" model="ir.actions.act_window">
-        <field name="name">Purchase by supplier</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done'),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
-        <field name="view_id" ref="view_purchase_by_supplier_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_total_price_by_product_by_state_graph">
-            <field name="name">total.price.by.product.by.state.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total price by product by state" type="pie">
-                    <field name="product_id"/>
-                    <field name="price_total" operator="+"/>
-
-                </graph>
-            </field>
-        </record>
-	<record id="action_total_price_by_product_by_state" model="ir.actions.act_window">
-        <field name="name">Total price by product by state</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id','state']}</field>
-        <field name="view_id" ref="view_total_price_by_product_by_state_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_qty_per_product_graph">
-            <field name="name">qty.per.product.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Qty. per product" type="bar">
-                    <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_qty_per_product" model="ir.actions.act_window">
-        <field name="name">Qty. per product</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done')]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id']}</field>
-        <field name="view_id" ref="view_qty_per_product_graph"/>
-    </record>
-
-   	   <record model="ir.ui.view" id="view_po_per_month_tree">
-            <field name="name">qty.per.product.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchase order per month" >
-                    <field name="month"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="nbr" operator="+"/>
-                </tree>
-            </field>
-        </record>
-	<record id="action_po_per_month_tree" model="ir.actions.act_window">
-        <field name="name">Purchase order per month</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('date','&gt;',time.strftime('%Y-01-01 00:00:00')),('date','&lt;',time.strftime('%Y-12-31 23:59:59')),('state','=','done')]</field>
-		<field name="context">{'group_by_no_leaf':1,'group_by':['month','product_id']}</field>
-		<field name="view_id" ref="view_po_per_month_tree"/>
-    </record>
-
-  <record id="action_current_purchases" model="ir.actions.act_window">
-        <field name="name">Current purchases</field>
-        <field name="res_model">purchase.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','confirmed'))]</field>
-        <field name="view_id" ref="purchase.purchase_order_tree"/>
-      </record>
     </data>
 </openerp>