Index: temp/trunk/html/admin/order/edit.php
===================================================================
--- temp/trunk/html/admin/order/edit.php	(revision 2602)
+++ temp/trunk/html/admin/order/edit.php	(revision 2603)
@@ -279,5 +279,5 @@
 	// ¼õÃí¥Æ¡¼¥Ö¥ë¤Î¹¹¿·
 	$objQuery->update("dtb_order", $sqlval, $where, array($order_id), $addcol);
-/*
+
 	$sql = "";
 	$sql .= " UPDATE";
@@ -287,7 +287,13 @@
 	$sql .= "     ,deliv_date = (SELECT time FROM dtb_delivtime WHERE time_id = ? AND deliv_id = (SELECT deliv_id FROM dtb_order WHERE order_id = ?))";
 	$sql .= " WHERE order_id = ?";
-	$arrUpdData = array($sqlval['payment_id'], $sqlval['deliv_time_id'], $order_id, $order_id);
+	
+	if ($arrRet['deliv_time_id'] == "") {
+		$deliv_time_id = 0;
+	}else{
+		$deliv_time_id = $arrRet['deliv_time_id'];
+	}
+	$arrUpdData = array($arrRet['payment_id'], $deliv_time_id, $order_id, $order_id);
 	$objQuery->query($sql, $arrUpdData);
-*/
+
 	// ¼õÃí¾ÜºÙ¥Ç¡¼¥¿¤Î¹¹¿·
 	$arrDetail = $objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));