From fdc839079f63171745b9dc18d86035d74b6c0a2c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 4 Oct 2010 18:40:33 +0530
Subject: [FIX]:Issue Menu:-Issue will be Convert Task Only when Issue in To Do
 State  -- progressbar on issue to related with task progressbar >> Long Term
 Planning Menu:The Gantt View Display Phase Name ---calender view and Gantt
 View Display All Phases

bzr revid: ron@tinyerp.com-20101004131033-czvqbsgeebo2wu0w
---
 addons/project_long_term/project_long_term_view.xml | 8 ++++----
 1 file changed, 4 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 3412ba7ca08..c7122726f75 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+                   <field name="phase_id" string="Phase Name"/>
                 </level>
               </gantt>
             </field>
@@ -326,7 +326,7 @@
     # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
-    
+
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
@@ -348,8 +348,8 @@
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-        </record>   
-    
+        </record>
+
     <act_window
         id="project_phase_task_list"
         name="Related Tasks"
-- 
cgit v1.2.3


From 635e3389e9fcba904ede1ae7d57fec1f6b587608 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 7 Oct 2010 14:13:14 +0530
Subject: [IMP] 5008 and 5009 Revert Changes

bzr revid: ron@tinyerp.com-20101007084314-iiqqleknx8j1vy9c
---
 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 c7122726f75..6575d2e03ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="phase_id" string="Phase Name"/>
+                   <field name="useability" string="Availability"/>
                 </level>
               </gantt>
             </field>
-- 
cgit v1.2.3


From 802541e5c78daac2cfc2a1273780193306ba5522 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:51:51 +0530
Subject: [IMP] Project->Long Term Planning--Changes Demo data for
 user:Projects Phases--Useability should be availablity,rename group by user
 into responsible and default group on project,top area field
 arrange:Resources Allocations--change icon in group by Project and resource

bzr revid: ron@tinyerp.com-20101012132151-39z9a08pwj71c7pt
---
 .../project_long_term/project_long_term_view.xml   | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 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 6575d2e03ae..bb8e05770ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -81,9 +81,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -111,21 +111,18 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-	                    <group colspan="2" col="2">
-	                        <field name="name" select="1"/>
-	                        <field name="date_start"/>
-	                    </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)" />
-                           <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 colspan="6" col="6" >
+                            <field name="name" select="1"/>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                            <field name="responsible_id"/>
+                        </group>
+                        <group colspan="6" col="6">
+                            <field name="date_start"/>
+                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
+                            <field name="date_end"/>
+                        </group>
+                     </group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -274,7 +271,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -291,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -301,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
-- 
cgit v1.2.3


From dcc2dff5213763b21a898d9f792f951c0be1ae66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 13 Oct 2010 11:42:42 +0530
Subject: [MOD/IMP]: Usability Improvement, Change Icon of Project
 Filter/Button

bzr revid: dbr@tinyerp.com-20101013061242-ojqo1ff1db368sab
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 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 f2e4c6efd68..5205b14f1bd 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -83,7 +83,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -268,7 +268,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
@@ -277,7 +277,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From 10ecb719bd9f013765cbb69d1c36b9e093edadf2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 15:56:54 +0530
Subject: [IMP] project_long_term: improve gantt view

bzr revid: hmo@tinyerp.com-20101014102654-e3wkawf339sc9ido
---
 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 e83085c3afa..f124fc27c8c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,8 +14,8 @@
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+               <level object="project.resource.allocation" link="id" domain="[]">
+                    <field name="resource_id"/>
                 </level>
               </gantt>
             </field>
@@ -27,7 +27,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+                <calendar color="resource_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
                     <field name="phase_id"/>
                     <field name="project_id"/>
                 </calendar>
@@ -244,7 +244,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.project" link="project_id" domain="[]">
+                    <level object="project.phase" link="id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>
@@ -288,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+            <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -298,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
-- 
cgit v1.2.3


From b8ba14a6d09284afeff3b9c02ffb78a24fc8b8d1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:02:34 +0530
Subject: [IMP] project_long_term: menu rearrange

bzr revid: hmo@tinyerp.com-20101014103234-jhitg1bav1vcvbqh
---
 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 f124fc27c8c..2d893a57a34 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -373,14 +373,14 @@
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="3"/>
 
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
-- 
cgit v1.2.3


From 90efafbb37ed9dabfc89a5a487510bffbfc9c213 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 17:45:12 +0530
Subject: [IMP] project_long_term: improvement gantt view

bzr revid: hmo@tinyerp.com-20101014121512-7gjrlk5mvkdad8nl
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 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 2d893a57a34..9a4e89011e9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,9 +13,9 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="project.resource.allocation" link="id" domain="[]">
-                    <field name="resource_id"/>
+              <gantt color="resource_id" date_start="date_start" date_stop="date_end" mode="year">
+               <level object="project.project" link="project_id" domain="[]">
+                    <field name="phase_id"/>
                 </level>
               </gantt>
             </field>
@@ -243,8 +243,8 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.phase" link="id" domain="[]">
+                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                    <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>
-- 
cgit v1.2.3


From afb78caf8d830c4c49cf531568659870efa9d72c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 19:11:24 +0530
Subject: [IMP] project_long_term: gantt view and search view of phase

bzr revid: hmo@tinyerp.com-20101014134124-s90f56e5dn3cx28g
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 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 9a4e89011e9..713322f5f0e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -230,9 +230,9 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="responsible_id" date_start="date_start" date_stop="date_end" day_length="12" string="Phases">
+                <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
                     <field name="name"/>
-                    <field name="project_id"/>
+                    <field name="responsible_id"/>
                 </calendar>
             </field>
         </record>
@@ -243,7 +243,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
-- 
cgit v1.2.3


From 40f4295ac6332aa771a4777cfe7d3d8165110761 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 19:38:59 +0530
Subject: [IMP] project_long_term: gantt view

bzr revid: hmo@tinyerp.com-20101015140859-hc10fm4aardz065s
---
 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 713322f5f0e..6dd336af923 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,7 +13,7 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="resource_id" date_start="date_start" date_stop="date_end" mode="year">
+              <gantt color="phase_id" date_start="date_start" date_stop="date_end" mode="year">
                <level object="project.project" link="project_id" domain="[]">
                     <field name="phase_id"/>
                 </level>
-- 
cgit v1.2.3


From c18c64a99a15162e82290bfc9a7336d103a807e6 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 15 Oct 2010 19:41:26 +0530
Subject: [IMP] project : improved access rights, group and menus

bzr revid: jas@tinyerp.com-20101015141126-gzqsm3jm4sei200d
---
 addons/project_long_term/project_long_term_view.xml | 8 ++++----
 1 file changed, 4 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 713322f5f0e..232d04686d9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -369,17 +369,17 @@
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase"
-            groups="base.group_extended"
+            groups="base.group_extended,project.group_project_finance_user,project.group_project_manager"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="3"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"
+            groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
-- 
cgit v1.2.3


From 3ce6888e424f45cbc6c6c0148cc7686057c81ac7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 21:17:01 +0530
Subject: [IMP] project_long_term: improve gantt view of resource allocation

bzr revid: hmo@tinyerp.com-20101015154701-6fw3rbkjfpilagji
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 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 c88c2229745..5e6ccebfe75 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,9 +13,9 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="date_start" date_stop="date_end" mode="year">
-               <level object="project.project" link="project_id" domain="[]">
-                    <field name="phase_id"/>
+              <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
+               <level object="project.phase" link="phase_id" domain="[]">
+                    <field name="name"/>
                 </level>
               </gantt>
             </field>
-- 
cgit v1.2.3


From db6ee299b9bda8561074d6b70f4327b3341ec96d Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sat, 16 Oct 2010 00:01:00 +0200
Subject: fix

bzr revid: fp@fp-laptop-20101015220100-h9a9m5zkfnyfpx9e
---
 .../project_long_term/project_long_term_view.xml   | 23 ++++++++++++----------
 1 file changed, 13 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 70bed5aba41..1ca78537340 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,7 +14,7 @@
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
-               <level object="project.phase" link="phase_id" domain="[]">
+               <level object="res.users" link="user_id" domain="[]">
                     <field name="name"/>
                 </level>
               </gantt>
@@ -73,7 +73,7 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Resource Allocations">
+                <search string="Resources Allocation">
                     <group colspan="4" col="20">
                         <field name="resource_id"/>
                         <field name="phase_id"/>
@@ -89,9 +89,8 @@
                 </search>
             </field>
         </record>
-
        <record id="act_resouce_allocation" model="ir.actions.act_window">
-            <field name="name">Resource Allocations</field>
+            <field name="name">Resources Allocation</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
@@ -243,7 +242,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
+                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="month">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
@@ -298,7 +297,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
+             <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -356,7 +355,7 @@
         context="{'search_default_phase_id': [active_id]}"/>
 
     <act_window
-    	context="{'search_default_project_id': [active_id]}"
+        context="{'search_default_project_id': [active_id]}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
@@ -368,8 +367,12 @@
     # Menu Items
     # ------------------------------------------------------
 
+        <menuitem action="act_project_phase_list"
+            groups="base.group_extended"
+            id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
+
         <menuitem action="act_project_phase"
-            groups="base.group_extended,project.group_project_finance_user,project.group_project_manager"
+            groups="base.group_extended"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
@@ -379,8 +382,8 @@
             groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
-- 
cgit v1.2.3


From 80cd518e1d1692751c2d073cd3f389022230cda0 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Sat, 16 Oct 2010 13:56:55 +0530
Subject: [ADD/MOD] Improved tooltips on menus

bzr revid: vir@tinyerp.com-20101016082655-jtqm0447fb7zkrv9
---
 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 1ca78537340..025457de18a 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_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</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 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>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
-- 
cgit v1.2.3


From fe9500c14ebfa512f5532846b91972ce4f76dcc0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 18:47:09 +0200
Subject: [IMP] access rights cleaning

bzr revid: fp@tinyerp.com-20101016164709-8w551aaosqx0dufu
---
 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 025457de18a..ac6f884f3a4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -382,7 +382,7 @@
             groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.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,base.group_system,project.group_project_finance_user"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
-- 
cgit v1.2.3


From 2c63a39497a6a24e3db177d685e5e9191c0a632e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 22:31:19 +0200
Subject: [IMP] access rights, account tax include no more required, some fixes

bzr revid: fp@tinyerp.com-20101017203119-2p80zc0nz6tjpxr8
---
 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 ac6f884f3a4..71e96543232 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -379,10 +379,10 @@
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended,project.group_project_finance_user"
+            groups="base.group_extended"
             name="Resources" parent="project.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,project.group_project_finance_user"/>
+        <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_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
-- 
cgit v1.2.3


From bad70ac4b23ded8020b82c2b092da1dd7367a8aa Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 19 Oct 2010 14:22:53 +0200
Subject: [IMP] project_long_term: set proper icon on gantt views

bzr revid: qdp-launchpad@tinyerp.com-20101019122253-g27bwkxet5glannr
---
 addons/project_long_term/project_long_term_view.xml | 2 ++
 1 file changed, 2 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 71e96543232..b0647968e84 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -372,10 +372,12 @@
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
         <menuitem action="act_project_phase"
+            icon="STOCK_INDENT"
             groups="base.group_extended"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+            icon="STOCK_INDENT"
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-- 
cgit v1.2.3