From a66a465afac14cdf1194284951b0b707f24666b9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 6 Jun 2012 13:40:28 +0530
Subject: [PATCH] [MARGE] Knowledge :  Improve the Knowledge Dashboard

bzr revid: rma@tinyerp.com-20120606081028-dptz6vkwscy34kff
---
 addons/document/board_document_view.xml       | 58 ++-----------------
 .../document/report/document_report_view.xml  | 48 ++-------------
 2 files changed, 10 insertions(+), 96 deletions(-)

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index acfcf4cb63a..d599b857f0e 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -12,6 +12,9 @@
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
+                             <action string="Files by Month"
+                                name="%(document.action_view_files_by_month_graph)d"
+                                view_mode="graph,tree"/>   
                         </column>
                         <column>
                             <action string="File Size by Month"
@@ -33,63 +36,14 @@
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
+        <menuitem id="menu_reporting_dashboard" name="Reporting" sequence="50" parent="knowledge.menu_document"/>
          <menuitem
-            name="Knowledge"
+            name="Knowledge Dashboard"
             id="menu_reports_document"
             parent="base.menu_reporting_dashboard"
-            sequence="45"
-            groups="base.group_system"/>
-
-
-         <menuitem
-            parent="menu_reports_document"
+            sequence="50"
             action="open_board_document_manager"
-            sequence="1"
-            id="menu_reports_document_manager"
             icon="terp-graph"/>
 
-        <record model="ir.ui.view" id="board_document_manager_form1">
-            <field name="name">board.document.manager.form1</field>
-             <field name="model">board.board</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-                <form string="Document board" layout="manual">
-                     <board style="2-1">
-                        <column>
-                            <action string="Wall of Shame"
-                                name="%(document.action_view_wall)d"
-                                view_mode="tree"/>
-
-                        </column>
-                        <column>
-                            <action string="Files by Users"
-                                name="%(document.action_view_user_graph)d"
-                                view_mode="graph,tree"/>
-
-                            <action string="Files by Month"
-                                name="%(document.action_view_files_by_month_graph)d"
-                                view_mode="graph,tree"/>
-                        </column>
-                     </board>
-                 </form>
-            </field>
-        </record>
-
-
-        <record model="ir.actions.act_window" id="open_board_document_manager1">
-            <field name="name">Statistics by User</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_document_manager_form1"/>
-        </record>
-
-        <menuitem
-            parent="menu_reports_document"
-            action="open_board_document_manager1"
-            sequence="1"
-            id="menu_reports_document_manager1"
-            icon="terp-graph"/>
      </data>
  </openerp>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e6e1847cd56..66dd803fc43 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -83,27 +83,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_document_wall_tree">
-            <field name="name">report.document.wall.tree</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_wall">
-            <field name="name">Wall of Shame</field>
-            <field name="res_model">report.document.wall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
+      
 
 <!--***************************************************************************************-->
 
@@ -112,7 +92,7 @@
             <field name="model">report.document.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by Resource Type" type="pie">
+                <graph string="Files by Resource Type" type="bar">
                     <field name="type" />
                     <field name="nbr" operator="+"/>
                 </graph>
@@ -127,7 +107,7 @@
             <field name="model">report.document.file</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="File Size by Month" type="bar">
+                <graph string="File Size by Month" type="line">
                     <field name="month"/>
                     <field name="file_size" operator="+"/>
                 </graph>
@@ -161,7 +141,7 @@
             <field name="model">report.document.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by Month" type="bar">
+                <graph string="Files by Month" type="pie">
                     <field name="month" />
                     <field name="nbr" operator="+"/>
 <!--                    <field name="name" operator="+"/>-->
@@ -195,26 +175,6 @@
 
 <!--***************************************************************************************-->
 
-    <record model="ir.ui.view" id="view_user_graph">
-            <field name="name">report.document.user.graph</field>
-            <field name="model">report.document.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files by users" type="bar">
-                    <field name="user" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_user_graph">
-            <field name="name">Files By Users</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_user_graph"></field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-
 
 <!--***************************************************************************************-->