From b574f20012883e86af064be40e29a26013b1de7d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 11 Oct 2011 23:20:17 +0200
Subject: [PATCH] [IMP] board module and hr dashboard cleanups split
 board.board object (almost unsed) xml's from actual board definitions board
 module defines 2 boards: the admin one, the homepage clean hr board
 definitions remove hr menuitems from administration menu remove useless
 menuitem definitions

bzr revid: al@openerp.com-20111011212017-qd3d2xp9mfneagqq
---
 addons/board/__openerp__.py                   |  12 +-
 addons/board/board.py                         |   5 -
 ...stration_view.xml => board_data_admin.xml} |  29 +--
 addons/board/board_data_home.xml              |  68 ++++++
 addons/board/board_demo.xml                   |   9 +-
 addons/board/board_view.xml                   | 196 ++++++------------
 addons/board/security/board_security.xml      |  10 -
 addons/board/security/ir.model.access.csv     |   1 -
 addons/hr/__openerp__.py                      |   7 +-
 addons/hr/board_hr_manager_view.xml           |  31 ---
 addons/hr/board_hr_view.xml                   |  40 ----
 addons/hr/hr_board.xml                        |  62 ++++++
 .../board_hr_expense_manager_view.xml         |   7 -
 addons/hr_expense/board_hr_expense_view.xml   |   7 -
 addons/hr_holidays/board_hr_holidays_view.xml |  11 -
 .../board_hr_manager_holidays_view.xml        |   9 +-
 addons/hr_holidays/hr_holidays_wizard.xml     |   6 -
 .../board_hr_recruitment_statistical_view.xml |   8 -
 addons/hr_timesheet/hr_timesheet_report.xml   |   5 -
 .../hr_timesheet_invoice_report.xml           |   5 -
 .../board_hr_timesheet_view.xml               |  18 --
 addons/point_of_sale/static/src/pos.html      |   2 +-
 22 files changed, 219 insertions(+), 329 deletions(-)
 rename addons/board/{board_administration_view.xml => board_data_admin.xml} (92%)
 create mode 100644 addons/board/board_data_home.xml
 delete mode 100644 addons/board/security/board_security.xml
 delete mode 100644 addons/hr/board_hr_manager_view.xml
 delete mode 100644 addons/hr/board_hr_view.xml
 create mode 100644 addons/hr/hr_board.xml

diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 7f37f125903..69515dc2840 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -34,8 +34,16 @@ The user can also publish notes.
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
-    'demo_xml': ['board_demo.xml'],
+    'update_xml': [
+        'security/ir.model.access.csv',
+        'wizard/board_menu_create_view.xml', 
+        'board_view.xml',
+        'board_data_admin.xml',
+        'board_data_home.xml',
+    ],
+    'demo_xml': [
+        'board_demo.xml'
+    ],
     'installable': True,
     'active': False,
     'certificate': '0076912305725',
diff --git a/addons/board/board.py b/addons/board/board.py
index d215981953a..6a87d5b190b 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -168,9 +168,6 @@ class board_board(osv.osv):
         'name':lambda *args:  'Dashboard'
     }
 
-board_board()
-
-
 class board_line(osv.osv):
     """
     Board Line
@@ -193,8 +190,6 @@ class board_line(osv.osv):
         'position': lambda *args: 'left'
     }
 
-board_line()
-
 class res_log_report(osv.osv):
     """ Log Report """
     _name = "res.log.report"
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_data_admin.xml
similarity index 92%
rename from addons/board/board_administration_view.xml
rename to addons/board/board_data_admin.xml
index 9e22dbd3fb6..1f45a6f5a72 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_data_admin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
+<data>
         <!-- User Connection -->
         <record model="ir.ui.view" id="view_user_connection_tree">
             <field name="name">user.connection.tree</field>
@@ -158,23 +157,13 @@
             <field name="view_id" ref="board_administration_form"/>
         </record>
 
-        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
-            groups="base.group_extended"/>
-        <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
-        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
-        <menuitem icon="terp-administration" id="base.menu_administration" name="Administration" sequence="50" action="open_board_administration_form"/>
+        <!-- bind adminitration dashboard to the root administration -->
+        <menuitem id="base.menu_administration" icon="terp-administration"  name="Administration" sequence="50" action="open_board_administration_form"/>
 
-    </data>
+        <!-- add a menu item in adminitration/reporting/dashboards -->
+        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
+        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting" sequence="0"/>
+        <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
+
+</data>
 </openerp>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
new file mode 100644
index 00000000000..ac141e1d2c7
--- /dev/null
+++ b/addons/board/board_data_home.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <!-- neat client actions that can be used in dashboards to display res_widgets -->
+    <record id="action_application_tiles" model="ir.actions.client">
+      <field name="name">Applications Tiles</field>
+      <field name="tag">board.home.applications</field>
+    </record>
+    <record id="action_res_widgets_tweets" model="ir.actions.client">
+      <field name="name">Tweets Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.openerp_favorites_twitter_widget')}"/>
+    </record>
+    <record id="action_res_widgets_events" model="ir.actions.client">
+      <field name="name">Events Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.events_widget')}"/>
+    </record>
+    <record id="action_res_widgets_facebook" model="ir.actions.client">
+      <field name="name">Facebook Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.facebook_widget')}"/>
+    </record>
+    <record id="action_res_widgets_note" model="ir.actions.client">
+      <field name="name">Note Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.note_widget')}"/>
+    </record>
+    <record id="action_res_widgets_map" model="ir.actions.client">
+      <field name="name">Google Maps Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.google_maps_widget')}"/>
+    </record>
+    <record id="action_res_widgets_currency_converter" model="ir.actions.client">
+      <field name="name">Currency Converter Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.currency_converter_widget')}"/>
+    </record>
+
+    <!-- default homepage definition -->
+    <record id="board_homepage_view" model="ir.ui.view">
+      <field name="name">Homepage Board</field>
+      <field name="model">board.board</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="">
+          <hpaned>
+            <child1>
+              <action name="%(action_application_tiles)d"/>
+            </child1>
+            <child2>
+              <action name="%(action_res_widgets_tweets)d"/>
+              <action name="%(action_res_widgets_events)d"/>
+            </child2>
+          </hpaned>
+        </form>
+      </field>
+    </record>
+    <record id="board_homepage_action" model="ir.actions.act_window">
+      <field name="name">Home Page</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_homepage_view"/>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
index 2f704e640bc..d36ec6161fe 100644
--- a/addons/board/board_demo.xml
+++ b/addons/board/board_demo.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
+<data>
+</data>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index b5048fa7b3d..36d75002476 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,146 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-      <record id="action_application_tiles" model="ir.actions.client">
-        <field name="name">Applications Tiles</field>
-        <field name="tag">board.home.applications</field>
-      </record>
-      <record id="action_res_widgets_tweets" model="ir.actions.client">
-        <field name="name">Tweets Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.openerp_favorites_twitter_widget')}"/>
-      </record>
-      <record id="action_res_widgets_events" model="ir.actions.client">
-        <field name="name">Events Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.events_widget')}"/>
-      </record>
-      <record id="action_res_widgets_facebook" model="ir.actions.client">
-        <field name="name">Facebook Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.facebook_widget')}"/>
-      </record>
-      <record id="action_res_widgets_note" model="ir.actions.client">
-        <field name="name">Note Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.note_widget')}"/>
-      </record>
-      <record id="action_res_widgets_map" model="ir.actions.client">
-        <field name="name">Google Maps Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.google_maps_widget')}"/>
-      </record>
-      <record id="action_res_widgets_currency_converter" model="ir.actions.client">
-        <field name="name">Currency Converter Widget</field>
-        <field name="tag">board.home.widgets</field>
-        <field name="params" eval="{'widget_id': ref('base.currency_converter_widget')}"/>
-      </record>
-      <record id="view_board_homepage" model="ir.ui.view">
-        <field name="name">Homepage Board</field>
+<data>
+    <!-- Board Search View  -->
+    <record id="view_board_search" model="ir.ui.view">
+        <field name="name">board.board.search</field>
+        <field name="model">board.board</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Dashboard">
+                <field name="name"/>
+                <field name="line_ids"/>
+            </search>
+        </field>
+    </record>
+
+    <!-- Board Tree View  -->
+    <record id="view_board_tree" model="ir.ui.view">
+        <field name="name">board.board.tree</field>
+        <field name="model">board.board</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Dashboard">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- Board Form View  -->
+    <record id="view_board_form" model="ir.ui.view">
+        <field name="name">board.board.form</field>
         <field name="model">board.board</field>
         <field name="type">form</field>
+        <field eval="1" name="priority"/>
         <field name="arch" type="xml">
-          <form string="">
-            <hpaned>
-              <child1>
-                <action name="%(action_application_tiles)d"/>
-              </child1>
-              <child2>
-                <action name="%(action_res_widgets_tweets)d"/>
-                <action name="%(action_res_widgets_events)d"/>
-              </child2>
-            </hpaned>
-          </form>
-        </field>
-      </record>
-      <record id="homepage_action" model="ir.actions.act_window">
-        <field name="name">Home Page</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="view_board_homepage"/>
-      </record>
-
-<!--  Board Tree View  -->
-
-        <record id="view_board_tree" model="ir.ui.view">
-            <field name="name">board.board.tree</field>
-            <field name="model">board.board</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Dashboard">
+            <form string="Dashboard">
+                <group col="6" colspan="4">
                     <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- Dashboard Definition Form View  -->
-
-        <record id="view_board_form" model="ir.ui.view">
-            <field name="name">board.board.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field eval="1" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Dashboard">
-                    <group col="6" colspan="4">
+                    <field name="view_id"/>
+                    <button colspan="2" name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill" />
+                </group>
+                <field colspan="4" name="line_ids" nolabel="1">
+                    <tree string="Dashboard View">
                         <field name="name"/>
-                        <field name="view_id"/>
-                        <button colspan="2"
-                            name="%(action_board_menu_create)d"
-                            string="Create Menu" type="action"
-                            icon="gtk-justify-fill" />
-                    </group>
-                    <field colspan="4" name="line_ids" nolabel="1">
-                        <tree string="Dashboard View">
-                            <field name="name"/>
-                            <field name="sequence"/>
-                            <field name="action_id"/>
-                            <field name="position"/>
-                        </tree>
-                        <form string="Dashboard View">
-                            <field name="name"/>
-                            <field name="sequence"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="action_id"
-                                domain="[('view_type','!=','tree')]" />
-                            <field name="position"/>
-                        </form>
-                    </field>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_board_search" model="ir.ui.view">
-            <field name="name">board.board.search</field>
-            <field name="model">board.board</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Dashboard">
-                    <field name="name"/>
-                    <field name="line_ids"/>
-                </search>
-            </field>
-        </record>
+                        <field name="sequence"/>
+                        <field name="action_id"/>
+                        <field name="position"/>
+                    </tree>
+                    <form string="Dashboard View">
+                        <field name="name"/>
+                        <field name="sequence"/>
+                        <field name="width"/>
+                        <field name="height"/>
+                        <field name="action_id" domain="[('view_type','!=','tree')]" />
+                        <field name="position"/>
+                    </form>
+                </field>
+            </form>
+        </field>
+    </record>
 
     <!-- Action for DashBoard Definition form -->
+    <record id="action_view_board_list_form" model="ir.actions.act_window">
+        <field name="name">Dashboard Definition</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_board_search"/>
+    </record>
 
-        <record id="action_view_board_list_form" model="ir.actions.act_window">
-            <field name="name">Dashboard Definition</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_board_search"/>
-        </record>
+    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
 
-        <menuitem
-            action="action_view_board_list_form"
-            id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
-
-        <act_window context="{'view': active_id}" id="dashboard_open"
-            multi="True" name="Open Dashboard" res_model="board.board"
-            src_model="board.board" />
-
-    </data>
+</data>
 </openerp>
diff --git a/addons/board/security/board_security.xml b/addons/board/security/board_security.xml
deleted file mode 100644
index ee544e098cc..00000000000
--- a/addons/board/security/board_security.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index e16104a0acc..8661750bfb8 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,7 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_board_board","board.board","model_board_board","base.group_user",1,1,1,1
 "access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
-"access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
 "access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
 "access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
 "access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index bca65c54cb2..900c689dfbf 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -48,13 +48,12 @@ You can manage:
         'process/hr_process.xml',
         'hr_installer.xml',
         'hr_data.xml',
-        'board_hr_view.xml',
-        'board_hr_manager_view.xml',
-        ],
+        'hr_board.xml',
+    ],
     'demo_xml': [
         'hr_demo.xml',
         'hr_department_demo.xml',
-        ],
+    ],
     'test': ['test/test_hr.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/hr/board_hr_manager_view.xml b/addons/hr/board_hr_manager_view.xml
deleted file mode 100644
index 3cfaf165840..00000000000
--- a/addons/hr/board_hr_manager_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<!-- This board view will be complete by other hr_* modules-->
-        <record id="board_hr_manager_form" model="ir.ui.view">
-            <field name="name">board.hr.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="HR Manager Board">
-                    <hpaned>
-                        <child1>
-                        </child1>
-                        <child2>
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-
-       <record id="open_board_hr_manager" model="ir.actions.act_window">
-            <field name="name">HR Manager Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_hr_manager_form"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
deleted file mode 100644
index 4124328c801..00000000000
--- a/addons/hr/board_hr_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <menuitem id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-
-    <!-- This board view will be complete by other hr_* modules-->
-        <record id="board_hr_form" model="ir.ui.view">
-            <field name="name">board.hr.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="My Board">
-                    <hpaned>
-                        <child1>
-                        </child1>
-                        <child2>
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-
-       <record id="open_board_hr" model="ir.actions.act_window">
-            <field name="name">Human Resources Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_hr_form"/>
-        </record>
-        <menuitem
-            id="menu_hr_deshboard"
-            name="Human Resources"
-            parent="base.dashboard"
-            action="open_board_hr"/>
-
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
-
-    </data>
-</openerp>
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
new file mode 100644
index 00000000000..874b0d368d6
--- /dev/null
+++ b/addons/hr/hr_board.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <!-- This board view will be complete by other hr_* modules-->
+    <record id="board_hr_form" model="ir.ui.view">
+        <field name="name">board.hr.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="My Board">
+                <hpaned>
+                    <child1>
+                    </child1>
+                    <child2>
+                    </child2>
+                </hpaned>
+            </form>
+        </field>
+    </record>
+    <record id="open_board_hr" model="ir.actions.act_window">
+        <field name="name">Human Resources Dashboard</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="usage">menu</field>
+        <field name="view_id" ref="board_hr_form"/>
+    </record>
+
+    <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
+    <menuitem id="menu_hr_reporting" parent="menu_hr_root" name="Reporting" sequence="10" /> 
+    <menuitem id="menu_hr_dashboard" parent="menu_hr_reporting"  name="Dashboard" sequence="0"/>
+    <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
+
+    <!-- This board view will be complete by other hr_* modules-->
+    <record id="board_hr_manager_form" model="ir.ui.view">
+        <field name="name">board.hr.manager.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="HR Manager Board">
+                <hpaned>
+                    <child1>
+                    </child1>
+                    <child2>
+                    </child2>
+                </hpaned>
+            </form>
+        </field>
+    </record>
+    <record id="open_board_hr_manager" model="ir.actions.act_window">
+        <field name="name">HR Manager Dashboard</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="usage">menu</field>
+        <field name="view_id" ref="board_hr_manager_form"/>
+    </record>
+
+    <menuitem id="menu_hr_dashboard_manager" parent="menu_hr_dashboard" icon="terp-graph" action="open_board_hr_manager" groups="base.group_hr_manager" sequence="5"/>
+
+</data>
+</openerp>
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index d86c7614d7f..c45979057a1 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -21,12 +21,5 @@
 			</xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 0493f628ebd..4e213048dc7 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
         <record id="action_my_expense" model="ir.actions.act_window">
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 71b4e2a98fb..9dc9646da9b 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
-
-            <!-- Need to merge in above view -->
-
         <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
             <field name="name">My Leaves</field>
             <field name="res_model">hr.holidays.status</field>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index 980a8dd5fbb..662569fb81d 100644
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -15,7 +15,7 @@
         <record id="board_hr_holidays_manager_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.manager.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <xpath expr="/form/hpaned/child1" position="inside"> 
@@ -24,12 +24,5 @@
             </field>
         </record>
 
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/> 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 01aff603626..8215abf12f9 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-      <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
-
      <menuitem
             id="menu_hr_reporting_holidays"
             name="Holidays"
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 73037dfb64f..822a7da3249 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -38,13 +38,5 @@
           </xpath>
         </field>
     </record>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-    <menuitem
-        action="hr.open_board_hr_manager"
-        icon="terp-graph"
-        id="base.menu_hr_manager"
-        parent="base.menu_hr_dasboard"
-        groups = "base.group_hr_manager"
-        sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 3e5f6c26619..dd848d453df 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-      <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
          <menuitem
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 3463dc92bd8..cc8028a8a0a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <report
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 134c7f99463..d829845e35a 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <menuitem
-        id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" 
-        sequence="0"/>
-    <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
-
         <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
@@ -19,7 +9,6 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
         </record>
-
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -55,12 +44,5 @@
                 </xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/point_of_sale/static/src/pos.html b/addons/point_of_sale/static/src/pos.html
index 93b2418dee6..e87b6cc64a4 100644
--- a/addons/point_of_sale/static/src/pos.html
+++ b/addons/point_of_sale/static/src/pos.html
@@ -33,7 +33,7 @@
                 var db = openerp.init();
                 openerp.point_of_sale(db);
                 var session = new db.web.Session('DEBUG');
-                session.session_login('trunk', 'admin', 'a').then(function() {
+                session.session_login('addons-trunk', 'admin', 'admin').then(function() {
                     var pos = new db.point_of_sale.PointOfSale({session: session});
                     pos.appendTo($("body"));
                 });