diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 2132bcebe..3e12eeba9 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -474,6 +474,20 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
             <td><?php echo display_price($od['od_cancel_card']); ?></td>
         </tr>
         <?php } ?>
+        <?php if($od['od_tax_flag']) { ?>
+        <tr>
+            <th scope="row">과세공급가액</th>
+            <td><?php echo display_price($od['od_tax_mny']); ?></td>
+        </tr>
+        <tr>
+            <th scope="row">과세부가세액</th>
+            <td><?php echo display_price($od['od_vat_mny']); ?></td>
+        </tr>
+        <tr>
+            <th scope="row">비과세공급가액</th>
+            <td><?php echo display_price($od['od_free_mny']); ?></td>
+        </tr>
+        <?php } ?>
         <tr>
             <th scope="row">포인트</th>
             <td><?php echo display_point($od['od_receipt_point']); ?></td>
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 57aaa0e65..fdc1f5fe2 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -400,4 +400,12 @@ if (!sql_query(" select de_mobile_type1_list_mod from {$g4['shop_default_table']
                     CHANGE `de_mobile_type4_list_row` `de_mobile_type4_list_mod` INT(11) NOT NULL DEFAULT '0',
                     CHANGE `de_mobile_type5_list_row` `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
 }
+
+// 과세, 비과세 금액 필드 추가
+if(!sql_query(" select od_tax_mny from {$g4['shop_order_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
+                    ADD `od_tax_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_flag`,
+                    ADD `od_vat_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_mny`,
+                    ADD `od_free_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_vat_mny` ", true);
+}
 ?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index ad9a397de..7d21a7af6 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -623,6 +623,9 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_tno` varchar(255) NOT NULL DEFAULT '',
   `od_escrow` tinyint(4) NOT NULL DEFAULT '0',
   `od_tax_flag` tinyint(4) NOT NULL DEFAULT '0',
+  `od_tax_mny` int(11) NOT NULL DEFAULT '0',
+  `od_vat_mny` int(11) NOT NULL DEFAULT '0',
+  `od_free_mny` int(11) NOT NULL DEFAULT '0',
   `od_cash_no` varchar(255) NOT NULL,
   `od_cash_receipt_no` varchar(255) NOT NULL,
   `od_cash_app_time` varchar(255) NOT NULL,
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 697a9fa21..41a0b381f 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -1205,8 +1205,7 @@ function kcp_approval()
     f.settle_method.value = settle_method;
 
     <?php if($default['de_tax_flag_use']) { ?>
-    if(settle_method != "무통장")
-        calculate_tax();
+    calculate_tax();
     <?php } ?>
 
     var new_win = window.open("about:blank", "tar_opener", "scrollbars=yes,resizable=yes");
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 946db9fd5..2d1164fa2 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -397,6 +397,16 @@ $od_escrow = 0;
 if($escw_yn == 'Y')
     $od_escrow = 1;
 
+// 복합과세 금액
+$od_tax_mny = round($od_temp_amount / 1.1);
+$od_vat_mny = $od_temp_amount - $od_tax_mny;
+$od_free_mny = 0;
+if($default['de_tax_flag_use']) {
+    $od_tax_mny = (int)$_POST['comm_tax_mny'];
+    $od_vat_mny = (int)$_POST['comm_vat_mny'];
+    $od_free_mny = (int)$_POST['comm_free_mny'];
+}
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -433,6 +443,9 @@ $sql = " insert {$g4['shop_order_table']}
                 od_tno            = '$od_tno',
                 od_escrow         = '$od_escrow',
                 od_tax_flag       = '{$default['de_tax_flag_use']}',
+                od_tax_mny        = '$od_tax_mny',
+                od_vat_mny        = '$od_vat_mny',
+                od_free_mny       = '$od_free_mny',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',
diff --git a/shop/orderform.php b/shop/orderform.php
index b94738e18..fa3507cc6 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -1483,8 +1483,7 @@ function forderform_check(f)
     }
 
     <?php if($default['de_tax_flag_use']) { ?>
-    if(settle_method != "무통장")
-        calculate_tax();
+    calculate_tax();
     <?php } ?>
 
     // pay_method 설정
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 130eb8a6f..1bf61f68c 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -391,6 +391,16 @@ $od_escrow = 0;
 if($escw_yn == 'Y')
     $od_escrow = 1;
 
+// 복합과세 금액
+$od_tax_mny = round($od_temp_amount / 1.1);
+$od_vat_mny = $od_temp_amount - $od_tax_mny;
+$od_free_mny = 0;
+if($default['de_tax_flag_use']) {
+    $od_tax_mny = (int)$_POST['comm_tax_mny'];
+    $od_vat_mny = (int)$_POST['comm_vat_mny'];
+    $od_free_mny = (int)$_POST['comm_free_mny'];
+}
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -427,6 +437,9 @@ $sql = " insert {$g4['shop_order_table']}
                 od_tno            = '$od_tno',
                 od_escrow         = '$od_escrow',
                 od_tax_flag       = '{$default['de_tax_flag_use']}',
+                od_tax_mny        = '$od_tax_mny',
+                od_vat_mny        = '$od_vat_mny',
+                od_free_mny       = '$od_free_mny',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',