Index: branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 18115)
+++ branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 18472)
@@ -82,5 +82,5 @@
             // 支払い方法の取得
             $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-            // 配送時間の取得
+            // お届け時間の取得
             $arrRet = $objDb->sfGetDelivTime($this->arrDisp['payment_id']);
             $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
Index: branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php	(revision 18115)
+++ branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php	(revision 18472)
@@ -91,5 +91,5 @@
             // 支払い方法の取得
             $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-            // 配送時間の取得
+            // お届け時間の取得
             $arrRet = $objDb->sfGetDelivTime($this->arrDisp['payment_id']);
             $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
Index: branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18385)
+++ branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18472)
@@ -485,5 +485,5 @@
         }
 
-        // 別のお届け先を指定していない場合、配送先に登録住所をコピーする。
+        // 別のお届け先を指定していない場合、お届け先に登録住所をコピーする。
         if($arrData["deliv_check"] == "-1") {
             $sqlval['deliv_name01'] = $arrData['order_name01'];
Index: branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18392)
+++ branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18472)
@@ -164,9 +164,9 @@
         // 支払い方法の画像があるなしを取得（$img_show true:ある false:なし）
         $this->img_show = $this->lfGetImgShow($this->arrPayment);
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
 
-        // 配送日一覧の取得
+        // お届け日一覧の取得
         $this->arrDelivDate = $this->lfGetDelivDate();
 
@@ -251,5 +251,5 @@
 
         switch($_POST['mode']) {
-            // 支払い方法指定 → 配達日時指定
+            // 支払い方法指定 → お届け日時指定
         case 'deliv_date':
             // 入力値の変換
@@ -259,5 +259,5 @@
                 // 支払い方法の入力エラーなし
                 $this->tpl_mainpage = 'shopping/deliv_date.tpl';
-                $this->tpl_title = "配達日時指定";
+                $this->tpl_title = "お届け日時指定";
                 break;
             } else {
@@ -289,5 +289,5 @@
                     // 支払い方法の入力エラーなし
                     $this->tpl_mainpage = 'shopping/deliv_date.tpl';
-                    $this->tpl_title = "配達日時指定";
+                    $this->tpl_title = "お届け日時指定";
                 }
             }
@@ -317,9 +317,9 @@
         // 支払い方法の取得
         $this->arrPayment = $this->lfGetPayment($total_pretax);
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
 
-        // 配送日一覧の取得
+        // お届け日一覧の取得
         $this->arrDelivDate = $this->lfGetDelivDate();
 
@@ -343,8 +343,8 @@
         $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("ポイント", "use_point", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK", "ZERO_START"));
-        $this->objFormParam->addParam("配達時間", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("お届け時間", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("ご質問", "message", LTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2');
-        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
     }
 
@@ -439,5 +439,5 @@
     }
 
-    /* 配送時間文字列の取得 */
+    /* お届け時間文字列の取得 */
     function lfGetDelivTimeInfo($time_id) {
         $objQuery = new SC_Query();
@@ -479,5 +479,5 @@
     }
 
-    /* 配達日一覧を取得する */
+    /* お届け日一覧を取得する */
     function lfGetDelivDate() {
         $objCartSess = new SC_CartSession();
@@ -537,5 +537,5 @@
                 break;
             }
-            //配達可能日のスタート値から、配達日の配列を取得する
+            //お届け可能日のスタート値から、お届け日の配列を取得する
             $arrDelivDate = $this->lfGetDateArray($start_day, DELIV_DATE_END_MAX);
         }
@@ -543,9 +543,9 @@
     }
 
-    //配達可能日のスタート値から、配達日の配列を取得する
+    //お届け可能日のスタート値から、お届け日の配列を取得する
     function lfGetDateArray($start_day, $end_day) {
         $masterData = new SC_DB_MasterData();
         $arrWDAY = $masterData->getMasterData("mtb_wday");
-        //配達可能日のスタート値がセットされていれば
+        //お届け可能日のスタート値がセットされていれば
         if($start_day >= 1) {
             $now_time = time();
Index: branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 16582)
+++ branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 18472)
@@ -26,5 +26,5 @@
 
 /**
- * 配送先追加のページクラス
+ * お届け先追加のページクラス
  *
  * @package Page
Index: branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 18419)
+++ branches/version-2_4-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 18472)
@@ -457,5 +457,5 @@
         $objQuery = new SC_Query();
 
-        // 別のお届け先を指定していない場合、配送先に登録住所をコピーする。
+        // 別のお届け先を指定していない場合、お届け先に登録住所をコピーする。
         if($arrData["deliv_check"] != "1") {
             $sqlval['deliv_name01'] = $arrData['order_name01'];
Index: branches/version-2_4-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- branches/version-2_4-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 17513)
+++ branches/version-2_4-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 18472)
@@ -122,5 +122,5 @@
 
         for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-            $this->objFormParam->addParam("配送時間$cnt", "deliv_time$cnt", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+            $this->objFormParam->addParam("お届け時間$cnt", "deliv_time$cnt", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
         }
 
@@ -157,5 +157,5 @@
             $objQuery->update("dtb_deliv", $sqlval, $where, array($deliv_id));
 
-            // 配送時間の登録
+            // お届け時間の登録
             $table = "dtb_delivtime";
             $where = "deliv_id = ? AND time_id = ?";
@@ -216,5 +216,5 @@
 
             $sqlval = array();
-            // 配送時間の設定
+            // お届け時間の設定
             for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
                 $keyname = "deliv_time$cnt";
@@ -257,5 +257,5 @@
         $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
         $this->objFormParam->setParam($arrRet[0]);
-        // 配送時間の取得
+        // お届け時間の取得
         $col = "deliv_time";
         $where = "deliv_id = ?  ORDER BY time_id";
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 18414)
+++ branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18472)
@@ -111,4 +111,8 @@
         $objSiteInfo = new SC_SiteInfo();
         $objDb = new SC_Helper_DB_Ex();
+        $objDate = new SC_Date(1901); 
+ 	      $this->arrYearDelivDate = $objDate->getYear('', date('Y'), ''); 
+ 		    $this->arrMonthDelivDate = $objDate->getMonth(true); 
+ 		    $this->arrDayDelivDate = $objDate->getDay(true);
         $arrInfo = $objSiteInfo->data;
 
@@ -283,5 +287,5 @@
         // 支払い方法の取得
         $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
@@ -349,5 +353,5 @@
         $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
 
-        // 配送先情報
+        // お届け先情報
         $this->objFormParam->addParam("お名前1", "deliv_name01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お名前2", "deliv_name02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
@@ -375,9 +379,12 @@
 
         $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("配送時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $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", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_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");
-        $this->objFormParam->addParam("配送時間", "deliv_time");
+        $this->objFormParam->addParam("お届け時間", "deliv_time");
 
         // 受注詳細情報
@@ -406,4 +413,5 @@
         $this->objFormParam->addParam("受注日", "create_date");
         $this->objFormParam->addParam("発送日", "commit_date");
+        $this->objFormParam->addParam("お届け日", "deliv_date"); 
     }
 
@@ -419,5 +427,11 @@
             $this->objFormParam->setValue('total_point', $total_point);
             $this->objFormParam->setValue('point', $point);
+            $delivDate = split(" ", $arrRet[0]["deliv_date"]); 
+ 	          $delivDate = split("-", $delivDate[0]); 
+ 	          $this->objFormParam->setValue('deliv_date_year', $delivDate[0]); 
+ 	          $this->objFormParam->setValue('deliv_date_month', isset($delivDate[1]) ? $delivDate[1] : ""); 
+ 	          $this->objFormParam->setValue('deliv_date_day', isset($delivDate[2]) ? $delivDate[2] : "");
             $this->arrForm = $arrRet[0];
+
             // 受注詳細データの取得
             $arrRet = $this->lfGetOrderDetail($order_id);
@@ -456,4 +470,10 @@
         $objErr = new SC_CheckError($arrRet);
         $objErr->arrErr = $this->objFormParam->checkError();
+
+        $objErr->doFunc(array("お届け日", "deliv_date_year", "deliv_date_month", "deliv_date_day"), array("CHECK_DATE"));
+
+        if (count($objErr->arrErr) >= 1) {
+            return $objErr->arrErr;
+        }
 
         return $objErr->arrErr;
@@ -538,7 +558,16 @@
             }
         }
+        $sqlval['update_date'] = 'Now()';
+
+        if (strlen($sqlval['deliv_date_year']) >= 0) {
+            $sqlval['deliv_date'] = $sqlval['deliv_date_year'] . '-' . $sqlval['deliv_date_month'] . '-' . $sqlval['deliv_date_day'];
+        }
+        unset($sqlval['deliv_date_year']);
+        unset($sqlval['deliv_date_month']);
+        unset($sqlval['deliv_date_day']);
 
         unset($sqlval['total_point']);
         unset($sqlval['point']);
+        unset($sqlval['commit_date']);
 
         $where = "order_id = ?";
Index: branches/version-2_4-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_4-dev/data/class/helper/SC_Helper_DB.php	(revision 18465)
+++ branches/version-2_4-dev/data/class/helper/SC_Helper_DB.php	(revision 18472)
@@ -1384,8 +1384,8 @@
 
     /**
-     * 配送時間を取得する.
+     * お届け時間を取得する.
      *
      * @param integer $payment_id 支払い方法ID
-     * @return array 配送時間の配列
+     * @return array お届け時間の配列
      */
     function sfGetDelivTime($payment_id = "") {