From 622e39465b006df40574f02cf70d9e7008d10ac7 Mon Sep 17 00:00:00 2001
From: "Vianney,Anup(OpenERP)" <>
Date: Wed, 6 Oct 2010 16:42:47 +0530
Subject: [FIX] project_long_term : _compute() method corrected and view of
 project phase corrected.

lp bug: https://launchpad.net/bugs/655316 fixed

bzr revid: ach@tinyerp.com-20101006111247-53h19u0qw8z97u4u
---
 .../project_long_term/project_long_term_view.xml   | 25 +++++++++++-----------
 1 file changed, 13 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 3412ba7ca08..fa645af4127 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -110,22 +110,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Phase">
-                    <group colspan="6" col="6">
-	                    <group colspan="2" col="2">
+                    <group colspan="8" col="7">
+	                    <group colspan="8">
 	                        <field name="name" select="1"/>
-	                        <field name="date_start"/>
+                            <field name="total_hours"/>
+	                        <field name="project_id" on_change="onchange_project(project_id)" colspan="2"/>
+                            <field name="responsible_id" colspan="2"/>
 	                    </group>
-	                    <group colspan="2" col="4">
-	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
-                           <newline/>
-	                       <field name="duration" colspan="1" on_change="onchange_days(project_id)" />
+						<newline/>
+	                    <group colspan="2">
+                             <field name="date_start"/>
+                             <field name="date_end"/>
+                        </group>
+                        <group colspan="2">
+	                       <field name="duration"  on_change="onchange_days(project_id)"/>	                       
                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-	                    </group>
-	                    <group colspan="2" col="2">
-	                       <field name="responsible_id"/>
-	                       <field name="date_end"/>
                     	</group>
-					</group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
-- 
cgit v1.2.3


From 4be1e3bd9c72143bbde534280fc7cd5416d6c471 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 11:05:13 +0530
Subject: [MOD/IMP] procurement/project_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101012053513-bkml0c84s2wplcco
---
 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 fa645af4127..f2e4c6efd68 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,11 +146,11 @@
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Task Detail">
-- 
cgit v1.2.3