[MERGE]

bzr revid: hmo@tinyerp.com-20101015142524-8r31ieysjbo794s7

diff --cc addons/project/project_view.xml
index 3ea6dab,549b030..3d48365
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -325,10 -327,10 +327,10 @@@
                      <field name="date_end" invisible="1"/>
                      <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                      <field name="state" invisible="context.get('set_visible',False)"/>
-                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
+                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                                        <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                      <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
 -                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
 +                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                  </tree>
              </field>
          </record>