Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19963)
@@ -79,32 +79,20 @@
 <!--{if $smarty.post.mode == 'search' }-->
     <!--▼検索結果表示-->
-    <table width="420" border="0" cellspacing="0" cellpadding="0" summary=" " bgcolor="#FFFFFF">
         <!--{if $tpl_linemax > 0}-->
-            <tr class="fs12">
-                <td align="left"><!--{$tpl_linemax}-->件が該当しました。	</td>
-            </tr>
+        <p><!--{$tpl_linemax}-->件が該当しました。<!--{$tpl_strnavi}--></p>
         <!--{/if}-->
-        <tr class="fs12">
-            <td align="center">
-            <!--▼ページナビ-->
-            <!--{$tpl_strnavi}-->
-            <!--▲ページナビ-->
-            </td>
-        </tr>
-        <tr><td height="10"></td></tr>
-    </table>
 
     <!--▼検索後表示部分-->
-    <table width="420" border="0" cellspacing="1" cellpadding="5" bgcolor="#cccccc">
-        <tr bgcolor="#f0f0f0" align="center" class="fs12">
-            <td>顧客ID</td>
-            <td>顧客名(カナ)</td>
-            <td>TEL</td>
-            <td>決定</td>
+    <table class="list">
+        <tr>
+            <th>顧客ID</th>
+            <th>顧客名(カナ)</th>
+            <th>TEL</th>
+            <th>決定</th>
         </tr>
         <!--{section name=cnt loop=$arrCustomer}-->
         <!--▼顧客<!--{$smarty.section.cnt.iteration}-->-->
-        <tr bgcolor="#FFFFFF" class="fs12n">
-            <td width="90" align="center">
+        <tr>
+            <td>
             <!--{$arrCustomer[cnt].customer_id|h}-->
             </td>
@@ -115,5 +103,5 @@
         <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
         <!--{sectionelse}-->
-        <tr bgcolor="#FFFFFF" class="fs10n">
+        <tr>
             <td colspan="4">会員情報が存在しません。</td>
         </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19963)
@@ -35,16 +35,16 @@
         df = document.form1;
 
-        df.deliv_name01.value = df.order_name01.value;
-        df.deliv_name02.value = df.order_name02.value;
-        df.deliv_kana01.value = df.order_kana01.value;
-        df.deliv_kana02.value = df.order_kana02.value;
-        df.deliv_zip01.value = df.order_zip01.value;
-        df.deliv_zip02.value = df.order_zip02.value;
-        df.deliv_tel01.value = df.order_tel01.value;
-        df.deliv_tel02.value = df.order_tel02.value;
-        df.deliv_tel03.value = df.order_tel03.value;
-        df.deliv_pref.value = df.order_pref.value;
-        df.deliv_addr01.value = df.order_addr01.value;
-        df.deliv_addr02.value = df.order_addr02.value;
+        df.shipping_name01_0.value = df.order_name01.value;
+        df.shipping_name02_0.value = df.order_name02.value;
+        df.shipping_kana01_0.value = df.order_kana01.value;
+        df.shipping_kana02_0.value = df.order_kana02.value;
+        df.shipping_zip01_0.value = df.order_zip01.value;
+        df.shipping_zip02_0.value = df.order_zip02.value;
+        df.shipping_tel01_0.value = df.order_tel01.value;
+        df.shipping_tel02_0.value = df.order_tel02.value;
+        df.shipping_tel03_0.value = df.order_tel03.value;
+        df.shipping_pref_0.value = df.order_pref.value;
+        df.shipping_addr01_0.value = df.order_addr01.value;
+        df.shipping_addr02_0.value = df.order_addr02.value;
     }
 
@@ -62,4 +62,12 @@
         return false;
     }
+
+    function fnAppendShipping() {
+        document.form1.anchor_key.value = "shipping";
+        document.form1.mode.value = "append_shipping";
+        document.form1.submit();
+        return false;
+    }
+
 //-->
 </script>
@@ -348,15 +356,15 @@
         <!--{/if}-->
     </table>
-
+    <!--{assign var=key value="shipping_quantity"}-->
+    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" />
     <!--▼お届け先情報ここから-->
     <a name="shipping"></a>
     <h2>お届け先情報
+    <!--{if $arrForm.shipping_quantity.value <= 1}-->
         <a class="btn-normal" href="javascript:;" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a>
-        <a class="btn-normal" href="javascript:;"  onclick="fnCopyFromOrderData();">お届け先を新規追加</a>
+    <!--{/if}-->
+        <a class="btn-normal" href="javascript:;"  onclick="fnAppendShipping();">お届け先を新規追加</a>
         <a class="btn-normal" href="javascript:;" onclick="fnMultiple();">複数のお届け先を指定する</a>
     </h2>
-
-    <!--{assign var=key value="shipping_quantity"}-->
-    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" />
 
     <!--{section name=shipping loop=$arrForm.shipping_quantity.value}-->
@@ -367,9 +375,10 @@
     <h3>お届け先<!--{$smarty.section.shipping.iteration}--></h3>
     <!--{/if}-->
-
+    <input type="hidden" name="shipping_id_<!--{$shipping_id}-->" value="<!--{$shipping_id}-->" id="shipping_id_<!--{$shipping_id}-->" />
     <!--{if $arrForm.shipping_quantity.value > 1}-->
     <!--{assign var=product_quantity value="shipping_product_quantity_`$shipping_id`"}-->
     <input type="hidden" name="<!--{$product_quantity}-->" value="<!--{$arrForm[$product_quantity].value|h}-->" />
-    <input type="hidden" name="shipping_id_<!--{$shipping_id}-->" value="<!--{$shipping_id}-->" id="shipping_id_<!--{$shipping_id}-->" />
+
+    <!--{if $arrForm[$product_quantity].value > 0}-->
     <table class="list" id="order-edit-products">
       <tr>
@@ -382,6 +391,9 @@
       <!--{assign var=item_index value="`$smarty.section.item.index`"}-->
       <!--{assign var=product_class_id value=$arrProductClassIds[$shipping_index][$item_index]}-->
+
       <tr>
         <td>
+          <!--{assign var=key value="product_class_id_`$shipping_id`_`$product_class_id`"}-->
+          <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" />
           <!--{assign var=key value="product_code_`$shipping_id`_`$product_class_id`"}-->
           <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" />
@@ -411,4 +423,5 @@
     </table>
     <!--{/if}-->
+    <!--{/if}-->
 
     <table class="form">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/multiple.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/multiple.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/multiple.tpl	(revision 19963)
@@ -88,4 +88,5 @@
             var q = $('<td />').addClass('center')
                 .append(idfield)
+                .append(codefield)
                 .append(namefield)
                 .append(class1field)
@@ -132,5 +133,5 @@
     $('input[name^=multiple_], select[name^=multiple_]').each(function() {
         // TODO タグをベタ書きにしないと, innerHTML で value が空になってしまう
-        $(div).append('<input type="hidden" name="'
+        $(div).append('<input type="text" name="'
                       + $(this).attr('name')
                       + '" value="' + $(this).val() + '" />');