[MERGE]

bzr revid: apa@tinyerp.com-20120417112722-7rz5vvcg6eo0jf3e
bzr revid: apa@tinyerp.com-20120419051214-j4wvjp9kz1w0zqs7
bzr revid: apa@tinyerp.com-20120423053400-unc6y6lonksopys3
bzr revid: apa@tinyerp.com-20120424092925-ezqfnppvfgocj94t

4 files changed, 9 insertions, 46 deletions

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 5f8c2f1b05c..dfe4134be99 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -32,13 +32,12 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Administration Dashboard">
+                <form string="Administration Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
-                            <action name="%(board_config_overview)d" string="Configuration Overview"/>
+                            <action name="%(action_user_connection_tree)d" string="Users" />
                         </column>
                         <column>
-                            <action name="%(action_user_connection_tree)d" string="Users" />
                         </column>
                     </board>
                 </form>
@@ -54,12 +53,11 @@
         </record>
 
         <!-- bind adminitration dashboard to the root administration -->
-        <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>
+        <menuitem id="base.menu_administration" name="Settings" action="open_board_administration_form"/>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
-        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting_board" sequence="0"/>
-        <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
+        <menuitem id="base.menu_reporting_admin" name="Administration" parent="base.menu_reporting_dashboard" groups="base.group_system"/>
+        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_admin" action="open_board_administration_form"/>
 
     </data>
 </openerp>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a75a3ad496..f1e90ace7ad 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -37,36 +37,5 @@
       <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="">
-          <board style="1">
-            <column>
-              <action name="%(action_application_tiles)d"/>
-            </column>
-          </board>
-        </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>
-
-    <!-- set the default homepage of admin -->
-    <record id="base.user_root" model="res.users">
-        <field name="action_id" ref="board_homepage_action"/>
-    </record>
-
-    <!-- and of every new users -->
-    <function eval="('default',False,'action_id', [('res.users', False)], board_homepage_action, True, False, False, False, True)" id="ir_default_home" model="ir.values" name="set"/>
-
 </data>
 </openerp>
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
index 384e29abdf2..d36ec6161fe 100644
--- a/addons/board/board_demo.xml
+++ b/addons/board/board_demo.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <!-- set the default homepage of demo -->
-    <record id="base.user_demo" model="res.users">
-        <field name="action_id" ref="board_homepage_action"/>
-    </record>
 </data>
 </openerp>
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index 1114a624c53..d222850a2bb 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-04 01:20+0000\n"
+"PO-Revision-Date: 2012-04-21 18:32+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -30,7 +30,7 @@ msgstr "メニュー作成"
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "メニュー情報"
 
 #. module: board
 #: view:res.users:0