Index: branches/version-2_4/data/Smarty/templates/default/admin/mail/index.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/mail/index.tpl	(revision 17828)
+++ branches/version-2_4/data/Smarty/templates/default/admin/mail/index.tpl	(revision 18115)
@@ -406,5 +406,5 @@
                             <td width="20"><span class="white">#</span></td>
                             <td width="80"><span class="white">会員番号</span></td>
-                            <td width="80"><span class="white">受注番号</span></td>
+                            <td width="80"><span class="white">注文番号</span></td>
                             <td width="140"><span class="white">名前</span></td>
                             <td width="190"><span class="white">メールアドレス</span></td>
Index: branches/version-2_4/data/Smarty/templates/default/admin/customer/edit.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/customer/edit.tpl	(revision 17973)
+++ branches/version-2_4/data/Smarty/templates/default/admin/customer/edit.tpl	(revision 18115)
@@ -349,5 +349,5 @@
 						<tr bgcolor="#636469" align="center" class="fs10n">
 							<td width="160"><span class="white">日付</span></td>
-							<td width="140"><span class="white">受注番号</span></td>
+							<td width="140"><span class="white">注文番号</span></td>
 							<td width="140"><span class="white">購入金額</span></td>
 							<td width="160"><span class="white">発送日</span></td>
Index: branches/version-2_4/data/Smarty/templates/default/admin/order/status.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/order/status.tpl	(revision 17466)
+++ branches/version-2_4/data/Smarty/templates/default/admin/order/status.tpl	(revision 18115)
@@ -72,5 +72,5 @@
 											<td>
 												<select name="change_status">
-												<option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option> 
+												<option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option>
 												<!--{foreach key=key item=item from=$arrORDERSTATUS}-->
 												<!--{if $key ne $SelectedStatus}-->
@@ -95,5 +95,5 @@
 										</tr>
 									</table>
-									
+
 									<table width="650" border="0" cellspacing="0" cellpadding="0" summary=" ">
 										<tr>
@@ -102,10 +102,10 @@
 										<tr><td height="10"></td></tr>
 									</table>
-									
+
 									<table width="650" border="0" cellspacing="1" cellpadding="5" summary=" " bgcolor="#cccccc">
 									<tr bgcolor="#f2f1ec" align="center" class="fs12n">
-										<td width="30">受注番号</td>
-										<td width="90">受注日</td>				
-										<td width="100">顧客名</td>				
+										<td width="30">注文番号</td>
+										<td width="90">受注日</td>
+										<td width="100">顧客名</td>
 										<td width="90">支払方法</td>
 										<td width="81">購入金額（円）</td>
@@ -130,5 +130,5 @@
 									</table>
 									<input type="hidden" name="move[]" value="" >
-									
+
 									<table width="650" border="0" cellspacing="0" cellpadding="0" summary=" ">
 									<tr><td height="10"></td></tr>
@@ -138,5 +138,5 @@
 									<tr><td height="10"></td></tr>
 									</table>
-									
+
 									<table width="650" border="0" cellspacing="0" cellpadding="0" summary=" ">
 										<tr class="fs12">
@@ -148,5 +148,5 @@
 										</tr>
 									</table>
-									
+
 								<!--{elseif $arrStatus != "" & $tpl_linemax == 0}-->
 									<table width="650" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -154,9 +154,9 @@
 									</table>
 								<!--{/if}-->
-									
+
 								</td>
 							</tr>
 						</table>
-						
+
 						<!--登録テーブルここまで-->
 
@@ -178,20 +178,20 @@
 </form>
 </table>
-<!--★★メインコンテンツ★★-->		
+<!--★★メインコンテンツ★★-->
 
 
 <script type="text/javascript">
 <!--
-	function fnSelectCheckSubmit(){ 
-
-		var selectflag = 0; 
+	function fnSelectCheckSubmit(){
+
+		var selectflag = 0;
 		var fm = document.form1;
-				
-		if(fm.change_status.options[document.form1.change_status.selectedIndex].value == ""){ 
-		selectflag = 1; 
-		} 
-		
-		if(selectflag == 1){ 
-			alert('セレクトボックスが選択されていません'); 
+
+		if(fm.change_status.options[document.form1.change_status.selectedIndex].value == ""){
+		selectflag = 1;
+		}
+
+		if(selectflag == 1){
+			alert('セレクトボックスが選択されていません');
 			return false;
 		}
@@ -199,5 +199,5 @@
 		var checkflag = 0;
 		var max = fm["move[]"].length;
-		
+
 		if(max) {
 			for (i=0;i<max;i++){
@@ -216,11 +216,11 @@
 			return false;
 		}
-		
-		if(selectflag == 0 && checkflag == 1){ 
+
+		if(selectflag == 0 && checkflag == 1){
 		document.form1.mode.value = 'update';
-		document.form1.submit(); 
+		document.form1.submit();
 		}
 	}
-	
+
 	function fnBoxChecked(check){
 		var count;
@@ -231,5 +231,5 @@
 		}
 	}
-	
+
 //-->
 </script>
Index: branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18107)
+++ branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18115)
@@ -179,5 +179,5 @@
                             </tr>
                                 <tr class="fs12n">
-                                    <td bgcolor="#f2f1ec" width="110">受注番号</td>
+                                    <td bgcolor="#f2f1ec" width="110">注文番号</td>
                                     <td bgcolor="#ffffff" width="248"><!--{$arrForm.order_id.value}--></td>
                                     <td bgcolor="#f2f1ec" width="110">顧客ID</td>
Index: branches/version-2_4/data/Smarty/templates/default/admin/order/index.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/order/index.tpl	(revision 17806)
+++ branches/version-2_4/data/Smarty/templates/default/admin/order/index.tpl	(revision 18115)
@@ -116,5 +116,5 @@
                         <table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
                             <tr class="fs12n">
-                                <td bgcolor="#f2f1ec" width="110">受注番号</td>
+                                <td bgcolor="#f2f1ec" width="110">注文番号</td>
                                 <td bgcolor="#ffffff" width="194">
                                     <!--{assign var=key1 value="search_order_id1"}-->
@@ -411,5 +411,5 @@
                         <tr bgcolor="#636469" align="center" class="fs12n">
                             <td width="100"><span class="white">受注日</span></td>
-                            <td width="65"><span class="white">受注番号</span></td>
+                            <td width="65"><span class="white">注文番号</span></td>
                             <td width="110"><span class="white">顧客名</span></td>
                             <td width="90"><span class="white">支払方法</span></td>
Index: branches/version-2_4/data/Smarty/templates/default/admin/order/pdf_input.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/order/pdf_input.tpl	(revision 17944)
+++ branches/version-2_4/data/Smarty/templates/default/admin/order/pdf_input.tpl	(revision 18115)
@@ -100,5 +100,5 @@
                         <table width="440" border="0" cellspacing="1" cellpadding="8" summary=" ">
                             <tr class="fs12n">
-                                <td width="120" bgcolor="#f3f3f3">受注番号</td>
+                                <td width="120" bgcolor="#f3f3f3">注文番号</td>
                                     <td width="307" bgcolor="#ffffff">
                                     <!--{foreach name=order_id from=$arrForm.order_id item=order_id}-->
Index: branches/version-2_4/data/Smarty/templates/default/admin/order/disp.tpl
===================================================================
--- branches/version-2_4/data/Smarty/templates/default/admin/order/disp.tpl	(revision 18108)
+++ branches/version-2_4/data/Smarty/templates/default/admin/order/disp.tpl	(revision 18115)
@@ -113,5 +113,5 @@
                             </tr>
                             <tr class="fs12n">
-                                <td bgcolor="#f0f0f0" width="110">受注番号</td>
+                                <td bgcolor="#f0f0f0" width="110">注文番号</td>
                                 <td bgcolor="#ffffff" width="248"><!--{$arrForm.order_id.value}--></td>
                                 <td bgcolor="#f0f0f0" width="110">顧客ID</td>