From 53e750189a260aa2847e67738903f53e13eaf91d Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Mon, 13 Dec 2010 18:31:32 +0530
Subject: [BUG-FIX] lp:689581

bzr revid: jam@tinyerp.com-20101213130132-bqqm4yntm9hxfd7l
---
 addons/project_long_term/project_long_term_view.xml | 1 +
 1 file changed, 1 insertion(+)

(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 0cdb7af5ad7..42f39c7e312 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,6 +151,7 @@
                         <page string="Task Detail">
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
                                  <tree editable="bottom" string="Project's Tasks">
+                                    <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="planned_hours" widget="float_time"/>
-- 
cgit v1.2.3


From ad344b9f547abf92b9dd95fe2b015a38ac868943 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Mon, 13 Dec 2010 19:00:26 +0530
Subject: [BUG-FIX] lp:689583

bzr revid: jam@tinyerp.com-20101213133026-dtjega4nu7tx63vt
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 42f39c7e312..c29a783dc97 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -198,9 +198,9 @@
                                 <field name="sequence"/>
                             </group>
                            <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
+                           <field colspan="4" name="previous_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
                            <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <field colspan="4" name="next_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
                         </page>
                     </notebook>
                     <newline/>
-- 
cgit v1.2.3


From ab38e64d022e2544460132ecdb54426e2eeb7f29 Mon Sep 17 00:00:00 2001
From: Els Van Vossel <openerp@evv-laptop>
Date: Tue, 14 Dec 2010 07:22:11 +0100
Subject: [IMP] changed menutips

bzr revid: openerp@evv-laptop-20101214062211-mlp6bzfhb0tw0fu6
---
 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 39d9d1cfa8b..9e62f535585 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -289,7 +289,7 @@
             <field name="view_mode">gantt,tree,form,calendar</field>
             <field name="context">{"search_default_current": 1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it.</field>
+            <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on the project.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
-- 
cgit v1.2.3


From b1e53117600ac347da8d85796a7b8b930b8b5875 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 29 Dec 2010 15:16:04 +0100
Subject: [IMP] project_long_term: added date_end and duration to the phase
 list view.

bzr revid: vmt@openerp.com-20101229141604-wq8ank7n8fl61ytx
---
 addons/project_long_term/project_long_term_view.xml | 3 +++
 1 file changed, 3 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 6b5c826eae3..37813f84946 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -219,6 +219,8 @@
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
                     <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="duration"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -268,6 +270,7 @@
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
+                        <field name="date_end"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-- 
cgit v1.2.3


From 74287c78938cd17d1f2c79063450b879d2989ef5 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 30 Dec 2010 16:27:27 +0530
Subject: [FIX] project_long_term: remove onchange day on project.phase module.
 no need to change end date of phase. we can schedule end date using scheduler
 phase

bzr revid: hmo@tinyerp.com-20101230105727-ev1fppejij0ngv32
---
 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 37813f84946..79f5d65811b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -117,7 +117,7 @@
                         </group>
                         <group colspan="6" col="6">
                             <field name="date_start"/>
-                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="duration"/>
                             <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
                             <field name="date_end"/>
                         </group>
-- 
cgit v1.2.3


From e0fc25a57d289c4b1da35176ab430c134194c929 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 30 Dec 2010 18:05:34 +0530
Subject: [IMP] project_long_term: improved view/tooltips

bzr revid: hmo@tinyerp.com-20101230123534-dde55foizf83fddi
---
 addons/project_long_term/project_long_term_view.xml | 13 ++++++++-----
 1 file changed, 8 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 79f5d65811b..e7f63008585 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -135,7 +135,7 @@
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
                                     <field name="date_start"/>
                                     <field name="date_end"/>
-                                    <field name="useability"/>
+                                    <field name="useability" string="Availability"/>
                                   </form>
                              </field>
                             <separator string="" colspan="4"/>
@@ -148,15 +148,17 @@
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                             </group>
                         </page>
-                        <page string="Task Detail">
-                            <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                                 <tree editable="bottom" string="Project's Tasks">
+                        <page string="Tasks Details">
+                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                                 <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="state"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -165,6 +167,7 @@
                                                 <field name="name"/>
                                                 <field name="project_id"/>
                                                 <field name="user_id"/>
+                                                <field name="sequence"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Dates" colspan="2"/>
@@ -175,7 +178,7 @@
                                                   <separator string="Planning" colspan="2"/>
                                                   <field name="planned_hours" widget="float_time"/>
                                                 <field name="total_hours" widget="float_time"/>
-                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="remaining_hours" widget="float_time"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
                                             <group colspan="6" col="4">
-- 
cgit v1.2.3


From 84be62444bbbc1f7f3e36bc03c8b4600dda7f454 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 30 Dec 2010 22:15:41 +0530
Subject: [FIX] project_long_term: improve string in view

bzr revid: hmo@tinyerp.com-20101230164541-921clwgcu0lw4ghh
---
 addons/project_long_term/project_long_term_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 e7f63008585..7eaed6e120c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -63,7 +63,7 @@
                     <field name="resource_id"/>
                     <field name="phase_id"/>
                     <field name="project_id"/>
-                    <field name="useability"/>
+                    <field name="useability" string="Availability"/>
                 </tree>
             </field>
         </record>
@@ -127,14 +127,14 @@
                             <field colspan="4" name="resource_ids" nolabel="1">
                                  <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
-                                    <field name="useability"/>
+                                    <field name="date_start" readonly="1"/>
+                                    <field name="date_end" readonly="1"/>
+                                    <field name="useability" string="Availability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
+                                    <field name="date_start" readonly="1"/> 
+                                    <field name="date_end" readonly="1"/>
                                     <field name="useability" string="Availability"/>
                                   </form>
                              </field>
-- 
cgit v1.2.3