Index: branches/version-2_4-dev/data/Smarty/templates/default/admin/order/edit.tpl
===================================================================
--- branches/version-2_4-dev/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18491)
+++ branches/version-2_4-dev/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18563)
@@ -579,14 +579,6 @@
                             <tr class="fs12n">
                                 <td bgcolor="#ffffff" colspan="6">
-                                  <span class="attention"><!--{$arrErr.deliv_date_year}--></span> 
-                                  <select name="deliv_date_year" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrYearDelivDate selected=$arrForm.deliv_date_year.value|default:""}--> 
-                                  </select>年 
-                                  <select name="deliv_date_month" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrMonthDelivDate selected=$arrForm.deliv_date_month.value|default:""}--> 
-                                  </select>月 
-                                  <select name="deliv_date_day" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrDayDelivDate selected=$arrForm.deliv_date_day.value|default:""}--> 
-                                  </select>日
+                                    <span class="red12"><!--{$arrErr[$key]}--></span>
+                                    <input name="<!--{$key|escape}-->" value="<!--{$arrForm[$key].value|escape}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="20" maxlength="<!--{$arrForm[$key].length}-->" />
                                 </td>
                             </tr>
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 18478)
+++ branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18563)
@@ -111,8 +111,4 @@
         $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;
 
@@ -410,5 +406,4 @@
         $this->objFormParam->addParam("受注日", "create_date");
         $this->objFormParam->addParam("発送日", "commit_date");
-        $this->objFormParam->addParam("お届け日", "deliv_date"); 
     }
 
@@ -424,9 +419,4 @@
             $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];
 
@@ -467,6 +457,4 @@
         $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) {
@@ -556,11 +544,4 @@
         }
         $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']);