Index: temp/trunk/html/admin/order/edit.php
===================================================================
--- temp/trunk/html/admin/order/edit.php	(revision 2605)
+++ temp/trunk/html/admin/order/edit.php	(revision 2606)
@@ -285,5 +285,5 @@
 	$sql .= " SET";
 	$sql .= "     payment_method = (SELECT payment_method FROM dtb_payment WHERE payment_id = ?)";
-	$sql .= "     ,deliv_time = (SELECT time FROM dtb_delivtime WHERE time_id = ? AND deliv_id = (SELECT deliv_id FROM dtb_order WHERE order_id = ?))";
+	$sql .= "     ,deliv_time = (SELECT time FROM dtb_delivtime WHERE time_id = ? AND deliv_id = (SELECT deliv_id FROM dtb_payment WHERE payment_id = ? ))";
 	$sql .= " WHERE order_id = ?";
 	
@@ -293,5 +293,5 @@
 		$deliv_time_id = $arrRet['deliv_time_id'];
 	}
-	$arrUpdData = array($arrRet['payment_id'], $deliv_time_id, $order_id, $order_id);
+	$arrUpdData = array($arrRet['payment_id'], $deliv_time_id, array($arrRet['payment_id'], $order_id);
 	$objQuery->query($sql, $arrUpdData);