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/project_long_term_view.xml')

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/project_long_term_view.xml')

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/project_long_term_view.xml')

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/project_long_term_view.xml')

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/project_long_term_view.xml')

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/project_long_term_view.xml')

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