From 566d6bd26595095c3190ec92eb91d94a5d4c939f Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 9 Dec 2010 17:22:11 +0530
Subject: [MERGE] Merge project improvement

bzr revid: sbh@tinyerp.com-20101209115211-59kgvup52dqrm2en
---
 addons/project_long_term/project_long_term_view.xml | 15 ++++++++++++++-
 1 file changed, 14 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 39d9d1cfa8b..6e109f54b6d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -386,8 +386,21 @@
         name="Phases"
         res_model="project.phase"
         src_model="project.project"
+		domain="[('project_id', '=', active_id)]"
         view_mode="tree,form"
-        view_type="form" />
+        view_type="form" 
+		/>
+
+	<act_window
+		context="{'search_default_user_id': [user_id]}"
+        id="act_project_resource"
+        name="Resources"
+        res_model="resource.resource"
+        src_model="project.project"
+		domain="[('user_id', '=',user_id)]"
+        view_mode="tree,form"
+        view_type="form" 
+		/>
 
     # ------------------------------------------------------
     # Menu Items
-- 
cgit v1.2.3


From 56d3cf7e57a2902aaf4f62d8724d0a6893cdf53a Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 9 Dec 2010 17:36:15 +0530
Subject: [MERGE] merge project improvment

bzr revid: sbh@tinyerp.com-20101209120615-1xsg7hd61dwlfhhx
---
 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 6e109f54b6d..0cdb7af5ad7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -377,7 +377,7 @@
         src_model="project.phase"
         view_mode="tree,form"
         context="{'search_default_phase_id': [active_id]}"
-        domain="[('phase_id', '=', active_id)]"
+        domain="[('phase_id', '=', active_id),('project_id','=',project_id)]"
         />
 
     <act_window
-- 
cgit v1.2.3