From 74adc4923faa5ff3c77b670a57f1e47b18d57cc1 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Jan 2010 18:32:40 +0530
Subject: [PATCH] [MOD] Modification for Dashboards. Dashboard changed as
 Reporting. base_report_creater menu also modified.All board module's menu are
 also modified according to new structure.

bzr revid: vir@tinyerp.com-20100112130240-q5q0x1twxelz5sby
---
 .../base_report_creator_view.xml              | 15 ++++----
 addons/board/board_view.xml                   | 14 ++++----
 addons/board_account/board_account_view.xml   | 36 +++++++++----------
 .../board_association_view.xml                |  5 +--
 .../board_auction_manager_view.xml            | 11 +++---
 addons/board_auction/board_auction_view.xml   |  5 +--
 .../board_crm_statistical_view.xml            |  2 +-
 .../board_crm_view.xml                        |  2 +-
 addons/board_document/board_document_view.xml | 10 +++---
 .../board_manufacturing_view.xml              |  2 +-
 addons/board_project/board_project_view.xml   |  2 +-
 addons/board_sale/board_sale_view.xml         | 12 +++----
 12 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 1a1a8c17482..8444193b238 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -14,7 +14,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="base_report_creator_tree">
         <field name="name">base_report_creator.report.tree</field>
         <field name="model">base_report_creator.report</field>
@@ -104,9 +104,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem 
+    <menuitem
+        name="Custom Reports" id="menu_custom_reports"
+        action="base_report_creator_action" parent="board.dashboard_menu" sequence="1"/>
+    <menuitem
         name="Custom Reports" parent="board.next_id_50"
-        id="menu_base_report_creator_action_config" 
+        id="menu_base_report_creator_action_config"
         action="base_report_creator_action"/>
 
     <record model="ir.ui.view" id="base_report_creator_tree_simple">
@@ -123,9 +126,9 @@
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">tree</field>
     </record>
-    <menuitem 
-        name="Custom Reports" parent="board.dashboard_menu"
-        id="menu_base_report_creator_action" 
+    <menuitem
+        name="Custom Reports" parent="menu_custom_reports"
+        id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
     <wizard
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 3893d3f628b..009d8f7348c 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/>
-
+        <menuitem icon="terp-graph" id="dashboard_menu" name="Reporting"/>
+		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="dashboard_menu"/>
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
             <field name="model">board.note</field>
@@ -34,13 +34,8 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu"
-                  sequence="100"
-                  groups="base.group_system" />
-
         <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
 
-
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
             <field name="model">board.board</field>
@@ -90,11 +85,14 @@
             name="Configuration"
             parent="board.dashboard_menu"
             groups="base.group_system"
-            sequence="0"/>
+            sequence="3"/>
         <menuitem
             action="action_view_board_list_form"
             id="menu_view_board_form"
             parent="next_id_50"/>
+        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="next_id_50"
+                  sequence="100"
+                  groups="base.group_system" />
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
 
     </data>
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 95d2db5a789..2c03279ef97 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="note_account_type" model="board.note.type">
             <field name="name">Accountants</field>
         </record>
-        
+
         <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
             <field name="name">Costs to invoice</field>
             <field name="res_model">report.account.analytic.line.to.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        
+
         <record id="action_aged_receivable" model="ir.actions.act_window">
             <field name="name">Receivable Accounts</field>
             <field name="res_model">report.account.receivable</field>
@@ -27,10 +27,10 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-        
-        
+
+
         <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
-        
+
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -38,31 +38,31 @@
             <field name="arch" type="xml">
                 <form string="Account Board">
                     <hpaned>
-                        
+
                         <child1>
-                            
+
                             <action colspan="4" height="160" name="%(report_analytic.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
-                            
+
                             <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
-                            
+
                             <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
-                        
+
                         <child2>
                             <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
-                            
+
                             <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-                            
+
                             <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>
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_account" model="ir.actions.act_window">
             <field name="name">Accounting Dashboard</field>
             <field name="res_model">board.board</field>
@@ -71,8 +71,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-        
-        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"
+
+        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard"
             groups="account.group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
index 3e501cf4f6c..2ed03e1da95 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/board_association/board_association_view.xml
@@ -35,7 +35,7 @@
                                 string="New members"
                                 name="%(membership.action_report_partner_member_year_tree)d"
                                 view_mode="graph,tree" colspan="4"/>
-                            <action 
+                            <action
                                 string="Registrations by Events"
                                 name="%(event.action_event_type_registration)d"
                                 view_mode="graph,tree"
@@ -54,8 +54,9 @@
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
 
+		<menuitem id="board_associations" name="Associations" parent="board.dashboard" />
         <menuitem
-            name="Associations" parent="board.dashboard_menu"
+            name="Associations" parent="board_associations"
             action="open_board_associations_manager"
             sequence="1"
             id="menu_board_associations_manager"
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index d132c8f619b..e77c936f861 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -14,7 +14,7 @@
 					<hpaned position="100">
 						<child1>
 
-						
+
 							<action
 								string="Latest objects"
 								name="%(auction.action_report_latest_objects_manager_tree)d"
@@ -49,12 +49,12 @@
 								string="Min/Adj/Max"
 								name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
 								view_mode="graph,tree" colspan="4" />
-						
+
 							<action
 								string="Objects by day"
 								name="%(auction.action_report_auction_object_date_tree)d"
 								view_mode="graph,tree" colspan="4" />
-								
+
 						</child2>
 					</hpaned>
 				</form>
@@ -70,11 +70,12 @@
 			<field name="view_id" ref="board_auction_manager_form1"/>
 		</record>
 
+		<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="board.dashboard" />
 		<menuitem
-			name="Dashboards/Auction/Auction Manager"
+			name="Auction Manager"
 			action="open_board_auction_manager"
 			sequence="1"
-			id="menu_board_auction_manager"/>
+			id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index d2d508d0c75..d94c2a329aa 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -59,11 +59,12 @@
 			<field name="view_id" ref="board_auction_manager_form"/>
 		</record>
 
+		<menuitem name="Auction Member" id="board_menu_auction_member" parent="board.dashboard" />
 		<menuitem
-			name="Dashboards/Auction/Auction Member"
+			name="Auction Member"
 			action="open_board_auction"
 			sequence="1"
-			id="menu_board_auction"/>
+			id="menu_board_auction" parent="board_menu_auction_member" />
 
 </data>
 </openerp>
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index f1a7f1070f7..178d4e8488d 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -111,7 +111,7 @@
         </record>
 
         <menuitem
-            name="CRM Configuration" parent="board.dashboard_menu"
+            name="CRM Configuration" parent="board.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 02114f3ac6e..c79a9905916 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -15,7 +15,7 @@
 					<field name="nbr" operator="+"/>
 				</graph>
 			</field>
-		</record>	
+		</record>
 
 		<record model="ir.actions.act_window" id="act_my_leads">
 			<field name="res_model">crm.case</field>
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index d666be18a1b..cb4450fae21 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -18,7 +18,7 @@
                                 name="%(report_document.action_view_all_document_tree1)d"
                                 view_mode="tree"
                                 domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
-                                 
+
                             <action
                                 string="File Size by Month"
                                 name="%(report_document.action_view_size_month)d"
@@ -28,8 +28,8 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(report_document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>            
-                                
+                                view_mode="graph,tree"/>
+
                             <action
                                 string="Files by Partner"
                                 name="%(report_document.action_view_files_by_partner)d"
@@ -53,7 +53,7 @@
          <menuitem
             name="Document"
             id="menu_board_document"
-            parent="board.dashboard_menu"
+            parent="board.dashboard"
             groups="document.group_document_manager"/>
 
 
@@ -76,7 +76,7 @@
                                 string="Wall of Shame"
                                 name="%(report_document.action_view_wall)d"
                                 view_mode="tree"/>
-                                
+
                         </child1>
                         <child2>
                             <action
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index d128bf62b81..99308da7f61 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -39,7 +39,7 @@
         <menuitem
             id="next_id_87"
             name="Production"
-            parent="board.dashboard_menu"
+            parent="board.dashboard"
             groups="mrp.group_mrp_manager"/>
         <menuitem
             action="open_board_manufacturing"
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 34253d9c4ae..c499ea987d9 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -80,7 +80,7 @@
         <menuitem
             id="next_id_86"
             name="Project"
-            parent="board.dashboard_menu"/>
+            parent="board.dashboard"/>
         <menuitem
             action="open_board_project"
             icon="terp-graph"
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 156b9ba9dd0..f373c8e502d 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -4,7 +4,7 @@
         <record id="note_sale_type" model="board.note.type">
             <field name="name">Sales</field>
         </record>
-        
+
         <record id="board_sales_manager_form" model="ir.ui.view">
             <field name="name">board.sales.manager.form</field>
             <field name="model">board.board</field>
@@ -17,7 +17,7 @@
                             <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
                             <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
                         </child1>
-                        
+
                         <child2>
                             <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
                             <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>
@@ -26,7 +26,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_sales_manager" model="ir.actions.act_window">
             <field name="name">Sale Dashboard</field>
             <field name="res_model">board.board</field>
@@ -34,8 +34,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
-        
-        <menuitem id="next_id_88" name="Sales" parent="board.dashboard_menu"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
-        
+
+        <menuitem id="next_id_88" name="Sales" parent="board.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
+
     </data>
 </openerp>