From 51647e7515fee1b6e2131cf082ed91bae6c1fd3c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 27 Mar 2012 12:39:40 +0530
Subject: [IMP] add bollean field in project.project for some module

bzr revid: sgo@tinyerp.com-20120327070940-238ejuwcrmcz6ax3
---
 addons/project_long_term/project_long_term_view.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(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 9800c209dd5..78e19b051ff 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -98,6 +98,17 @@
     # Project Phase
     # ------------------------------------------------------
 
+        <record id="project_phase_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Phase</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='progress_rate']" position="after">
+                    <field name="phase"/>
+                </xpath>
+            </field>
+        </record>
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-- 
cgit v1.2.3


From cce28758f59d2199fb377bec4c50e91815ca6478 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 28 Mar 2012 12:40:59 +0530
Subject: [imp]

bzr revid: sgo@tinyerp.com-20120328071059-mrixwtuksf8ezfzq
---
 addons/project_long_term/project_long_term_view.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(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 7044fe7e635..fe91c4c54ea 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -109,6 +109,21 @@
                 </xpath>
             </field>
         </record>
+        
+        <record id="view_project_kanban_phase" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='open_task']" position="after">
+                	<td valign="bottom">
+                		<button name="open_phase" class="oe_project_buttons" type="object">Phase</button>(<field name="open_phases"/>)
+                	</td>
+                </xpath>
+            </field>
+        </record>
+        
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-- 
cgit v1.2.3


From df11d7174a58c9a8bc343dc3fba8d19cefcb767c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 14:29:27 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328085927-hzcw0p32tr94i07i
---
 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 b297be4c2c8..810389da11e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -121,7 +121,7 @@
             </field>
                 <xpath expr="//td[@class='buttons']" position="inside">
                     <t t-if="record.phases.raw_value">
-                	<button name="open_phase" class="oe_project_buttons" type="object"><img src="/project_long_term/static/src/img/phases_icon.jpg" width="18" height="18" align="top"/></button>
+                	<button name="open_phase" class="oe_project_buttons" type="object"><img src="/project_long_term/static/src/img/phases_icon.jpg" width="50" height="50" align="center"/></button>
                     </t>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 25776d016280b54e2f2c247299c3090d346a5eae Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 28 Mar 2012 15:16:54 +0530
Subject: [IMP]add image and sequence

bzr revid: sgo@tinyerp.com-20120328094654-d02ntcsu6ghbonva
---
 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 810389da11e..ed93a7cda41 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -121,7 +121,7 @@
             </field>
                 <xpath expr="//td[@class='buttons']" position="inside">
                     <t t-if="record.phases.raw_value">
-                	<button name="open_phase" class="oe_project_buttons" type="object"><img src="/project_long_term/static/src/img/phases_icon.jpg" width="50" height="50" align="center"/></button>
+                	<button name="open_phase" class="oe_project_buttons" type="object"><img src="/project_long_term/static/src/img/phases_icon.jpg" width="50" height="50" align="center" sequence = "4"/></button>
                     </t>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 6ee64ce686ddcc84fd83ecbc3411d5e0a4234f5a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 10:14:50 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329044450-oirg4eoj0itpjb41
---
 addons/project_long_term/project_long_term_view.xml | 21 +++++++++++----------
 1 file changed, 11 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 4f05ccd9fa3..f3f9e132b1e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -116,18 +116,19 @@
             <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
-            <field name="task" position="after">
-            	<field name="phases"/>
-            </field><!--
-                <t t-name="phase_details">
-                    <ul class="oe_kanban_tooltip">
-                        <li><b>Phases</b></li>
-                    </ul>
-                </t>
--->
+                <field name="task" position="after">
+                    <field name="phases"/>
+                </field>
+                <xpath expr="//t[@t-name='tasks']" position="after">
+                    <t t-name="phases">
+                        <ul class="oe_kanban_tooltip">
+                            <li><b>Phases</b></li>
+                        </ul>
+                   </t>
+                </xpath>
                 <xpath expr="//td[@class='buttons']" position="inside">
                     <t t-if="record.phases.raw_value">
-                	<button name="open_phase" class="oe_project_buttons" type="object" tooltip="phase_details"><img src="/project_long_term/static/src/img/phases_icon.jpg" class="project_icon"/></button>
+                	<button name="open_phase" class="oe_project_buttons" type="object" tooltip="phases"><img src="/project_long_term/static/src/img/phases_icon.jpg" class="project_icon"/></button>
                     </t>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 8e782f55842b453c665164d2294c4cad7f98d3e6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 16:33:46 +0530
Subject: [IMP]change kanban view

bzr revid: sgo@tinyerp.com-20120403110346-cy9ogts14lmxwa7t
---
 addons/project_long_term/project_long_term_view.xml | 12 +++++++-----
 1 file changed, 7 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 f3f9e132b1e..0b5f9fb00a5 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -119,17 +119,19 @@
                 <field name="task" position="after">
                     <field name="phases"/>
                 </field>
-                <xpath expr="//t[@t-name='tasks']" position="after">
+                <!-- <xpath expr="//t[@t-name='tasks']" position="after">
                     <t t-name="phases">
                         <ul class="oe_kanban_tooltip">
                             <li><b>Phases</b></li>
                         </ul>
                    </t>
-                </xpath>
-                <xpath expr="//td[@class='buttons']" position="inside">
-                    <t t-if="record.phases.raw_value">
-                	<button name="open_phase" class="oe_project_buttons" type="object" tooltip="phases"><img src="/project_long_term/static/src/img/phases_icon.jpg" class="project_icon"/></button>
+                </xpath> -->
+                <xpath expr="//p[@id='list']" position="inside">
+                	<a>
+                   	<t t-if="record.phases.raw_value">
+                       <button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phase</button>
                     </t>
+                 </a>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From 96c334b5acd8ef17d9458bea9f20c93097fb4c71 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 18:57:53 +0530
Subject: [IMP]remove extra spaces from kanban view

bzr revid: sgo@tinyerp.com-20120403132753-jv1n4kyaxwh0yxtm
---
 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 0b5f9fb00a5..914e1b8d600 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -126,7 +126,7 @@
                         </ul>
                    </t>
                 </xpath> -->
-                <xpath expr="//p[@id='list']" position="inside">
+                <xpath expr="//h4[@id='list']" position="inside">
                 	<a>
                    	<t t-if="record.phases.raw_value">
                        <button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phase</button>
-- 
cgit v1.2.3


From 43b46a1623afa8d17601e0bd7965048e16db1f0f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 11:39:33 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou
---
 addons/project_long_term/project_long_term_view.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 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 914e1b8d600..6951aee790a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -119,19 +119,12 @@
                 <field name="task" position="after">
                     <field name="phases"/>
                 </field>
-                <!-- <xpath expr="//t[@t-name='tasks']" position="after">
-                    <t t-name="phases">
-                        <ul class="oe_kanban_tooltip">
-                            <li><b>Phases</b></li>
-                        </ul>
-                   </t>
-                </xpath> -->
                 <xpath expr="//h4[@id='list']" position="inside">
-                	<a>
-                   	<t t-if="record.phases.raw_value">
-                       <button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phase</button>
-                    </t>
-                 </a>
+                    <a>
+                        <t t-if="record.phases.raw_value">
+                            <button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phases</button>
+                        </t>
+                    </a>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From e9cd2230b91bc26268e72454f2eefd8c285ea65d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 11:42:19 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404061219-ly96wkv9gv6ojlm5
---
 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 6951aee790a..ff5cc6f9653 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -122,7 +122,7 @@
                 <xpath expr="//h4[@id='list']" position="inside">
                     <a>
                         <t t-if="record.phases.raw_value">
-                            <button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phases</button>
+                            <button name="open_phase" class="oe_project_buttons" type="object">, <field name="open_phases"/> Phases</button>
                         </t>
                     </a>
                 </xpath>
-- 
cgit v1.2.3


From 27dd8054fad88f64112478fc118b2dbe35534de6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 14:31:14 +0530
Subject: [IMP]improve

bzr revid: sgo@tinyerp.com-20120404090114-qhq64kye343ahw7r
---
 addons/project_long_term/project_long_term_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 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 ff5cc6f9653..bf890ffecfb 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -118,11 +118,12 @@
             <field name="arch" type="xml">
                 <field name="task" position="after">
                     <field name="phases"/>
+                    <field name="open_phases"/>
                 </field>
                 <xpath expr="//h4[@id='list']" position="inside">
                     <a>
                         <t t-if="record.phases.raw_value">
-                            <button name="open_phase" class="oe_project_buttons" type="object">, <field name="open_phases"/> Phases</button>
+                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-esc="record.open_phases.value" t-if="record.open_phases.value &lt;= 1"> Phase,</t><t t-esc="record.open_phases.value" t-if="record.open_phases.value > 1"> Phases,</t></button>
                         </t>
                     </a>
                 </xpath>
-- 
cgit v1.2.3


From b997ac075841f647f42175abea52b5acca777d1d Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 15:03:46 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120404093346-l5rcgpbf7u9evq3z
---
 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 bf890ffecfb..c850ee27c43 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -123,7 +123,7 @@
                 <xpath expr="//h4[@id='list']" position="inside">
                     <a>
                         <t t-if="record.phases.raw_value">
-                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-esc="record.open_phases.value" t-if="record.open_phases.value &lt;= 1"> Phase,</t><t t-esc="record.open_phases.value" t-if="record.open_phases.value > 1"> Phases,</t></button>
+                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-esc="record.open_phases.value" t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-esc="record.open_phases.value" t-if="record.open_phases.value > 1"> Phases</t></button>
                         </t>
                     </a>
                 </xpath>
-- 
cgit v1.2.3


From ba0d6ac4c5486892058a503f701ebf84b24d7a30 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 17:01:46 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404113146-ls123w7pp1uvokzs
---
 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 c850ee27c43..84995f0c82f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -123,7 +123,7 @@
                 <xpath expr="//h4[@id='list']" position="inside">
                     <a>
                         <t t-if="record.phases.raw_value">
-                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-esc="record.open_phases.value" t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-esc="record.open_phases.value" t-if="record.open_phases.value > 1"> Phases</t></button>
+                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
                         </t>
                     </a>
                 </xpath>
-- 
cgit v1.2.3


From 89194da727ebb8cc3d9a0f7d7aeca7741338fd9a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 9 Apr 2012 15:01:32 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120409093132-lxrojybxcy3u4bb1
---
 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 84995f0c82f..73b7f7ff2e0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -121,7 +121,7 @@
                     <field name="open_phases"/>
                 </field>
                 <xpath expr="//h4[@id='list']" position="inside">
-                    <a>
+                    <a id="4">
                         <t t-if="record.phases.raw_value">
                             <button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
                         </t>
-- 
cgit v1.2.3


From b38ba6637b6832fdd68850591676aefbd39a62b5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 11 Apr 2012 15:06:52 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120411093652-32fldjnoophainuw
---
 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 73b7f7ff2e0..d555ddf5d00 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -120,7 +120,7 @@
                     <field name="phases"/>
                     <field name="open_phases"/>
                 </field>
-                <xpath expr="//h4[@id='list']" position="inside">
+                <xpath expr="//div[@id='list']" position="inside">
                     <a id="4">
                         <t t-if="record.phases.raw_value">
                             <button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
-- 
cgit v1.2.3


From f8e076e9a4c1f08d33ab81a33706c645be75739a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:57:25 +0530
Subject: [IMP]:improved code.

bzr revid: apa@tinyerp.com-20120427062725-0lpfbxs0xkdmm7zf
---
 addons/project_long_term/project_long_term_view.xml | 8 +++-----
 1 file changed, 3 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 9cb4bb0ba41..2e90659126b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -121,11 +121,9 @@
                     <field name="open_phases"/>
                 </field>
                 <xpath expr="//div[@id='list']" position="inside">
-                    <a id="4">
-                        <t t-if="record.phases.raw_value">
-                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
-                        </t>
-                    </a>
+                    <t t-if="record.phases.raw_value">
+                        <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1">Phase</t><t t-if="record.open_phases.value > 1">Phases</t>(<t t-esc="record.open_phases.value"/>)</a>
+                    </t>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From d2b70d38c34a4a30f02c8de1c221765d15a153e1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 30 Apr 2012 16:19:34 +0530
Subject: [IMP]change color and improved as per said

bzr revid: sgo@tinyerp.com-20120430104934-34tsnkf24rms9izx
---
 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 2e90659126b..1f258ff2ead 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -308,7 +308,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='effective_hours']" position="after">
-                    <field name="phase_id"/>
+                    <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From bfd96de42bc942fa24158a8c87b9e905c2460b72 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 7 May 2012 12:50:49 +0530
Subject: [IMP]rename all fields which r required in project and another module
 and improve code and

bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73
---
 addons/project_long_term/project_long_term_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 1f258ff2ead..f5dcb48576d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,8 +104,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='task']" position="after">
-                    <field name="phases"/>
+                <xpath expr="//field[@name='use_tasks']" position="after">
+                    <field name="use_phases"/>
                 </xpath>
             </field>
         </record>
@@ -116,13 +116,13 @@
             <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
-                <field name="task" position="after">
-                    <field name="phases"/>
-                    <field name="open_phases"/>
+                <field name="use_tasks" position="after">
+                    <field name="use_phases"/>
+                    <field name="phase_count"/>
                 </field>
                 <xpath expr="//div[@id='list']" position="inside">
-                    <t t-if="record.phases.raw_value">
-                        <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1">Phase</t><t t-if="record.open_phases.value > 1">Phases</t>(<t t-esc="record.open_phases.value"/>)</a>
+                    <t t-if="record.use_phases.raw_value">
+                        <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.phase_count.value &lt;= 1">Phase</t><t t-if="record.phase_count.value > 1">Phases</t>(<t t-esc="record.phase_count.value"/>)</a>
                     </t>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From a6a7276d890488085bc2eec46f57e44425df3a4b Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 8 May 2012 14:51:43 +0530
Subject: [IMP]remove open_model method from project related module and add
 action as per required

bzr revid: sgo@tinyerp.com-20120508092143-ah3siaudwp7jixc8
---
 .../project_long_term/project_long_term_view.xml   | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 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 f5dcb48576d..5747ebba5e7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -110,6 +110,16 @@
             </field>
         </record>
         
+        <act_window
+	        context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
+	        id="act_project_phases"
+	        name="Phases"
+	        res_model="project.phase"
+	        src_model="project.project"
+	        view_mode="tree,form"
+	        view_type="form"
+        />
+        
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
@@ -122,7 +132,7 @@
                 </field>
                 <xpath expr="//div[@id='list']" position="inside">
                     <t t-if="record.use_phases.raw_value">
-                        <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.phase_count.value &lt;= 1">Phase</t><t t-if="record.phase_count.value > 1">Phases</t>(<t t-esc="record.phase_count.value"/>)</a>
+                        <a id="4" name="%(act_project_phases)d" class="oe_project_buttons" type="action"><t t-if="record.phase_count.value &lt;= 1">Phase</t><t t-if="record.phase_count.value > 1">Phases</t>(<t t-esc="record.phase_count.value"/>)</a>
                     </t>
                 </xpath>
             </field>
@@ -357,16 +367,6 @@
         view_mode="tree,form"
         />
 
-    <act_window
-        context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
-        id="act_project_phases"
-        name="Phases"
-        res_model="project.phase"
-        src_model="project.project"
-        view_mode="tree,form"
-        view_type="form"
-        />
-
     # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
-- 
cgit v1.2.3


From 479d6009864daf4fff69e7dbcc84a2c9d3098949 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 9 May 2012 09:26:54 +0200
Subject: [IMP] project_long_term: small code cleanup for project kanban view

bzr revid: rco@openerp.com-20120509072654-mp3uxp2qo8m7qlhi
---
 .../project_long_term/project_long_term_view.xml   | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 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 5747ebba5e7..b4042fc42e7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -84,12 +84,12 @@
                 </search>
             </field>
         </record>
-       <record id="act_resouce_allocation" model="ir.actions.act_window">
+        <record id="act_resouce_allocation" model="ir.actions.act_window">
             <field name="name">Planning of Users</field>
             <field name="res_model">project.user.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-             <field name="context">{}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_project_user_allocation_search"/>
         </record>
 
@@ -104,22 +104,21 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='use_tasks']" position="after">
+                <field name="use_tasks" position="after">
                     <field name="use_phases"/>
-                </xpath>
+                </field>
             </field>
         </record>
-        
-        <act_window
-	        context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
-	        id="act_project_phases"
-	        name="Phases"
-	        res_model="project.phase"
-	        src_model="project.project"
-	        view_mode="tree,form"
-	        view_type="form"
+
+        <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>
@@ -131,9 +130,8 @@
                     <field name="phase_count"/>
                 </field>
                 <xpath expr="//div[@id='list']" position="inside">
-                    <t t-if="record.use_phases.raw_value">
-                        <a id="4" name="%(act_project_phases)d" class="oe_project_buttons" type="action"><t t-if="record.phase_count.value &lt;= 1">Phase</t><t t-if="record.phase_count.value > 1">Phases</t>(<t t-esc="record.phase_count.value"/>)</a>
-                    </t>
+                    <a t-if="record.use_phases.raw_value" class="oe_project_buttons"
+                        id="4" name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3