Index: /branches/version-2_13-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_13-dev/html/install/sql/create_table_mysql.sql	(revision 22986)
+++ /branches/version-2_13-dev/html/install/sql/create_table_mysql.sql	(revision 23024)
@@ -484,4 +484,5 @@
     kana01 text,
     kana02 text,
+    company_name text,
     zip01 text,
     zip02 text,
@@ -532,4 +533,5 @@
     order_kana01 text,
     order_kana02 text,
+    order_company_name text,
     order_email text,
     order_tel01 text,
@@ -591,4 +593,5 @@
     order_kana01 text,
     order_kana02 text,
+    order_company_name text,
     order_email text,
     order_tel01 text,
@@ -652,4 +655,5 @@
     shipping_kana01 text,
     shipping_kana02 text,
+    shipping_company_name text,
     shipping_tel01 text,
     shipping_tel02 text,
@@ -697,4 +701,5 @@
     kana01 text,
     kana02 text,
+    company_name text,
     zip01 text,
     zip02 text,
Index: /branches/version-2_13-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_13-dev/html/install/sql/create_table_pgsql.sql	(revision 22986)
+++ /branches/version-2_13-dev/html/install/sql/create_table_pgsql.sql	(revision 23024)
@@ -484,4 +484,5 @@
     kana01 text,
     kana02 text,
+    company_name text,
     zip01 text,
     zip02 text,
@@ -532,4 +533,5 @@
     order_kana01 text,
     order_kana02 text,
+    order_company_name text,
     order_email text,
     order_tel01 text,
@@ -591,4 +593,5 @@
     order_kana01 text,
     order_kana02 text,
+    order_company_name text,
     order_email text,
     order_tel01 text,
@@ -652,4 +655,5 @@
     shipping_kana01 text,
     shipping_kana02 text,
+    shipping_company_name text,
     shipping_tel01 text,
     shipping_tel02 text,
@@ -697,4 +701,5 @@
     kana01 text,
     kana02 text,
+    company_name text,
     zip01 text,
     zip02 text,
Index: /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 22926)
+++ /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 23024)
@@ -39,4 +39,5 @@
         'shipping_kana01',
         'shipping_kana02',
+        'shipping_company_name',
         'shipping_tel01',
         'shipping_tel02',
@@ -46,4 +47,6 @@
         'shipping_fax03',
         'shipping_pref',
+        'shipping_country_id',
+        'shipping_zipcode',
         'shipping_zip01',
         'shipping_zip02',
@@ -96,4 +99,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData('mtb_pref');
+        $this->arrCountry = $masterData->getMasterData('mtb_country');
         $this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status');
         $this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
@@ -319,7 +323,10 @@
         $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
         $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
-        $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
-        $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+        $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+        $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+        $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
         $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
+        $objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('ZIPCODE', 'order_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -393,4 +400,7 @@
         $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
         $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+        $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+        $objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
Index: /branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 22926)
+++ /branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 23024)
@@ -50,4 +50,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData('mtb_pref');
+        $this->arrCountry = $masterData->getMasterData('mtb_country');
         $this->arrJob = $masterData->getMasterData('mtb_job');
         $this->arrSex = $masterData->getMasterData('mtb_sex');
Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- /branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php	(revision 23010)
+++ /branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php	(revision 23024)
@@ -388,4 +388,5 @@
         $objFormParam->addParam('お名前(姓)', $prefix . 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お名前(名)', $prefix . 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('会社名', $prefix . 'company_name', STEXT_LEN, 'aKV', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         if (FORM_COUNTRY_ENABLE === false) {
             $objFormParam->addParam('お名前(フリガナ・姓)', $prefix . 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
@@ -393,4 +394,5 @@
             $objFormParam->addParam('郵便番号1', $prefix . 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
             $objFormParam->addParam('郵便番号2', $prefix . 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
+            $objFormParam->addParam('国', $prefix . 'country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
             $objFormParam->addParam('都道府県', $prefix . 'pref', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
         } else {
@@ -400,5 +402,5 @@
             $objFormParam->addParam('郵便番号2', $prefix . 'zip02', ZIP02_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
             $objFormParam->addParam('国', $prefix . 'country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
-            $objFormParam->addParam('Zipcode', $prefix . 'zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
+            $objFormParam->addParam('ZIPCODE', $prefix . 'zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
             $objFormParam->addParam('都道府県', $prefix . 'pref', INT_LEN, 'n', array('NUM_CHECK'));
         }
Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- /branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php	(revision 23011)
+++ /branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php	(revision 23024)
@@ -36,5 +36,5 @@
 
     var $arrShippingKey = array(
-        'name01', 'name02', 'kana01', 'kana02',
+        'name01', 'name02', 'kana01', 'kana02', 'company_name',
         'sex', 'zip01', 'zip02', 'country_id', 'zipcode', 'pref', 'addr01', 'addr02',
         'tel01', 'tel02', 'tel03', 'fax01', 'fax02', 'fax03',
@@ -474,6 +474,6 @@
      */
     function copyFromCustomer(&$dest, &$objCustomer, $prefix = 'order',
-        $keys = array('name01', 'name02', 'kana01', 'kana02',
-            'sex', 'zip01', 'zip02', 'country_id','pref', 'addr01', 'addr02',
+        $keys = array('name01', 'name02', 'kana01', 'kana02', 'company_name',
+            'sex', 'zip01', 'zip02', 'country_id', 'zipcode', 'pref', 'addr01', 'addr02',
             'tel01', 'tel02', 'tel03', 'fax01', 'fax02', 'fax03',
             'job', 'birth', 'email',
Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php	(revision 23008)
+++ /branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php	(revision 23024)
@@ -49,4 +49,5 @@
         $this->arrMAILTPLPATH =  $masterData->getMasterData('mtb_mail_tpl_path');
         $this->arrPref = $masterData->getMasterData('mtb_pref');
+        $this->arrCountry = $masterData->getMasterData('mtb_country');
     }
 
@@ -179,4 +180,6 @@
         // 都道府県変換
         $arrTplVar->arrPref = $this->arrPref;
+        // 国変換
+        $arrTplVar->arrCountry = $this->arrCountry;
 
         $objCustomer = new SC_Customer_Ex();
Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php
===================================================================
--- /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php	(revision 22976)
+++ /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php	(revision 23024)
@@ -205,7 +205,7 @@
             $arrRet['tax_rule'] = $arrRet['calc_rule'];
             $data_c[$cache_key] = $arrRet;
-        }
-
-        GC_Utils_Ex::gfDebugLog('tax_key=' . $cache_key . ' result_tax=' . print_r($data_c[$cache_key],true));
+            GC_Utils_Ex::gfDebugLog('tax_key=' . $cache_key . ' result_tax=' . print_r($data_c[$cache_key],true));
+        }
+
         return $data_c[$cache_key];
     }
Index: /branches/version-2_13-dev/data/class/SC_Product.php
===================================================================
--- /branches/version-2_13-dev/data/class/SC_Product.php	(revision 22960)
+++ /branches/version-2_13-dev/data/class/SC_Product.php	(revision 23024)
@@ -299,4 +299,5 @@
 
                 // 価格
+                // TODO: ここでprice01,price02を税込みにしてよいのか？ _inctax を付けるべき？要検証
                 $arrClassCats2['price01']
                     = strlen($arrProductsClass['price01'])
Index: /branches/version-2_13-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 23016)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 23024)
@@ -95,16 +95,11 @@
                     <!--{/if}-->
                     </td>
-                    <!--{assign var=order_price   value=`$orderDetail.price`}-->
-                    <!--{assign var=product_price value=`$orderDetail.product_price`}-->
-                    <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-                    <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                    <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円
-                    <!--{if $order_price != $product_price}-->
-                        <div class="attention">【現在価格】</div><span class="attention"><!--{$product_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円</span>
+                    <td class="alignR"><!--{$orderDetail.price_inctax|number_format|h}-->円
+                    <!--{if $orderDetail.price_inctax != $orderDetail.product_price_inctax}-->
+                        <div class="attention">【現在価格】</div><span class="attention"><!--{$orderDetail.product_price_inctax|number_format|h}-->円</span>
                     <!--{/if}-->
                     </td>
-                    <td class="alignR"><!--{$quantity|h}--></td>
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                    <td class="alignR"><!--{$orderDetail.quantity|h}--></td>
+                    <td class="alignR"><!--{$orderDetail.price_inctax|sfMultiply:$orderDetail.quantity|number_format}-->円</td>
                 </tr>
             <!--{/foreach}-->
@@ -211,4 +206,18 @@
                     </tr>
                     <tr>
+                        <th class="alignL">会社名</th>
+                        <td><!--{$shippingItem.shipping_company_name|h}--></td>
+                    </tr>
+                    <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                    <tr>
+                        <th class="alignL">国</th>
+                        <td><!--{$arrCountry[$shippingItem.shipping_country_id]|h}--></td>
+                    </tr>
+                    <tr>
+                        <th class="alignL">ZIPCODE</th>
+                        <td><!--{$shippingItem.shipping_zipcode|h}--></td>
+                    </tr>
+                    <!--{/if}-->
+                    <tr>
                         <th class="alignL">郵便番号</th>
                         <td>〒<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--></td>
Index: /branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 22955)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 23024)
@@ -51,4 +51,24 @@
                     <td><!--{$arrForm.kana01|h}-->　<!--{$arrForm.kana02|h}--></td>
                 </tr>
+                <tr>
+                    <th>会社名</th>
+                    <td>
+                        <!--{$arrForm.company_name|h}-->
+                    </td>
+                </tr>
+                <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                <tr>
+                    <th>国</th>
+                    <td>
+                        <!--{$arrCountry[$arrForm.country_id]|h}-->
+                    </td>
+                </tr>
+                <tr>
+                    <th>ZIP CODE</th>
+                    <td>
+                        <!--{$arrForm.zipcode|h}-->
+                    </td>
+                </tr>
+                <!--{/if}-->
                 <tr>
                     <th>郵便番号</th>
Index: /branches/version-2_13-dev/data/Smarty/templates/default/mypage/delivery.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 22955)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 23024)
@@ -58,11 +58,15 @@
                     <!--{section name=cnt loop=$arrOtherDeliv}-->
                         <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
+                        <!--{assign var=OtherCountry value="`$arrOtherDeliv[cnt].country_id`"}-->
                         <tr>
                             <td class="alignC"><!--{$smarty.section.cnt.iteration}--></td>
                             <td><label for="add<!--{$smarty.section.cnt.iteration}-->">お届け先住所</label></td>
                             <td>
+                                <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                                <!--{$arrCountry[$OtherCountry]|h}--><br/>
+                                <!--{/if}-->
                                 〒<!--{$arrOtherDeliv[cnt].zip01}-->-<!--{$arrOtherDeliv[cnt].zip02}--><br />
                                 <!--{$arrPref[$OtherPref]|h}--><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--><br />
-                                <!--{$arrOtherDeliv[cnt].name01|h}-->&nbsp;<!--{$arrOtherDeliv[cnt].name02|h}-->
+                                <!--{$arrOtherDeliv[cnt].company_name|h}-->&nbsp;<!--{$arrOtherDeliv[cnt].name01|h}-->&nbsp;<!--{$arrOtherDeliv[cnt].name02|h}-->
                             </td>
                             <td class="alignC">
Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 22955)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 23024)
@@ -42,137 +42,5 @@
             <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
             <table summary=" ">
-                <tr>
-                    <th>お名前<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="order_name01"}-->
-                        <!--{assign var=key2 value="order_name02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
-                        名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>お名前(フリガナ)<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="order_kana01"}-->
-                        <!--{assign var=key2 value="order_kana02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
-                        メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>郵便番号<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="order_zip01"}-->
-                        <!--{assign var=key2 value="order_zip02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        <p class="top">〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;    <input type="text"    name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />　
-                            <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a></p>
-
-                        <p class="zipimg"><a href="<!--{$smarty.const.ROOT_URLPATH}-->address/<!--{$smarty.const.DIR_INDEX_PATH}-->" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_address_input.jpg" alt="住所自動入力" /></a>
-                            <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
-                    </td>
-                </tr>
-                <tr>
-                    <th>住所<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key value="order_pref"}-->
-                        <span class="attention"><!--{$arrErr.order_pref}--><!--{$arrErr.order_addr01}--><!--{$arrErr.order_addr02}--></span>
-                        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                            <option value="">都道府県を選択</option>
-                            <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
-                        </select>
-                        <p>
-                            <!--{assign var=key value="order_addr01"}-->
-                            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
-                            <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
-                        <p>
-                            <!--{assign var=key value="order_addr02"}-->
-                            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
-                            <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
-                        <p class="mini"><span class="attention">住所は2つに分けてご記入ください。マンション名は必ず記入してください。</span></p></td>
-                </tr>
-                <tr>
-                    <th>電話番号<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="order_tel01"}-->
-                        <!--{assign var=key2 value="order_tel02"}-->
-                        <!--{assign var=key3 value="order_tel03"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--></span>
-                        <span class="attention"><!--{$arrErr[$key2]}--></span>
-                        <span class="attention"><!--{$arrErr[$key3]}--></span>
-                        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
-                        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"    class="box60" /> -
-                        <input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>FAX</th>
-                    <td>
-                        <!--{assign var=key1 value="order_fax01"}-->
-                        <!--{assign var=key2 value="order_fax02"}-->
-                        <!--{assign var=key3 value="order_fax03"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--></span>
-                        <span class="attention"><!--{$arrErr[$key2]}--></span>
-                        <span class="attention"><!--{$arrErr[$key3]}--></span>
-                        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
-                        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"    class="box60" /> -
-                        <input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>メールアドレス<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key value="order_email"}-->
-                        <span class="attention"><!--{$arrErr[$key]}--></span>
-                        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box380 top" /><br />
-                        <!--{assign var=key value="order_email02"}-->
-                        <span class="attention"><!--{$arrErr[$key]}--></span>
-                        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box380" /><br />
-                        <p class="mini"><span class="attention">確認のため2度入力してください。</span></p>
-                    </td>
-                </tr>
-                <tr>
-                    <th>性別<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key value="order_sex"}-->
-                        <!--{if $arrErr[$key]}-->
-                            <div class="attention"><!--{$arrErr[$key]}--></div>
-                        <!--{/if}-->
-                        <span style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                            <!--{html_radios name="$key" options=$arrSex selected=$arrForm[$key].value style="$err" label_ids=true}-->
-                        </span>
-                    </td>
-                </tr>
-                <tr>
-                    <th>職業</th>
-                    <td>
-                        <!--{assign var=key value="order_job"}-->
-                        <!--{if $arrErr[$key]}-->
-                            <!--{assign var=err value="background-color: `$smarty.const.ERR_COLOR`"}-->
-                        <!--{/if}-->
-                        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                            <option value="">選択して下さい</option>
-                            <!--{html_options options=$arrJob selected=$arrForm[$key].value}-->
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <th>生年月日</th>
-                    <td>
-                        <!--{assign var=errBirth value="`$arrErr.year``$arrErr.month``$arrErr.day`"}-->
-                        <span class="attention"><!--{$errBirth}--></span>
-                        <select name="year" style="<!--{$errBirth|sfGetErrorColor}-->">
-                            <!--{html_options options=$arrYear selected=$arrForm.year.value|default:''}-->
-                        </select>年
-                        <select name="month" style="<!--{$errBirth|sfGetErrorColor}-->">
-                            <!--{html_options options=$arrMonth selected=$arrForm.month.value|default:''}-->
-                        </select>月
-                        <select name="day" style="<!--{$errBirth|sfGetErrorColor}-->">
-                            <!--{html_options options=$arrDay selected=$arrForm.day.value|default:''}-->
-                        </select>日
-                    </td>
-                </tr>
+            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/form_personal_input.tpl" flgFields=2 emailMobile=false prefix="order_"}-->
                 <tr>
                     <th colspan="2">
@@ -182,72 +50,5 @@
                     </th>
                 </tr>
-                <tr>
-                    <th>お名前<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="shipping_name01"}-->
-                        <!--{assign var=key2 value="shipping_name02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
-                        名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>お名前(フリガナ)<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="shipping_kana01"}-->
-                        <!--{assign var=key2 value="shipping_kana02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
-                        メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
-                    </td>
-                </tr>
-                <tr>
-                    <th>郵便番号<span class="attention">※</span></th>
-                    <td>
-                    <!--{assign var=key1 value="shipping_zip01"}-->
-                    <!--{assign var=key2 value="shipping_zip02"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                        <p class="top">〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"    class="box60" />&nbsp;-&nbsp;    <input type="text"    name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />　
-                            <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a></p>
-
-                        <p class="zipimg"><a href="<!--{$smarty.const.ROOT_URLPATH}-->address/<!--{$smarty.const.DIR_INDEX_PATH}-->" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'shipping_zip01', 'shipping_zip02', 'shipping_pref', 'shipping_addr01'); return false;" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_address_input.jpg" alt="住所自動入力" /></a>
-                            <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
-                    </td>
-                </tr>
-                <tr>
-                    <th>住所<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key value="shipping_pref"}-->
-                        <span class="attention"><!--{$arrErr.shipping_pref}--><!--{$arrErr.shipping_addr01}--><!--{$arrErr.shipping_addr02}--></span>
-                        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                            <option value="">都道府県を選択</option>
-                            <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
-                        </select>
-                        <p>
-                            <!--{assign var=key value="shipping_addr01"}-->
-                            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
-                            <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
-                        <p>
-                            <!--{assign var=key value="shipping_addr02"}-->
-                            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
-                            <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
-                        <p class="mini"><span class="attention">住所は2つに分けてご記入ください。マンション名は必ず記入してください。</span></p>
-
-                    </td>
-                </tr>
-                <tr>
-                    <th>電話番号<span class="attention">※</span></th>
-                    <td>
-                        <!--{assign var=key1 value="shipping_tel01"}-->
-                        <!--{assign var=key2 value="shipping_tel02"}-->
-                        <!--{assign var=key3 value="shipping_tel03"}-->
-                        <span class="attention"><!--{$arrErr[$key1]}--></span>
-                        <span class="attention"><!--{$arrErr[$key2]}--></span>
-                        <span class="attention"><!--{$arrErr[$key3]}--></span>
-                        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
-                        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"    class="box60" /> -
-                        <input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
-                    </td>
-                </tr>
+            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/form_personal_input.tpl" flgFields=1 emailMobile=false prefix="shipping_"}-->
             </table>
 
Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 22955)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 23024)
@@ -90,7 +90,11 @@
                         </td>
                         <td>
-                            <!--{assign var=key value=$arrAddr[cnt].pref}-->
-                            <!--{$arrPref[$key]}--><!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
-                            <!--{$arrAddr[cnt].name01|h}--> <!--{$arrAddr[cnt].name02|h}-->
+                            <!--{assign var=key1 value=$arrAddr[cnt].pref}-->
+                            <!--{assign var=key2 value=$arrAddr[cnt].country_id}-->
+                            <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                            <!--{$arrCountry[$key2]|h}--><br/>
+                            <!--{/if}-->
+                            <!--{$arrPref[$key1]|h}--><!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
+                            <!--{$arrAddr[cnt].company_name|h}--> <!--{$arrAddr[cnt].name01|h}--> <!--{$arrAddr[cnt].name02|h}-->
                         </td>
                         <td class="alignC">
Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23013)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23024)
@@ -108,5 +108,5 @@
                         </td>
                         <td class="alignR">
-                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                            <!--{$item.price_inctax|number_format}-->円
                         </td>
                         <td class="alignR"><!--{$item.quantity|number_format}--></td>
@@ -119,4 +119,5 @@
                 </tr>
                 <!--{if $smarty.const.USE_POINT !== false}-->
+                    <!--{if $arrForm.use_point > 0}-->
                     <tr>
                         <th colspan="4" class="alignR" scope="row">値引き（ポイントご使用時）</th>
@@ -125,4 +126,5 @@
                             -<!--{$discount|number_format|default:0}-->円</td>
                     </tr>
+                    <!--{/if}-->
                 <!--{/if}-->
                 <tr>
@@ -186,4 +188,18 @@
                         <td><!--{$arrForm.order_kana01|h}--> <!--{$arrForm.order_kana02|h}--></td>
                     </tr>
+                    <tr>
+                        <th scope="row">会社名</th>
+                        <td><!--{$arrForm.order_company_name|h}--></td>
+                    </tr>
+                    <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                    <tr>
+                        <th scope="row">国</th>
+                        <td><!--{$arrCountry[$arrForm.order_country_id]|h}--></td>
+                    </tr>
+                    <tr>
+                        <th scope="row">ZIPCODE</th>
+                        <td><!--{$arrForm.order_zipcode|h}--></td>
+                    </tr>
+                    <!--{/if}-->
                     <tr>
                         <th scope="row">郵便番号</th>
@@ -239,9 +255,6 @@
                             <th scope="col">商品写真</th>
                             <th scope="col">商品名</th>
-                            <th scope="col">単価</th>
                             <th scope="col">数量</th>
-                            <!--{* XXX 購入小計と誤差が出るためコメントアウト
                             <th scope="col">小計</th>
-                            *}-->
                         </tr>
                         <!--{foreach item=item from=$shippingItem.shipment_item}-->
@@ -262,11 +275,8 @@
                                     <!--{/if}-->
                                 </td>
+                                <td class="alignC"><!--{$item.quantity}--></td>
                                 <td class="alignR">
-                                    <!--{$item.price|sfCalcIncTax|number_format}-->円
+                                    <!--{$item.total_inctax|number_format}-->円
                                 </td>
-                                <td class="alignC"><!--{$item.quantity}--></td>
-                                <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                                <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
-                                *}-->
                             </tr>
                         <!--{/foreach}-->
@@ -286,4 +296,18 @@
                             <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
                         </tr>
+                        <tr>
+                            <th scope="row">会社名</th>
+                            <td><!--{$shippingItem.shipping_company_name|h}--></td>
+                        </tr>
+                        <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                        <tr>
+                            <th scope="row">国</th>
+                            <td><!--{$arrCountry[$shippingItem.shipping_country_id]|h}--></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">ZIPCODE</th>
+                            <td><!--{$shippingItem.shipping_zipcode|h}--></td>
+                        </tr>
+                        <!--{/if}-->
                         <tr>
                             <th scope="row">郵便番号</th>
Index: /branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 23013)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 23024)
@@ -59,5 +59,7 @@
 小　計 ￥<!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->)<!--{/if}-->
 
+<!--{if $arrOrder.use_point > 0}-->
 値引き ￥<!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|number_format|default:0}-->
+<!--{/if}-->
 送　料 ￥<!--{$arrOrder.deliv_fee|number_format|default:0}-->
 手数料 ￥<!--{$arrOrder.charge|number_format|default:0}-->
@@ -69,4 +71,11 @@
 ************************************************
 　お名前　：<!--{$arrOrder.order_name01}--> <!--{$arrOrder.order_name02}-->　様
+<!--{if $arrOrder.order_company_name != ""}-->
+　会社名　：<!--{$arrOrder.order_company_name}-->
+<!--{/if}-->
+<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+　国　　　：<!--{$arrCountry[$arrOrder.order_country_id]}-->
+　ZIPCODE ：<!--{$arrOrder.order_zipcode}-->
+<!--{/if}-->
 　郵便番号：〒<!--{$arrOrder.order_zip01}-->-<!--{$arrOrder.order_zip02}-->
 　住所　　：<!--{$arrPref[$arrOrder.order_pref]}--><!--{$arrOrder.order_addr01}--><!--{$arrOrder.order_addr02}-->
@@ -85,4 +94,11 @@
 
 　お名前　：<!--{$shipping.shipping_name01}--> <!--{$shipping.shipping_name02}-->　様
+<!--{if $shipping.shipping_company_name != ""}-->
+　会社名　：<!--{$shipping.shipping_company_name}-->
+<!--{/if}-->
+<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+　国　　　：<!--{$arrCountry[$shipping.shipping_country_id]}-->
+　ZIPCODE ：<!--{$shipping.shipping_zipcode}-->
+<!--{/if}-->
 　郵便番号：〒<!--{$shipping.shipping_zip01}-->-<!--{$shipping.shipping_zip02}-->
 　住所　　：<!--{$arrPref[$shipping.shipping_pref]}--><!--{$shipping.shipping_addr01}--><!--{$shipping.shipping_addr02}-->
@@ -96,5 +112,5 @@
 商品コード: <!--{$item.product_code}-->
 商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥<!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+単価：￥<!--{$item.price|number_format}-->
 数量：<!--{$item.quantity}-->
 
Index: /branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 22955)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 23024)
@@ -50,4 +50,24 @@
                     </td>
                 </tr>
+                <tr>
+                    <th>会社名</th>
+                    <td>
+                        <!--{$arrForm.company_name|h}-->
+                    </td>
+                </tr>
+                <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+                <tr>
+                    <th>国</th>
+                    <td>
+                        <!--{$arrCountry[$arrForm.country_id]|h}-->
+                    </td>
+                </tr>
+                <tr>
+                    <th>ZIP CODE</th>
+                    <td>
+                        <!--{$arrForm.zipcode|h}-->
+                    </td>
+                </tr>
+                <!--{/if}-->
                 <tr>
                     <th>郵便番号</th>
Index: /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 22959)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 23024)
@@ -39,5 +39,5 @@
     </tr>
     <tr>
-        <th>お名前(フリガナ)<span class="attention">※</span></th>
+        <th>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention">※</span><!--{/if}--></th>
         <td>
             <!--{assign var=key1 value="`$prefix`kana01"}-->
@@ -51,11 +51,48 @@
     </tr>
     <tr>
-        <th>郵便番号<span class="attention">※</span></th>
-        <td>
-            <!--{assign var=key1 value="`$prefix`zip01"}-->
-            <!--{assign var=key2 value="`$prefix`zip02"}-->
-            <!--{assign var=key3 value="`$prefix`pref"}-->
-            <!--{assign var=key4 value="`$prefix`addr01"}-->
-            <!--{assign var=key5 value="`$prefix`addr02"}-->
+        <th>会社名</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`company_name"}-->
+            <!--{if $arrErr[$key1]}-->
+                <div class="attention"><!--{$arrErr[$key1]}--></div>
+            <!--{/if}-->
+            <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box300" />&nbsp;
+        </td>
+    </tr>
+    <!--{assign var=key1 value="`$prefix`zip01"}-->
+    <!--{assign var=key2 value="`$prefix`zip02"}-->
+    <!--{assign var=key3 value="`$prefix`pref"}-->
+    <!--{assign var=key4 value="`$prefix`addr01"}-->
+    <!--{assign var=key5 value="`$prefix`addr02"}-->
+    <!--{assign var=key6 value="`$prefix`country_id"}-->
+    <!--{assign var=key7 value="`$prefix`zipcode"}-->
+    <!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->
+    <input type="hidden" name="<!--{$key6}-->" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+    <!--{else}-->
+    <tr>
+        <th>国<span class="attention">※</span></th>
+        <td>
+            <!--{if $arrErr[$key6]}-->
+                <div class="attention"><!--{$arrErr[$key6]}--></div>
+            <!--{/if}-->
+            <select name="<!--{$key6}-->" style="<!--{$arrErr[$key6]|sfGetErrorColor}-->">
+                    <option value="" selected="selected">国を選択</option>
+                    <!--{html_options options=$arrCountry selected=$arrForm[$key6]|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th>ZIP CODE</th>
+        <td>
+            <!--{if $arrErr[$key7]}-->
+                <div class="attention"><!--{$arrErr[$key7]}--></div>
+            <!--{/if}-->
+            <input type="text" name="<!--{$key7}-->" value="<!--{$arrForm[$key7]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" class="box120" style="<!--{$arrErr[$key7]|sfGetErrorColor}-->; ime-mode: disabled;" />
+        </td>
+    </tr>
+    <!--{/if}-->
+    <tr>
+        <th>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention">※</span><!--{/if}--></th>
+        <td>
             <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
                 <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 22954)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 23024)
@@ -194,4 +194,12 @@
             </tr>
             <tr>
+                <th>会社名</th>
+                <td>
+                    <!--{assign var=key1 value="order_company_name"}-->
+                    <span class="attention"><!--{$arrErr[$key1]}--></span>
+                    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="30" class="box30" />
+                </td>
+            </tr>
+            <tr>
                 <th>メールアドレス</th>
                 <td>
@@ -229,4 +237,28 @@
                 </td>
             </tr>
+            <!--{assign var=key1 value="order_country_id"}-->
+            <!--{assign var=key2 value="order_zipcode"}-->
+            <!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->
+            <input type="hidden" name="<!--{$key1}-->" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+            <!--{else}-->
+            <tr>
+                <th>国</th>
+                <td>
+                    <span class="attention"><!--{$arrErr[$key1]}--></span>
+                    <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+                            <option value="" selected="selected">国を選択</option>
+                            <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <th>ZIP CODE</th>
+                <td>
+                    <span class="attention"><!--{$arrErr[$key2]}--></span>
+                    <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->;" size="15" class="box15"/>
+                </td>
+            </tr>
+            <!--{/if}-->
+
             <tr>
                 <th>住所</th>
@@ -323,6 +355,4 @@
                 <input type="hidden" name="product_class_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_class_id.value[$product_index]|h}-->" id="product_class_id_<!--{$product_index}-->" />
                 <input type="hidden" name="point_rate[<!--{$product_index}-->]" value="<!--{$arrForm.point_rate.value[$product_index]|h}-->" id="point_rate_<!--{$product_index}-->" />
-                <input type="hidden" name="tax_rate[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rate.value[$product_index]|h}-->" id="tax_rate_<!--{$product_index}-->" />
-                <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
                 </td>
                 <td align="center">
@@ -340,5 +370,12 @@
                 <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
                 <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
+                <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
+
+                <td class="right">
+                    <!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円<br />
+                    <!--{assign var=key value="tax_rate"}-->
+                    <span class="attention"><!--{$arrErr[$key][$product_index]}--></span>
+                    税率<input type="text" name="<!--{$key}-->[<!--{$product_index}-->]" value="<!--{$arrForm[$key].value[$product_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$product_index]|sfGetErrorColor}-->" id="<!--{$key}-->_<!--{$product_index}-->" />%
+                </td>
                 <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
             </tr>
@@ -538,4 +575,12 @@
                 </tr>
                 <tr>
+                    <th>会社名</th>
+                    <td>
+                        <!--{assign var=key1 value="shipping_company_name"}-->
+                        <span class="attention"><!--{$arrErr[$key1][$shipping_index]}--></span>
+                        <input type="text" name="<!--{$key1}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key1]|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1][$shipping_index]|sfGetErrorColor}-->" size="30" class="box30" />
+                    </td>
+                </tr>
+                <tr>
                     <th>TEL</th>
                     <td>
@@ -565,4 +610,26 @@
                     </td>
                 </tr>
+                <!--{assign var=key1 value="shipping_country_id"}-->
+                <!--{assign var=key2 value="shipping_zipcode"}-->
+                <!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->
+                <input type="hidden" name="<!--{$key1}-->[<!--{$shipping_index}-->]" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+                <!--{else}-->
+                <tr>
+                    <th>国</th>
+                    <td>
+                        <span class="attention"><!--{$arrErr[$key1][$shipping_index]}--></span>
+                        <select name="<!--{$key1}-->[<!--{$shipping_index}-->]" style="<!--{$arrErr[$key1][$shipping_index]|sfGetErrorColor}-->">
+                                <!--{html_options options=$arrCountry selected=$arrShipping[$key1]|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <th>ZIP CODE</th>
+                    <td>
+                        <span class="attention"><!--{$arrErr[$key2][$shipping_index]}--></span>
+                        <input type="text" name="<!--{$key2}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key2]|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2][$shipping_index]|sfGetErrorColor}-->;" size="15" class="box15"/>
+                    </td>
+                </tr>
+                <!--{/if}-->
                 <tr>
                     <th>住所</th>
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 22206)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 23024)
@@ -77,4 +77,18 @@
             </tr>
             <tr>
+                <th>会社名</th>
+                <td><!--{$arrForm.company_name|h}--></td>
+            </tr>
+            <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+            <tr>
+                <th>国</th>
+                <td><!--{$arrCountry[$arrForm.country_id]|h}--></td>
+            </tr>
+            <tr>
+                <th>ZIPCODE</th>
+                <td><!--{$arrForm.zipcode|h}--></td>
+            </tr>
+            <!--{/if}-->
+            <tr>
                 <th>郵便番号</th>
                 <td>〒 <!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--></td>
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 22883)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 23024)
@@ -99,4 +99,31 @@
                 </td>
             </tr>
+            <tr>
+                <th>会社名</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.company_name}--></span>
+                    <input type="text" name="company_name" value="<!--{$arrForm.company_name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.company_name != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->
+            <input type="hidden" name="country_id" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+            <!--{else}-->
+            <tr>
+                <th>国<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.country_id}--></span>
+                    <select name="country_id" <!--{if $arrErr.country_id != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                            <!--{html_options options=$arrCountry selected=$arrForm.country_id|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <th>ZIP CODE</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.zipcode}--></span>
+                    <input type="text" name="zipcode" value="<!--{$arrForm.zipcode|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.zipcode != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <!--{/if}-->
             <tr>
                 <th>郵便番号<span class="attention"> *</span></th>
