[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz

3 files changed, 13 insertions, 12 deletions

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 88424be85fa..34de37fd9a7 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -104,16 +104,17 @@
         </record>
 
         <menuitem
-            id="next_id_86"
-            name="Dashboard"
-            sequence="0"
-            parent="base.menu_project_report"/>
+            id="menu_project_dasboard"
+            name="Project"
+            sequence="20"
+            parent="base.menu_dasboard"
+            />
 
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
-            parent="next_id_86"
+            parent="menu_project_dasboard"
             sequence="1"/>
 
         <menuitem
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4be5ad8fabd..1377211c53f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -172,7 +172,7 @@
             <field name="view_mode">tree,form,gantt</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
+            <field name="context">{}</field>
             <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
         </record>
 
@@ -524,7 +524,7 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_project_id": project_id}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
@@ -539,7 +539,7 @@
             <field name="act_window_id" ref="action_view_task"/>
         </record>
 
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
+        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
@@ -626,7 +626,7 @@
         <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
 
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5af8706108f..87f563f8878 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_project_report" name="Reporting"
+        <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
-            parent="base.menu_main_pm" sequence="50"/>
-        <menuitem id="project_report_task" name="Tasks"
+            parent="base.menu_reporting" sequence="25"/>
+        <menuitem id="project_report_task" name="Tasks Analysis"
             parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">