From c4eddd4ac6ddbcd9ceb48a27f3918774dac45239 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Jan 2010 22:47:35 +0100
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100118214735-8v1iyc086azsjbgg
---
 addons/project/project_view.xml         | 1 -
 addons/project_gtd/project_gtd_view.xml | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3bba7d461b3..01d92ca3ae9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -320,7 +320,6 @@
                                 <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 1b34f3f6a8e..dfaca11e286 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -76,8 +76,8 @@
         <field name="arch" type="xml">
             <field name="project_id" position="after">
                 <field name="timebox_id"/>
-                <button name="prev_timebox" string="Previous Timebox" type="object" icon="gtk-indent" states="draft,open,pending"/>
-                <button name="next_timebox" string="Next Timebox" type="object" icon="gtk-indent" states="draft,open,pending"/>
+                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
+                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
             </field>
         </field>
     </record>
@@ -127,10 +127,10 @@
         <field name="search_view_id" ref="project.view_task_search_form"/>
     </record>
 
-    <menuitem name="Todo List"
+    <menuitem name="To-Dos"
         groups="group_project_getting"
         id="menu_task_inbox"
-        parent="project.menu_main"
+        parent="project.menu_project_management"
         action="action_prject_task_tree"/>
 
     <act_window name="My Inbox"