Index: openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	15 Dec 2005 18:38:15 -0000	1.17
+++ openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	18 Dec 2005 12:29:27 -0000	1.18
@@ -469,8 +469,8 @@
 			  -static_p "f" \
 			  -if_does_not_exist]
 
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "Firmenkuerzel"
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Firmenkuerzel"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "Firmenk�rzel"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Firmenk�rzel"
 
     ams::attribute::new \
 	-attribute_id $attribute_id \
@@ -502,7 +502,7 @@
 			  -if_does_not_exist]
 
     lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "Erweiterung Firmenname"
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Erweiterung Firmenname"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Erweiterungen Firmennamen"
 
     ams::attribute::new \
 	-attribute_id $attribute_id \
@@ -533,7 +533,7 @@
 			  -if_does_not_exist]
 
     lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "Firmenanschrift"
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Firmenanschrift"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Firmenanschriften"
 
     ams::attribute::new \
 	-attribute_id $attribute_id \
@@ -564,7 +564,7 @@
 			  -if_does_not_exist]
 
     lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "E-Mail Adresse"
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "E-Mail Adresse"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "E-Mail Adressen"
 
     ams::attribute::new \
 	-attribute_id $attribute_id \
@@ -720,6 +720,39 @@
 
     lang::message::register -update_sync de_DE acs-translations "ams_option_${option_id}" "PR-Agentur"
 
+
+    set attribute_id [attribute::new \
+			  -object_type "organization" \
+			  -attribute_name "collaboration_notes" \
+			  -datatype "text" \
+			  -pretty_name "Notes on Collaboration" \
+			  -pretty_plural "Notes on Collaboration" \
+			  -table_name "" \
+			  -column_name "" \
+			  -default_value "" \
+			  -min_n_values "1" \
+			  -max_n_values "1" \
+			  -sort_order "1" \
+			  -storage "generic" \
+			  -static_p "f" \
+			  -if_does_not_exist]
+
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "Notizen zur Zusammenarbeit"
+    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "Notizen zur Zusammenarbeit"
+
+    ams::attribute::new \
+	-attribute_id $attribute_id \
+	-widget "textarea" \
+	-dynamic_p "t"
+
+    ams::list::attribute::map \
+	-list_id $list_id \
+	-attribute_id $attribute_id \
+	-sort_order "70" \
+	-required_p "f" \
+	-section_heading ""
+
+
     #     Organization - Customer
 
     set list_id [ams::list::new \
@@ -912,6 +945,13 @@
 	-required_p "f" \
 	-section_heading ""
 
+    ams::list::attribute::map \
+	-list_id $leads_list_id \
+	-attribute_id $attribute_id \
+	-sort_order "10" \
+	-required_p "f" \
+	-section_heading ""
+
     set attribute_id [attribute::new \
 			  -object_type "person" \
 			  -attribute_name "jobtitle" \
@@ -943,6 +983,13 @@
 	-required_p "f" \
 	-section_heading ""
 
+    ams::list::attribute::map \
+	-list_id $leads_list_id \
+	-attribute_id $attribute_id \
+	-sort_order "20" \
+	-required_p "f" \
+	-section_heading ""
+
     set attribute_id [attribute::new \
 			  -object_type "person" \
 			  -attribute_name "directphoneno" \
@@ -974,6 +1021,13 @@
 	-required_p "f" \
 	-section_heading ""
 
+    ams::list::attribute::map \
+	-list_id $leads_list_id \
+	-attribute_id $attribute_id \
+	-sort_order "30" \
+	-required_p "f" \
+	-section_heading ""
+
     set attribute_id [attribute::new \
 			  -object_type "person" \
 			  -attribute_name "telephone_other" \
@@ -1005,6 +1059,13 @@
 	-required_p "f" \
 	-section_heading ""
 
+    ams::list::attribute::map \
+	-list_id $leads_list_id \
+	-attribute_id $attribute_id \
+	-sort_order "40" \
+	-required_p "f" \
+	-section_heading ""
+
     set attribute_id [attribute::new \
 			  -object_type "person" \
 			  -attribute_name "directfaxno" \
@@ -1036,6 +1097,13 @@
 	-required_p "f" \
 	-section_heading ""
 
+    ams::list::attribute::map \
+	-list_id $leads_list_id \
+	-attribute_id $attribute_id \
+	-sort_order "50" \
+	-required_p "f" \
+	-section_heading ""
+
     set attribute_id [attribute::new \
 			  -object_type "person" \
 			  -attribute_name "mobile_phone" \
@@ -1067,34 +1135,10 @@
 	-required_p "f" \
 	-section_heading ""
 
-    set attribute_id [attribute::new \
-			  -object_type "person" \
-			  -attribute_name "directemail" \
-			  -datatype "email" \
-			  -pretty_name "E-Mail Adress" \
-			  -pretty_plural "E-Mail Adresses" \
-			  -table_name "" \
-			  -column_name "" \
-			  -default_value "" \
-			  -min_n_values "1" \
-			  -max_n_values "1" \
-			  -sort_order "1" \
-			  -storage "generic" \
-			  -static_p "f" \
-			  -if_does_not_exist]
-
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_name" "E-Mail Adresse"
-    lang::message::register -update_sync de_DE acs-translations "ams_attribute_${attribute_id}_pretty_plural" "E-Mail Adresse"
-
-    ams::attribute::new \
-	-attribute_id $attribute_id \
-	-widget "email" \
-	-dynamic_p "t"
-
     ams::list::attribute::map \
-	-list_id $list_id \
+	-list_id $leads_list_id \
 	-attribute_id $attribute_id \
-	-sort_order "70" \
+	-sort_order "60" \
 	-required_p "f" \
 	-section_heading ""
 
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	16 Dec 2005 19:35:08 -0000	1.44
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	18 Dec 2005 12:29:27 -0000	1.45
@@ -210,7 +210,7 @@
 } {
     ns_log notice "start processing"
     set employer_exist_p 0
-    set employee_attributes [list "first_names" "last_name" "salutation" "person_title" "home_phone" "private_fax" "email"]
+    set employee_attributes [list "first_names" "last_name" "salutation" "person_title" "directphoneno" "directfaxno" "email"]
     set employer_attributes [list "name" "company_phone" "company_fax" "email"]
 
     # Check if ID belongs to an employee, if not return empty string
@@ -274,11 +274,11 @@
 	if {![exists_and_not_null local_array(email)]} {
 	    set local_array(email) $email
 	}
-	if {![exists_and_not_null local_array(home_phone)]} {
-	    set local_array(home_phone) $company_phone
+	if {![exists_and_not_null local_array(directphoneno)]} {
+	    set local_array(directphoneno) $company_phone
 	}
-	if {![exists_and_not_null local_array(private_fax)]} {
-	    set local_array(private_fax) $company_fax
+	if {![exists_and_not_null local_array(directfaxno)]} {
+	    set local_array(directfaxno) $company_fax
 	}
 
 	if {![exists_and_not_null local_array(address)]} {