Index: openacs-4/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v
diff -u -N -r1.56 -r1.57
--- openacs-4/packages/project-manager/project-manager.info	24 Oct 2006 15:06:12 -0000	1.56
+++ openacs-4/packages/project-manager/project-manager.info	11 Dec 2006 18:30:53 -0000	1.57
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?XML version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
 <package key="project-manager" url="http://openacs.org/repository/apm/packages/project-manager" type="apm_application">
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="3.2a4" url="http://openacs.org/repository/download/apm/project-manager-3.2a4.apm">
+    <version name="3.2a5" url="http://openacs.org/repository/download/apm/project-manager-3.2a5.apm">
         <owner url="mailto:jade@rubick.com">Jade Rubick</owner>
         <owner url="mailto:malte.sussdorff@cognovis.de">Malte Sussdorff</owner>
         <summary>Project management tool for OpenACS</summary>
@@ -16,7 +16,7 @@
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
         <maturity>0</maturity>
 
-        <provides url="project-manager" version="3.2a4"/>
+        <provides url="project-manager" version="3.2a5"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-mail-lite" version="1.3b2"/>
         <requires url="acs-subsite" version="5.2.2"/>
Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v
diff -u -N -r1.59 -r1.60
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	14 Nov 2006 16:13:16 -0000	1.59
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	11 Dec 2006 18:30:54 -0000	1.60
@@ -465,6 +465,7 @@
   <msg key="page">page)</msg>
   <msg key="Page_Size">Page Size</msg>
   <msg key="Parameters">Parameters</msg>
+  <msg key="Parent_project">Parent project</msg>
   <msg key="Party_ID">Party ID</msg>
   <msg key="People">People</msg>
   <msg key="percent">Percent complete</msg>
Index: openacs-4/packages/project-manager/templates/project-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/project-manager/templates/project-ae.tcl	11 Dec 2006 17:34:58 -0000	1.10
+++ openacs-4/packages/project-manager/templates/project-ae.tcl	11 Dec 2006 18:30:54 -0000	1.11
@@ -30,12 +30,15 @@
 
 if {[exists_and_not_null project_id]} {
     set title "[_ project-manager.lt_Edit_a_project_term_l]"
+    set edit_p 1
     set context_bar [ad_context_bar "[_ project-manager.Edit_project_term]"]
-
+    set project_options [pm::project::get_list_of_open -object_package_id $package_id]
+    set project_options [concat [list [list "" ""]] $project_options]
     # permissions
     permission::require_permission -party_id $user_id -object_id $package_id -privilege write
 
 } else {
+    set edit_p 0
     set title "[_ project-manager.lt_Add_a_project_term_lo]"
     set context_bar [ad_context_bar "[_ project-manager.New_project_term]"]
 
@@ -58,10 +61,6 @@
     -form {
         project_id:key
         
-        {parent_id:text(hidden)
-            {value $parent_id}
-        }
-	
         {project_item_id:text(hidden)
             {value $project_item_id}
         }
@@ -100,6 +99,26 @@
     }
 
 
+if {[string is true $edit_p]} {
+    ad_form -extend -name add_edit \
+	-form {
+	    {parent_id:text(select),optional
+		{label "[_ project-manager.Parent_project]"}
+		{value $parent_id}
+		{options $project_options}
+	    }
+	}
+} else {
+    ad_form -extend -name add_edit \
+	-form {
+	    {parent_id:text(hidden)
+		{value $parent_id}
+	    }
+	}
+}
+	
+
+
 if {[exists_and_not_null customer_id]} {
     set customer_name [organizations::name -organization_id $customer_id]
     ad_form -extend -name add_edit \
@@ -196,7 +215,8 @@
             set ongoing_p t
         }
 	
-	set planned_end_date [template::util::date::get_property ansi_no_time [template::util::date::today]]
+	set planned_end_date [template::util::date::get_property linear_date_no_time [template::util::date::today]]
+	set planned_end_date [join $planned_end_date "-"]
 	set planned_start_date [template::util::date::now]
 	set description [template::util::richtext::create "" {}]
     } -edit_request {
@@ -305,6 +325,7 @@
 
 	    set project_item_id [pm::project::get_project_item_id -project_id $project_id]
 
+	    db_dml update_parent_id {}
 	    if {[exists_and_not_null category_ids]} {
 		category::map_object -object_id $project_id $category_ids
 	    }
Index: openacs-4/packages/project-manager/templates/project-ae.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/templates/project-ae.xql	11 Dec 2006 18:30:54 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<queryset>
+
+  <fullquery name="update_parent_id">
+    <querytext>
+	    update cr_items
+	    set parent_id = :parent_id
+	    where item_id = :project_item_id
+    </querytext>
+  </fullquery>
+
+</queryset>