From 8757121c6303a2ecf35df9696c4a3911cab2fe74 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Thu, 10 Nov 2011 11:18:13 +0530
Subject: [imp] improved project, project_long_term, resource's demo data and
 view

bzr revid: han@tinyerp.com-20111110054813-ptetwsvp8j0l3q62
---
 addons/project_long_term/project_long_term_view.xml | 12 +++++-------
 1 file changed, 5 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 dfef83e4468..3e3c794d5c4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -300,9 +300,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="sequence" position="after">
+                <xpath expr="//field[@name='effective_hours']" position="after">
                     <field name="phase_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
         <record id="view_phase_task_search_form" model="ir.ui.view">
@@ -324,7 +324,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
-            <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
+            <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}"/>
             </filter>
             </field>
         </record>
@@ -367,12 +367,10 @@
     # ------------------------------------------------------
 
         <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"
             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"
@@ -385,8 +383,8 @@
 
         <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_users_project1" sequence="2"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="5"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="3"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 85dc7439b9a233189c6d2f8a8ba1e878f2a3bb6f Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Thu, 10 Nov 2011 16:26:10 +0530
Subject: [imp] remove domain from act_window in project_long_term

bzr revid: han@tinyerp.com-20111110105610-62vw9emo4iiwlpa9
---
 addons/project_long_term/project_long_term_view.xml | 3 +--
 1 file changed, 1 insertion(+), 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 3e3c794d5c4..dac6b670fc9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -352,12 +352,11 @@
         />
 
     <act_window
-        context="{'search_default_project_id': [active_id]}"
+        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"
-        domain="[('project_id', '=', active_id)]"
         view_mode="tree,form"
         view_type="form" 
         />
-- 
cgit v1.2.3


From 3b59839b8e3090d39c1ccb033263a5217e3c39eb Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Thu, 10 Nov 2011 17:00:02 +0530
Subject: [imp] remove domain from act_window in project_long_term for related
 tasks

bzr revid: han@tinyerp.com-20111110113002-znk9bc6huk3147mf
---
 addons/project_long_term/project_long_term_view.xml | 3 +--
 1 file changed, 1 insertion(+), 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 dac6b670fc9..8d86d1bc816 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -342,13 +342,12 @@
         </record>
 
     <act_window
+        context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id, 'default_project_id' : active_id}"
         id="project_phase_task_list"
         name="Related Tasks"
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        context="{'search_default_phase_id': [active_id]}"
-        domain="[('phase_id', '=', active_id),('project_id','=',project_id)]"
         />
 
     <act_window
-- 
cgit v1.2.3


From 2603b23c14f8ec429a29df15581e0d1383d7693f Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Fri, 11 Nov 2011 16:13:39 +0530
Subject: [imp] modified demo data of project long term and added wizard
 project_phase_complete

bzr revid: han@tinyerp.com-20111111104339-yvh5jf21femvp0ik
---
 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 8d86d1bc816..0a548a23d81 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -119,7 +119,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Planning of Users">
-                            <field colspan="4" name="user_ids" nolabel="1">
+                            <field colspan="4" name="user_ids" readonly="1" nolabel="1">
                                  <tree editable="bottom" string="Project Users">
                                     <field name="user_id"/>
                                     <field name="date_start"/>
-- 
cgit v1.2.3


From 4d77356d9152c25641baa6749ac96c28216a277c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 14 Nov 2011 12:18:10 +0100
Subject: misc

bzr revid: fp@tinyerp.com-20111114111810-v5jspbkway8lf6nc
---
 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 577ce6d135c..6ab69122277 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -376,8 +376,8 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            groups="base.group_extended"
-            name="Users" parent="project.menu_definitions" sequence="3"/>
+            groups="base.group_no_one"
+            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"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
-- 
cgit v1.2.3


From ba414a33494dedcf76c3d6ec4c21f703783fd550 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 14 Nov 2011 13:24:10 +0100
Subject: miniimp

bzr revid: fp@tinyerp.com-20111114122410-38hg8x0tsmx3pnri
---
 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 6ab69122277..cdeb0a0d63d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -376,7 +376,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            groups="base.group_no_one"
+            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"/>
-- 
cgit v1.2.3