Index: openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	9 Oct 2006 17:32:46 -0000	1.27
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	22 Jan 2007 16:48:33 -0000	1.28
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="project-manager" package_version="3.2a1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="project-manager" package_version="3.2a5" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="---_TBD_---">--- noch nicht festgelegt ---</msg>
   <msg key="--_Closed">-- geschlossen</msg>
@@ -106,7 +106,7 @@
   <msg key="Dependency">Abh�ngigkeiten:</msg>
   <msg key="Dependency_1">Abh�ngigkeit</msg>
   <msg key="Dependency_types">Abh�ngigkeitstypen</msg>
-  <msg key="Description">Interne Projekt-Beschreibung</msg>
+  <msg key="Description">Projekt-Beschreibung</msg>
   <msg key="Description_1">Interne Projekt-Beschreibung:</msg>
   <msg key="Description_2">Beschreibung</msg>
   <msg key="Description_changed">Beschreibung ge�ndert</msg>
@@ -140,7 +140,7 @@
   <msg key="Enhanced_Text">Erweiterter Text</msg>
   <msg key="Error">Fehler</msg>
   <msg key="ES">ES</msg>
-  <msg key="Estimated_Hours">Gesch�tzte Stunden / Zeilen</msg>
+  <msg key="Estimated_Hours">Gesch�tzte Stunden</msg>
   <msg key="Estimated_Hours_Max">Gesch�tzte Stunden / Zeilen</msg>
   <msg key="Estimated_Hours_Min">Gesch�tzte Stunden (min.)</msg>
   <msg key="Estimated_hours_work">Gesch�tzte Stunden an Arbeit</msg>
@@ -291,7 +291,7 @@
   <msg key="lt_set_according_to_task">Von den Aufgabenzuteilungen aus zuteilen</msg>
   <msg key="lt_set_project_term_code">%project_term% Nr.</msg>
   <msg key="lt_set_project_term_goal">%project_term%ziel</msg>
-  <msg key="lt_set_project_term_name">%project_term%ID Nr.</msg>
+  <msg key="lt_set_project_term_name">%project_term% Name</msg>
   <msg key="lt_Set_to_100_to_close_t">Auf 100 setzen, um diese Aufgabe zu schlie�en.</msg>
   <msg key="lt_set_up_integration_wi">Aufsetzen der Integration mit dem Log</msg>
   <msg key="lt_Set_up_logger_integra">Set up der Log Integration</msg>
@@ -391,6 +391,7 @@
   <msg key="page">Seite)</msg>
   <msg key="Page_Size">Seitengr��e</msg>
   <msg key="Parameters">Parameter</msg>
+  <msg key="Parent_project">Hauptprojekt</msg>
   <msg key="Party_ID">Party ID</msg>
   <msg key="People">Personen</msg>
   <msg key="percent">Prozent fertig</msg>
@@ -410,7 +411,7 @@
   <msg key="Priorities">Priorit�ten</msg>
   <msg key="Priority">Priorit�t:</msg>
   <msg key="Priority_1">Priorit�t</msg>
-  <msg key="Priority_changed">Priorit�t ge�ndert &lt;i&gt;von&lt;/i&gt; %old_prio &lt;i&gt;zu&lt;/i&gt; %new_prio%</msg>
+  <msg key="Priority_changed">Priorit�t ge�ndert &lt;i&gt;von&lt;/i&gt; %old_prio% &lt;i&gt;zu&lt;/i&gt; %new_prio%</msg>
   <msg key="Proceed">Weiter (Projekt schliessen)</msg>
   <msg key="Proceed_with_closing">Subprojekte ebenfalls schliessen</msg>
   <msg key="Process">Prozess</msg>
@@ -509,7 +510,7 @@
   <msg key="Subject">Thema:</msg>
   <msg key="Subject_1">Thema</msg>
   <msg key="Subject_2">Betreff\</msg>
-  <msg key="Subject_changed">Betreff ge�ndert &lt;i&gt;von&lt;/i&gt; %old_title &lt;i&gt;zu&lt;/i&gt; %new_title%</msg>
+  <msg key="Subject_changed">Betreff ge�ndert &lt;i&gt;von&lt;/i&gt; %old_title% &lt;i&gt;zu&lt;/i&gt; %new_title%</msg>
   <msg key="Subproject_tasks">Unterprojekt Aufgaben</msg>
   <msg key="Subprojects">Subprojekte</msg>
   <msg key="Subtotal">Zwischensumme</msg>
@@ -523,6 +524,7 @@
   <msg key="Task_calendar">Aufgaben Kalender</msg>
   <msg key="Task_categories">Aufgabenkategorien:</msg>
   <msg key="task_change">Aufgabenver�nderungen</msg>
+  <msg key="Task_description">Aufgabenbeschreibung</msg>
   <msg key="task_Description_1">Inhalt der Aufgabe</msg>
   <msg key="Task_hours_completed">Abgeschlossen Aufgabenstunden</msg>
   <msg key="Task_name">Name der Aufgabe:</msg>
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 -r1.60 -r1.61
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	11 Dec 2006 18:30:54 -0000	1.60
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	22 Jan 2007 16:48:33 -0000	1.61
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="project-manager" package_version="3.2a4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="project-manager" package_version="3.2a5" locale="en_US" charset="ISO-8859-1">
 
   <msg key="---_TBD_---">--- TBD ---</msg>
   <msg key="--_Closed">-- Closed</msg>
@@ -598,6 +598,7 @@
   <msg key="Task_calendar">Task calendar</msg>
   <msg key="Task_categories">Task categories</msg>
   <msg key="task_change">task change</msg>
+  <msg key="Task_description">Task description</msg>
   <msg key="task_Description_1">Task Description</msg>
   <msg key="Task_end_date">Task deadline</msg>
   <msg key="Task_hours_completed">Task hours completed</msg>
Index: openacs-4/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/project-manager/tcl/project-manager-procs.tcl	19 Jun 2006 06:35:45 -0000	1.16
+++ openacs-4/packages/project-manager/tcl/project-manager-procs.tcl	22 Jan 2007 16:48:34 -0000	1.17
@@ -445,7 +445,7 @@
         # task
 
         if {[string equal $type task]} {
-	    
+
 	    set from_address [party::email -party_id $user_id]
 	    
 	    set task_url [pm::task::get_url $object_id]
@@ -543,6 +543,7 @@
     foreach to $to_addr {
 	if { ![empty_string_p $to] } {
 	    acs_mail_lite::complex_send \
+		-send_immediately \
 		-to_addr  "$to" \
 		-from_addr "$from_addr" \
 		-subject "$subject" \
Index: openacs-4/packages/project-manager/templates/task-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/project-manager/templates/task-ae.tcl	22 Jan 2007 16:05:20 -0000	1.14
+++ openacs-4/packages/project-manager/templates/task-ae.tcl	22 Jan 2007 16:48:34 -0000	1.15
@@ -126,6 +126,9 @@
 	}
 }
         
+# Where should we store the attached files in file storage
+set folder_id [lindex [application_data_link::get_linked -from_object_id $project_item_id -to_object_type "content_folder"] 0]
+
 ad_form -extend -name task_add_edit \
     -form {
         {task_title:text
@@ -135,7 +138,8 @@
         
         {description:richtext(richtext),optional
             {label "[_ project-manager.Task_description]"}
-            {html { rows 14 cols 40 wrap soft}}
+	    {options {editor xinha plugins OacsFs height 350px folder_id $folder_id}}
+	    {html { cols 80 wrap soft}}
 	}
         
         {description_mime_type:text(select),optional