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: [MARGE] Knowledge :  Improve the Knowledge Dashboard

bzr revid: rma@tinyerp.com-20120606081028-dptz6vkwscy34kff
---
 addons/document/board_document_view.xml | 58 ++++-----------------------------
 1 file changed, 6 insertions(+), 52 deletions(-)

(limited to 'addons/document/board_document_view.xml')

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>
-- 
cgit v1.2.3


From f2af2b22719336fdb540f99ccc610a521c345831 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 6 Jun 2012 16:13:30 +0530
Subject: [FIX] dashboard menu sequence

bzr revid: jam@tinyerp.com-20120606104330-i1687re1y3jgx1h7
---
 addons/document/board_document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/document/board_document_view.xml')

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index b4285a7df98..eefbf1d2e26 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -40,7 +40,7 @@
                 name="Knowledge Dashboard"
                 id="menu_reports_document"
                 parent="base.menu_reporting_dashboard"
-                sequence="50"
+                sequence="45"
                 action="open_board_document_manager"
                 icon="terp-graph"/>
 
-- 
cgit v1.2.3


From 8d4eaea82d8d28c91a94b6129bd263701abdb081 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 8 Jun 2012 11:42:11 +0530
Subject: [IMP]: Improve knowledge dashboard

bzr revid: aja@tinyerp.com-20120608061211-ru07c3tilul61khi
---
 addons/document/board_document_view.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'addons/document/board_document_view.xml')

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index eefbf1d2e26..c7b47ca216b 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -28,7 +28,7 @@
 
 
         <record model="ir.actions.act_window" id="open_board_document_manager">
-            <field name="name">Document Dashboard</field>
+            <field name="name">Knowledge Dashboard</field>
              <field name="res_model">board.board</field>
              <field name="view_type">form</field>
              <field name="view_mode">form</field>
@@ -36,13 +36,11 @@
          </record>
 
         
-         <menuitem
-                name="Knowledge Dashboard"
-                id="menu_reports_document"
-                parent="base.menu_reporting_dashboard"
-                sequence="45"
-                action="open_board_document_manager"
-                icon="terp-graph"/>
+         <menuitem id="menu_reports_document"
+                   parent="base.menu_reporting_dashboard"
+                   sequence="55"
+                   action="open_board_document_manager"
+                   icon="terp-graph"/>
 
      </data>
  </openerp>
-- 
cgit v1.2.3


From 4850479e1cf735de6349718d12eba1e8c9670449 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 11 Jun 2012 14:38:52 +0530
Subject: [IMP]: Improve dashboards

bzr revid: aja@tinyerp.com-20120611090852-i5r1fopfexmclij3
---
 addons/document/board_document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/document/board_document_view.xml')

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index c7b47ca216b..49ab6117ea1 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -28,7 +28,7 @@
 
 
         <record model="ir.actions.act_window" id="open_board_document_manager">
-            <field name="name">Knowledge Dashboard</field>
+            <field name="name">Knowledge</field>
              <field name="res_model">board.board</field>
              <field name="view_type">form</field>
              <field name="view_mode">form</field>
-- 
cgit v1.2.3


From c9fb80aaa88600230e1bb8441818eb73fb0b4fe1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 12 Jun 2012 12:00:20 +0530
Subject: [IMP] document: add files by user in dashboard.

bzr revid: tpa@tinyerp.com-20120612063020-1fr1ikqjfe407pl2
---
 addons/document/board_document_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/document/board_document_view.xml')

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index e8fcf60ca3c..38e4a16ad85 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -14,11 +14,11 @@
                                 view_mode="tree,form"/>
                              <action string="Files by Month"
                                 name="%(document.action_view_files_by_month_graph)d"
-                                view_mode="graph,tree"/>   
+                                view_mode="graph,tree"/>
                         </column>
                         <column>
-                            <action string="File Size by Month"
-                                name="%(document.action_view_size_month)d"
+                            <action string="Files by user"
+                                name="%(document.action_view_files_by_user_graph)d"
                                 view_mode="graph,tree"/>
                         </column>
                      </board>
-- 
cgit v1.2.3