Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl	22 Aug 2001 03:25:27 -0000	1.2
@@ -40,6 +40,7 @@
 
 set temp_shipment_date $shipment_date(date)
 if { [exists_and_not_null shipment_time(time)] } {
+    set shipment_time(time) [ec_timeentrywidget_time_check $shipment_time(time)]
     append temp_shipment_date " $shipment_time(time)$shipment_time(ampm)"
 } else {
     append temp_shipment_date " 12:00:00AM"
@@ -48,6 +49,7 @@
 set temp_expected_arrival_date ""
 if { [exists_and_not_null expected_arrival_date(date)] } {
     append temp_expected_arrival_date $expected_arrival_date(date)
+    set expected_arrival_time(time) [ec_timeentrywidget_time_check $expected_arrival_time(time)]
     if { [exists_and_not_null expected_arrival_time(time)] } {
 	append temp_expected_arrival_date " $expected_arrival_time(time)$expected_arrival_time(ampm)"
     } else {
@@ -145,6 +147,10 @@
    append items_to_print "<li> $product_name; [ec_decode $options "" "" "$options; "]$price_name: [ec_pretty_price $price_charged]"
 }
 
+if { [info exists all_items_p] } {
+    set item_id $item_id_list
+}
+
 append page_html "<form method=post action=fulfill-3>
 [export_form_vars shipment_id order_id item_id carrier tracking_number]
 <input type=hidden name=shipment_date value=\"$temp_shipment_date\">