Index: openacs-4/packages/contacts/lib/label.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/label.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/label.tcl	20 Feb 2006 09:11:10 -0000	1.2
+++ openacs-4/packages/contacts/lib/label.tcl	5 Oct 2006 14:15:20 -0000	1.3
@@ -53,27 +53,25 @@
     
     set labels [list]
     foreach party_id $party_ids {
-	set name [contact::name -party_id $party_id]
-	set mailing_address [contact::message::mailing_address -party_id $party_id -format "text/plain"]
+
+	set mailing_address [contact::message::mailing_address -party_id $party_id -format "text/plain" -with_name]
 	if {[empty_string_p $mailing_address]} {
 	    ad_return_error [_ contacts.Error] [_ contacts.lt_there_was_an_error_processing_this_request]
 	    break
 	}
 	
-	set name            [openreport::clean_string_for_rml -string ${name}]
 	set mailing_address [openreport::clean_string_for_rml -string ${mailing_address}]
 	
-	set one "<para style=\"name\">
-${name}
-</para>
+	set one "<para style=\"header\">Wieners+Wieners GmbH - Postfach 1803 - 22908 Ahrensburg (bei Hamburg)</para>
 <xpre style=\"address\">
 ${mailing_address}
 </xpre>
 "
 	lappend labels [string trim $one]
     }
     
-    set rml "<!DOCTYPE document SYSTEM \"rml_1_0.dtd\"><document filename=\"filename.pdf\">"
+    set rml "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"no\" ?>
+<!DOCTYPE document SYSTEM \"rml_1_0.dtd\"><document filename=\"filename.pdf\">"
     append rml [lindex [callback contact::label -request "template" -for $label_type] 0]
     append rml "<story>"
     append rml [join $labels "<nextFrame /><condPageBreak height=\"0in\" />"]
Index: openacs-4/packages/contacts/tcl/contact-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-message-procs.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/contacts/tcl/contact-message-procs.tcl	2 Jun 2006 09:18:31 -0000	1.31
+++ openacs-4/packages/contacts/tcl/contact-message-procs.tcl	5 Oct 2006 14:15:20 -0000	1.32
@@ -234,6 +234,7 @@
     {-format "text/plain"}
     {-package_id ""}
     {-override_privacy_p "f"}
+    {-with_name:boolean}
 } {
     Returns a parties mailing address. Cached
 
@@ -247,14 +248,15 @@
     if { $package_id eq "" } {
 	set package_id [ad_conn package_id]
     }
-    return [util_memoize [list ::contact::message::mailing_address_not_cached -party_id $party_id -format $format -package_id $package_id -override_privacy_p $override_privacy_p]]
+    return [util_memoize [list ::contact::message::mailing_address_not_cached -party_id $party_id -format $format -package_id $package_id -override_privacy_p $override_privacy_p -with_name_p $with_name_p]]
 }
 
 ad_proc -private contact::message::mailing_address_not_cached {
     {-party_id:required}
     {-format:required}
     {-package_id:required}
     {-override_privacy_p:required}
+    {-with_name_p:required}
 } {
     Returns a parties mailing address
 } {
@@ -267,21 +269,28 @@
     set revision_id [contact::live_revision -party_id $party_id]
     set mailing_address {}
     foreach attribute_id $attribute_ids {
-	set mailing_address [ams::value \
+	append mailing_address [ams::value \
 				 -object_id $revision_id \
 				 -attribute_id $attribute_id \
 				 -format $format]
 	if { $mailing_address ne "" } {
+	    if {$with_name_p} {
+		set mailing_address "- [contact::name -party_id $party_id] -\n$mailing_address"
+	    }
 	    break
 	}
     }
     if { $mailing_address eq "" } {
 	# if this person is the employee of
         # an organization we can attempt to use
-        # that organizations email address
+        # that organizations address
 	foreach employer [contact::util::get_employers -employee_id $party_id -package_id $package_id] {
-	    set mailing_address [contact::message::mailing_address -party_id [lindex $employer 0] -package_id $package_id -override_privacy_p $override_privacy_p]
+	    append mailing_address [contact::message::mailing_address -party_id [lindex $employer 0] -package_id $package_id -override_privacy_p $override_privacy_p]
 	    if { $mailing_address ne "" } {
+		# We should display the company name. Currently handled outside this.
+		if {$with_name_p} {
+		    set mailing_address "[contact::name -party_id [lindex $employer 0]]\n- [contact::name -party_id $party_id] -\n $mailing_address"
+		}
 		break
 	    }
 	}