Index: openacs-4/packages/contacts/bin/convert.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/bin/Attic/convert.sh,v diff -u -r1.2 -r1.3 --- openacs-4/packages/contacts/bin/convert.sh 9 Apr 2006 16:39:25 -0000 1.2 +++ openacs-4/packages/contacts/bin/convert.sh 3 May 2006 14:25:41 -0000 1.3 @@ -3,5 +3,5 @@ # Set the display variable to the home of the user who has write access to the X11 server # which is running on the display port. This could either be VNC or something else. -export HOME=/home/ -/etc/openoffice.org-2.0/program/soffice.bin -writer -headless -pt pdfconv $1 -display :1.0 \ No newline at end of file +export HOME=/home/malte +/etc/openoffice.org-2.0/program/soffice.bin -writer -headless -pt pdfconv $1 -display lektor:1.0 \ No newline at end of file Index: openacs-4/packages/contacts/lib/oo_mailing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/oo_mailing.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/contacts/lib/oo_mailing.tcl 3 May 2006 10:39:35 -0000 1.14 +++ openacs-4/packages/contacts/lib/oo_mailing.tcl 3 May 2006 14:25:42 -0000 1.15 @@ -72,6 +72,11 @@ {help_text "[_ contacts.PS_help_text]"} {html {size 45 maxlength 1000}} } + {account_manager_p:text(select) + {label "[_ contacts.Account_Manager_P]"} + {help_text "[_ contacts.Account_Manager_P_help_text]"} + {options {{"[_ contacts.account_manager]" "t"} {"[_ contacts.yourself]" "f"}}} + } {subject:text(text),optional {label "[_ contacts.Subject]"} {html {size 55}} @@ -166,7 +171,12 @@ # Retrieve information about the creation user so it can be used in the template # First check if there is an account manager - set account_manager_id [contacts::util::get_account_manager -organization_id $organization_id] + if {[string eq $account_manager_p "t"]} { + set account_manager_id [contacts::util::get_account_manager -organization_id $organization_id] + } else { + set account_manager_id "" + } + if {[string eq "" $account_manager_id]} { set user_id [ad_conn user_id] } else {