Index: branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18699)
+++ branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18707)
@@ -111,7 +111,7 @@
         $objSiteInfo = new SC_SiteInfo();
         $objDb = new SC_Helper_DB_Ex();
-        $objDate = new SC_Date(1970); 
-        $this->arrYearDelivDate = $objDate->getYear('', date('Y'), ''); 
-        $this->arrMonthDelivDate = $objDate->getMonth(true); 
+        $objDate = new SC_Date(1970);
+        $this->arrYearDelivDate = $objDate->getYear('', date('Y'), '');
+        $this->arrMonthDelivDate = $objDate->getMonth(true);
         $this->arrDayDelivDate = $objDate->getDay(true);
         $arrInfo = $objSiteInfo->data;
@@ -381,6 +381,6 @@
         $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("お届け日(年)", "deliv_date_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));  
-        $this->objFormParam->addParam("お届け日(月)", "deliv_date_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));  
+        $this->objFormParam->addParam("お届け日(年)", "deliv_date_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("お届け日(月)", "deliv_date_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("お届け日(日)", "deliv_date_day", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("お支払方法名称", "payment_method");
@@ -512,5 +512,5 @@
                 if (!isset($arrErr['quantity'])) $arrErr['quantity'] = "";
 
-                $arrErr['quantity'] .= $this->arrForm['product_name'][$i] . '/(' . $className1 . ')/(' . $className2 . ')の数量(' . $arrVal['quantity'][$i]. ')と受注時の数量(' . $this->arrForm['quantity'][$i] . ')の差分(' . ($arrVal['quantity'][$i] - $this->arrForm['quantity'][$i]) . ')は在庫数(' . $productClass['stock'] . ')を上まわっています。<br />';
+                $arrErr['quantity'] .= $this->arrForm['product_name'][$i] . '/(' . $className1 . ')/(' . $className2 . ')　の在庫が不足しています。　設定できる数量は「' . ($this->arrForm['quantity'][$i] + $productClass['stock']) . '」までです。<br />';
             }
         }