diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index 467157d72..9bd1ddbe3 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -27,14 +27,15 @@ if ($search != "") {
     }
 }
 
+$sql_search .= " $where od_status = '배송' ";
+
 if ($sel_ca_id != "") {
     $sql_search .= " $where ca_id like '$sel_ca_id%' ";
 }
 
 if ($sel_field == "")  $sel_field = "od_id";
 
-$sql_common = " from {$g5['g5_shop_order_table']}
-                $sql_search ";
+$sql_common = " from {$g5['g5_shop_order_table']} $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
 if ($chk_misu) {
@@ -119,7 +120,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         <li><a href="<?php echo title_sort("od_invoice", 1) . "&amp;$qstr1"; ?>">운송장번호<span class="sound_only"> 순 정렬</span></a></li>
     </ul>
 
-    <form name="fdeliverylistupate" method="post" action="./deliverylistupdate.php" autocomplete="off">
+    <form name="fdeliverylist" method="post" onsubmit="return fdeliverylist_submit(this);" autocomplete="off">
     <input type="hidden" name="sel_ca_id" value="<?php echo $sel_ca_id; ?>">
     <input type="hidden" name="sel_field" value="<?php echo $sel_field; ?>">
     <input type="hidden" name="search" value="<?php echo $search; ?>">
@@ -130,6 +131,10 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     <table id="sdeli_proc">
     <thead>
     <tr>
+        <th scope="col">
+            <label for="chkall" class="sound_only">주문 전체</label>
+            <input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
+        </th>
         <th scope="col">주문번호</th>
         <th scope="col">주문자</th>
         <th scope="col">주문액</th>
@@ -143,8 +148,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     </thead>
     <tbody>
     <?php
-    $sql  = " select *
-              $sql_common ";
+    $sql  = " select * $sql_common ";
     if ($chk_misu)
         $sql .= " where  od_misu <= 0 ";
     $sql .= "  order by $sort1 $sort2
@@ -167,7 +171,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     ?>
     <tr>
         <td>
-            <input type="hidden" name="od_id[<?php echo $i; ?>]" value="<?php echo $row['od_id']; ?>">
+            <input type="hidden" name="od_id[<?php echo $i ?>]" value="<?php echo $row['od_id'] ?>" id="od_id_<?php echo $i ?>">
+            <label for="chk_<?php echo $i; ?>" class="sound_only">주문번호 <?php echo $row['od_id']; ?></label>
+            <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
+        </td>
+        <td>
+            <!-- <input type="hidden" name="od_id[<?php echo $i; ?>]" value="<?php echo $row['od_id']; ?>"> -->
             <input type="hidden" name="od_tno[<?php echo $i; ?>]" value="<?php echo $row['od_tno']; ?>">
             <input type="hidden" name="od_escrow[<?php echo $i; ?>]" value="<?php echo $row['od_escrow']; ?>">
             <a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>"><?php echo $row['od_id']; ?></a>
@@ -209,7 +218,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     </fieldset>
 
     <div class="btn_confirm">
-        <input type="submit" value="일괄수정" class="btn_submit" accesskey="s">
+        <input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
     </div>
 
     </form>
@@ -218,6 +227,20 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
 
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
 
+<script>
+function fdeliverylist_submit(f)
+{
+    if (!is_checked("chk[]")) {
+        alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
+        return false;
+    }
+
+    f.action = "./deliverylistupdate.php";
+
+    return true;
+}
+</script>
+
 <?php
 include_once (G5_ADMIN_PATH.'/admin.tail.php');
 ?>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index c2c520029..a5162112d 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -220,7 +220,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     </div>
     </form>
 
-    <form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post">
+    <form name="forderlist" id="forderlist" onsubmit="return forderlist_submit(this);" method="post">
 
     <table id="sodr_list">
     <thead>
@@ -424,6 +424,8 @@ function forderlist_submit(f)
         }
     }
 
+    f.action = "./orderlistupdate.php";
+
     return true;
 }
 </script>
diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php
index 369a7cd2b..369718356 100644
--- a/adm/shop_admin/orderlistupdate.php
+++ b/adm/shop_admin/orderlistupdate.php
@@ -2,70 +2,105 @@
 $sub_menu = '400400';
 include_once('./_common.php');
 
-//print_r2($_POST); 
 
-// 주문상태변경 처리
-function change_order_status($od_status1, $od_status2, $od) 
+// 상품옵션별재고 또는 상품재고에 더하기
+function add_io_stock($it_id, $ct_qty, $io_id="", $io_type="")
 {
     global $g5;
 
-    // 원래 주문상태와 바뀔 주문상태가 같다면 처리하지 않음
-    if ($od_status1 == $od_status2) return;
+    if($io_id) {
+        $sql = " update {$g5['g5_shop_item_option_table']}
+                    set io_stock_qty = io_stock_qty + '{$ct_qty}'
+                    where it_id = '{$it_id}'
+                      and io_id = '{$io_id}'
+                      and io_type = '{$io_type}' ";
+    } else {
+        $sql = " update {$g5['g5_shop_item_table']}
+                    set it_stock_qty = it_stock_qty + '{$ct_qty}'
+                    where it_id = '{$it_id}' ";
+    }
+    return sql_query($sql);
+}
+
+
+// 상품옵션별재고 또는 상품재고에서 빼기
+function subtract_io_stock($it_id, $ct_qty, $io_id="", $io_type="")
+{
+    global $g5;
+
+    if($io_id) {
+        $sql = " update {$g5['g5_shop_item_option_table']}
+                    set io_stock_qty = io_stock_qty - '{$ct_qty}'
+                    where it_id = '{$it_id}'
+                      and io_id = '{$io_id}'
+                      and io_type = '{$io_type}' ";
+    } else {
+        $sql = " update {$g5['g5_shop_item_table']}
+                    set it_stock_qty = it_stock_qty - '{$ct_qty}'
+                    where it_id = '{$it_id}' ";
+    }
+    return sql_query($sql);
+}
+
+
+// 주문과 장바구니의 상태를 변경한다.
+function change_status($od_id, $current_status, $change_status)
+{
+    global $g5;
+
+    $sql = " update {$g5['g5_shop_order_table']} set od_status = '{$change_status}' where od_id = '{$od_id}' and od_status = '{$current_status}' ";
+    sql_query($sql, true);
+
+    $sql = " update {$g5['g5_shop_cart_table']} set ct_status = '{$change_status}' where od_id = '{$od_id}' and ct_status = '{$current_status}' ";
+    sql_query($sql, true);
+}
+
+
+
+//print_r2($_POST); 
+
+// 주문상태변경 처리
+function change_order_status($current_staus, $change_status, $od) 
+{
+    global $g5;
+
+    // 현재 주문상태와 바뀔 주문상태가 같다면 처리하지 않음
+    if ($current_staus == $change_status) return;
 
     $od = sql_fetch(" select od_settle_case from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
     if (!$od) return;
 
-    switch ($od_status1) 
+    switch ($current_staus) 
     {
         case '주문' :
 
-            if ($od_status2 != '입금') return;
+            if ($change_status != '입금') return;
             if ($od['od_settle_case'] != '무통장') return;
 
             $sql = " update {$g5['g5_shop_order_table']} 
-                        set od_status = '입금',  
-                            od_receipt_price = od_misu,
+                        set od_receipt_price = od_misu,
                             od_misu = 0,
                             od_receipt_time = '".G5_TIME_YMDHIS."'
                       where od_id = '$od_id' and od_status = '주문' ";
             sql_query($sql, true);
 
-            $sql = " update {$g5['g5_shop_cart_table']} 
-                        set ct_status = '입금'
-                      where od_id = '$od_id' and ct_status = '주문' ";
-            sql_query($sql, true);
+            change_status($od_id, '주문', '입금');
 
             break;
 
         case '입금' :
 
-            if ($od_status2 != '준비') return;
+            if ($change_status != '준비') return;
 
-            $sql = " update {$g5['g5_shop_order_table']} 
-                        set od_status = '준비'
-                      where od_id = '$od_id' and od_status = '입금' ";
-            sql_query($sql, true);
-
-            $sql = " update {$g5['g5_shop_cart_table']} 
-                        set ct_status = '준비'
-                      where od_id = '$od_id' and ct_status = '입금' ";
-            sql_query($sql, true);
+            change_status($od_id, '입금', '준비');
 
             break;
 
         case '준비' :
 
-            if ($od_status2 != '배송') return;
+            if ($change_status != '배송') return;
 
-            $sql = " update {$g5['g5_shop_order_table']} 
-                        set od_status = '배송'
-                      where od_id = '$od_id' and od_status = '준비' ";
-            sql_query($sql, true);
-
-            $sql = " update {$g5['g5_shop_cart_table']} 
-                        set ct_status = '배송'
-                      where od_id = '$od_id' and ct_status = '준비' ";
-            sql_query($sql, true);
+            change_status($od_id, '준비', '배송');
 
             $sql = " select * from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
             $result = sql_query($sql);
@@ -78,19 +113,7 @@ function change_order_status($od_status1, $od_status2, $od)
                     {
                         $stock_use = 0;
                         // 재고에 다시 더한다.
-                        if($row['io_id']) {
-                            $sql = " update {$g5['g5_shop_item_option_table']}
-                                        set io_stock_qty = io_stock_qty + '{$row['ct_qty']}'
-                                        where it_id = '{$row['it_id']}'
-                                          and io_id = '{$row['io_id']}'
-                                          and io_type = '{$row['io_type']}' ";
-                        } else {
-                            $sql = " update {$g5['g5_shop_item_table']}
-                                        set it_stock_qty = it_stock_qty + '{$row['ct_qty']}'
-                                        where it_id = '{$row['it_id']}' ";
-                        }
-
-                        sql_query($sql);
+                        add_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
                     }
                 }
                 else
@@ -100,19 +123,7 @@ function change_order_status($od_status1, $od_status2, $od)
                     {
                         $stock_use = 1;
                         // 재고에서 뺀다.
-                        if($row['io_id']) {
-                            $sql = " update {$g5['g5_shop_item_option_table']}
-                                        set io_stock_qty = io_stock_qty - '{$row['ct_qty']}'
-                                        where it_id = '{$row['it_id']}'
-                                          and io_id = '{$row['io_id']}'
-                                          and io_type = '{$row['io_type']}' ";
-                        } else {
-                            $sql = " update {$g5['g5_shop_item_table']}
-                                        set it_stock_qty = it_stock_qty - '{$row['ct_qty']}'
-                                        where it_id = '{$row['it_id']}' ";
-                        }
-
-                        sql_query($sql);
+                        subtract_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
                     }
                 }
 
@@ -130,11 +141,15 @@ function change_order_status($od_status1, $od_status2, $od)
                                 ct_stock_use  = '$stock_use',
                                 ct_status     = '$ct_status',
                                 ct_history    = CONCAT(ct_history,'$ct_history')
-                            where od_id = '$row['od_id']' ";
+                            where od_id = '{$row['od_id']}' ";
                 sql_query($sql);
             }
 
             break;
+
+        case '배송' :
+
+            if ($change_status != '완료') return;
     }
 
     // 주문정보