From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 addons/project_long_term/project_long_term.py      | 24 +++++++++++++++++-----
 .../project_long_term/project_long_term_view.xml   | 16 +++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..11ecdd940f9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,24 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+#    _defaults = {
+#        'use_phases': True,
+#    }
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if vals.get('use_phases', False):
+            self.project_create(cr, uid, obj_id, vals, context)
+        return obj_id
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1e9f50cdd87..2d7412f7e7d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -368,6 +368,22 @@
         src_model="project.phase"
         view_mode="tree,form"
         />
+     
+    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<group name="project" position="inside">
+            	    <field name="use_phases"/>
+            	</group>
+            </field>
+        </record>
 
     # ------------------------------------------------------
     # Menu Items
-- 
cgit v1.2.3


From 87040b2390a496a96c2c69e09cfb2f19769b1f27 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:29:34 +0530
Subject: [IMP]:project:improved project view

bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 2d7412f7e7d..9aaf52e27ff 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,9 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks"]' position='after'>
+                    <tr name="use_phases">
+                        <th>Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
+                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 4fc454658fdb4ed9370dcb94bb1706b3609341da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:45:41 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9aaf52e27ff..c15c7d5dd23 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -108,7 +108,7 @@
                     <tr name="use_phases">
                         <th>Phases Planing</th>
                         <td><field name="use_phases" nolabel="1"/></td>
-                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 63cf0f61906dcc1726a5e4596666556975c7902c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 13:07:28 +0530
Subject: [IMP]:project:improved view and code.

bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
---
 addons/project_long_term/project_long_term_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c15c7d5dd23..fef0ef46835 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,10 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks"]' position='after'>
-                    <tr name="use_phases">
-                        <th>Phases Planing</th>
-                        <td><field name="use_phases" nolabel="1"/></td>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr name="use_phases_row">
+                        <td>
+                            <group class="oe_form_group_label_border">
+                                <field name="use_phases"/>
+                            </group>
+                        </td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
-- 
cgit v1.2.3


From 04d5c34200672f9f83c78bbf99593dc5e01123e2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:20:24 +0530
Subject: [IMP]:improved project view as new style and format

bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
---
 addons/project_long_term/project_long_term_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fef0ef46835..5117b3f9970 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -106,11 +106,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
                     <tr name="use_phases_row">
-                        <td>
-                            <group class="oe_form_group_label_border">
-                                <field name="use_phases"/>
-                            </group>
-                        </td>
+                        <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
-- 
cgit v1.2.3


From 36c99ad66348e82cede092baca08ce87609b16dc Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:56:07 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530092607-egv156h2k9853xvf
---
 addons/project_long_term/project_long_term_view.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5117b3f9970..c8b06426c91 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -97,7 +97,14 @@
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
-
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+        
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
@@ -114,15 +121,6 @@
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-- 
cgit v1.2.3


From fc9e75519f5a3c1a2fda398ba6963f71a8e8a001 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 15:01:39 +0530
Subject: improved code for wrong inherit project task search view

bzr revid: apa@tinyerp.com-20120530093139-m1k5gm9hfxm6n6af
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c8b06426c91..9497b3ad6ec 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -332,7 +332,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <field name="project_id" position="after">
+                <field name="name" position="after">
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5ab90b048ba..cba3ead23c5 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -115,7 +115,7 @@
                     <tr name="use_phases_row">
                         <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
                         <td><field name="use_phases" nolabel="1"/></td>
-                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button icon=" terp-emblem-important" class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From b2a5ab368d64559375a861de6270f0d9ef3e5667 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Jun 2012 12:07:31 +0200
Subject: [IMP] account_analytic_analysis: code improved for automation of
 project creation

bzr revid: qdp-launchpad@openerp.com-20120613100731-9so4m41fz7yrtb5w
---
 addons/project_long_term/project_long_term.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 11ecdd940f9..7e50e9a6793 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,16 +275,11 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
-#    _defaults = {
-#        'use_phases': True,
-#    }
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
-        if vals.get('use_phases', False):
-            self.project_create(cr, uid, obj_id, vals, context)
-        return obj_id
+
+    def _trigger_project_creation(vals):
+        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+        return res or vals.get('use_phases')
+
 account_analytic_account()
 
 class project_task(osv.osv):
-- 
cgit v1.2.3


From 618aacc5a707c1c7ad952f1e4ba10f14d8274a85 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 13 Jun 2012 18:45:07 +0530
Subject: [IMP]:passed base menus ref instead of project.

bzr revid: apa@tinyerp.com-20120613131507-1yezuu5k7dc1h9s3
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a81650b596b..f1d73850b3e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -409,7 +409,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
-- 
cgit v1.2.3


From dc1edf44be5593f9048f442a8aec68ae5250d953 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 14 Jun 2012 12:09:22 +0200
Subject: [IMP] project: implemented the privacy/visibility record rule in a
 cleaner way + some cleanup and bug fixing related to contract management

bzr revid: qdp-launchpad@openerp.com-20120614100922-5g29ui88nhqojon2
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 7e50e9a6793..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -276,8 +276,8 @@ class account_analytic_account(osv.osv):
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
 
-    def _trigger_project_creation(vals):
-        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_phases')
 
 account_analytic_account()
-- 
cgit v1.2.3


From a37e3b59cb0fa0ff3dcede5d85ac0d256ad25125 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 12:37:10 +0200
Subject: [FIx] project_long_term: module inheritancy

bzr revid: qdp-launchpad@openerp.com-20120615103710-p4pn5dqnblkeb7dj
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f1d73850b3e..f4e17d9929c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -376,7 +376,7 @@
         src_model="project.phase"
         view_mode="tree,form"
         />
-     
+
     <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -385,11 +385,11 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project" name="project_sep"/>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
                 </xpath>
-            	<group name="project" position="inside">
-            	    <field name="use_phases"/>
-            	</group>
+                <xpath expr="//separator[@name='project_sep']" position="after">
+                    <field name="use_phases"/>
+                </group>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 9970943ca0fc1fdc727be8cee82a84c3ce12d47c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 13:54:50 +0200
Subject: [FIx] project_long_term: tag mismatch

bzr revid: qdp-launchpad@openerp.com-20120615115450-favh7x3d932zb1vo
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f4e17d9929c..196c6793faf 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -389,7 +389,7 @@
                 </xpath>
                 <xpath expr="//separator[@name='project_sep']" position="after">
                     <field name="use_phases"/>
-                </group>
+                </xpath>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 15:10:56 +0200
Subject: [IMP] contract management: misc code cleaning and improvements

bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 196c6793faf..93addfe6cf2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -387,7 +387,7 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
                 </xpath>
-                <xpath expr="//separator[@name='project_sep']" position="after">
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_phases"/>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:48:35 +0200
Subject: [IMP] project: version 7.0 for the project form view

bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
---
 addons/project_long_term/project_long_term_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 93addfe6cf2..64f503a8577 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,7 +104,7 @@
             view_type="form"
             view_mode="tree,form"
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
-        
+
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
@@ -112,10 +112,9 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr name="use_phases_row">
-                        <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
-                        <td><field name="use_phases" nolabel="1"/></td>
-                        <td style="text-align:right;"><button icon=" terp-emblem-important" class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3