Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.adp	25 Aug 2008 12:43:57 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.adp	25 Aug 2008 12:47:54 -0000	1.3
@@ -13,8 +13,9 @@
 <form method="post" action="interaction-add-3">
  @export_form_vars1_html;noquote@
   <table cellspacing="1" cellpadding="2">
+<if @form_body_html@ not nil>
    @form_body_html;noquote@
-
+</if>
 <if @issue_id@ nil>
   <tr>
     <td bgcolor="#cccccc" valign="top" align="right"><p>Previous Issue ID:</p></td>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	24 Aug 2008 11:00:43 -0000	1.9
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	25 Aug 2008 12:47:54 -0000	1.10
@@ -212,7 +212,7 @@
 set export_form_vars1_html [export_form_vars interaction_id c_user_identification_id action_id open_date_str interaction_type interaction_type_other interaction_originator first_names last_name email postal_code other_id_info return_to_issue insert_id]
 
 if { [info exists c_user_identification_id] } {
-    append form_body_html "<tr>
+    set form_body_html "<tr>
     <td bgcolor=\"\#cccccc\" valign=\"top\" align=\"right\">Customer:</td>
     <td bgcolor=\"\#cccccc\" valign=\"top\">[ec_user_identification_summary $c_user_identification_id "t"]"
 
Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklists.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklists.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/picklists.adp	24 Aug 2008 22:29:29 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/picklists.adp	25 Aug 2008 12:42:09 -0000	1.2
@@ -10,5 +10,5 @@
 <if @picklist_item_counter@ gt 0>
   @picklist_list_html;noquote@
 </if><else>
-  <p>No items have been added.  @picklist_list_html;noquote@</p>
+  <p>No items have been added.  @picklist_add_html;noquote@</p>
 </else>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl	24 Aug 2008 22:29:29 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl	25 Aug 2008 12:42:09 -0000	1.6
@@ -47,6 +47,6 @@
 }
 append picklist_list_html "</table>\n"
 
-if { $picklist_counter == 0 } {
-    set picklist_list_html "<a href=\"picklist-item-add?prev_sort_key=1&next_sort_key=512&picklist_name=[ns_urlencode [lindex $picklist 0]]\">Add a picklist item.</a>"
+if { $picklist_item_counter == 0 } {
+    set picklist_add_html "<a href=\"picklist-item-add?prev_sort_key=1&next_sort_key=512&picklist_name=[ns_urlencode [lindex $picklist 0]]\">Add a picklist item.</a>"
 }