Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php	(revision 19732)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php	(revision 19755)
@@ -68,5 +68,5 @@
     function action() {
         $objSess = new SC_Session();
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -102,5 +102,4 @@
         case 'delete':
             $objDb->sfDeleteRankRecord("dtb_class", "class_id", $_POST['class_id'], "", true);
-            $objQuery = new SC_Query();
             $objQuery->delete("dtb_classcategory", "class_id = ?", $_POST['class_id']);
             // 再表示
@@ -149,5 +148,5 @@
     /* DBへの挿入 */
     function lfInsertClass($arrData) {
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         // INSERTする値を作成する。
         $sqlval['name'] = $arrData['name'];
@@ -165,5 +164,5 @@
     /* DBへの更新 */
     function lfUpdateClass($arrData) {
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         // UPDATEする値を作成する。
         $sqlval['name'] = $arrData['name'];
@@ -195,5 +194,5 @@
 
         if(!isset($objErr->arrErr['name'])) {
-            $objQuery = new SC_Query();
+            $objQuery =& SC_Query::getSingletonInstance();
             $arrRet = $objQuery->select("class_id, name", "dtb_class", "del_flg = 0 AND name = ?", array($_POST['name']));
             // 編集中のレコード以外に同じ名称が存在する場合
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 19755)
@@ -514,5 +514,5 @@
         if (NOSTOCK_HIDDEN === true) {
             // 件数カウントバッチ実行
-            //$objDb->sfCategory_Count($objQuery);
+            $objDb->sfCategory_Count($objQuery);
         }
     }
@@ -535,6 +535,6 @@
         if(SC_Utils_Ex::isBlank($class_id2)) {
             $table = "dtb_classcategory T1 ";
-            $objQuery->setWhere("T1.class_id = ?")
-                     ->setOrder("T1.rank DESC");
+            $objQuery->setWhere("T1.class_id = ?");
+            $objQuery->setOrder("T1.rank DESC");
             $val = array($class_id1);
         } else {
@@ -545,6 +545,6 @@
                 . "T2.rank AS rank2";
             $table = "dtb_classcategory AS T1, dtb_classcategory AS T2";
-            $objQuery->setWhere("T1.class_id = ? AND T2.class_id = ?")
-                     ->setOrder("T1.rank DESC, T2.rank DESC");
+            $objQuery->setWhere("T1.class_id = ? AND T2.class_id = ?");
+            $objQuery->setOrder("T1.rank DESC, T2.rank DESC");
             $val = array($class_id1, $class_id2);
         }
@@ -617,5 +617,9 @@
     function getProductsClass($product_id) {
         $objQuery =& SC_Query::getSingletonInstance();
-        return $objQuery->getRow("*", "dtb_products_class", "product_id = ?", array($product_id));
+        $col = <<< __EOS__
+            product_id, product_code, price01, price02, stock,
+            stock_unlimited, point_rate
+__EOS__;
+        return $objQuery->getRow($col, "dtb_products_class", "product_id = ?", array($product_id));
     }
 
Index: branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Query.php	(revision 19746)
+++ branches/version-2_5-dev/data/class/SC_Query.php	(revision 19755)
@@ -547,5 +547,5 @@
      */
     function max($col, $table, $where = "", $arrval = array()) {
-        $ret = $this->get($table, "MAX($col)", $where, $arrval);
+        $ret = $this->get("MAX($col)", $table, $where, $arrval);
         return $ret;
     }
@@ -561,5 +561,5 @@
      */
     function min($col, $table, $where = "", $arrval = array()) {
-        $ret = $this->get($table, "MIN($col)", $where, $arrval);
+        $ret = $this->get("MIN($col)", $table, $where, $arrval);
         return $ret;
     }
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19719)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19755)
@@ -22,16 +22,4 @@
  */
 *}-->
-<script type="text/javascript">//<![CDATA[
-    $(function() {
-        $('#move_check').change(function() {
-            if ($(this).attr('checked')) {
-                $('input[name=move[]]').attr('checked', true);
-            } else {
-                $('input[name=move[]]').attr('checked', false);
-            }
-        });
-    });
-//]]>
-</script>
 <form name="form1" id="form1" method="POST" action="?" >
 <input type="hidden" name="mode" value="" />
@@ -77,5 +65,5 @@
   <table class="list center">
     <tr>
-      <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" /></th>
+      <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" onclick="fnAllCheck(this, 'input[name=move[]]')" /></th>
       <th>対応状況</th>
       <th>注文番号</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19719)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19755)
@@ -76,14 +76,4 @@
         fm.action = tmpAction;
     }
-    
-    $(function() {
-        $('#pdf_check').change(function() {
-            if ($(this).attr('checked')) {
-                $('input[name=pdf_order_id[]]').attr('checked', true);
-            } else {
-                $('input[name=pdf_order_id[]]').attr('checked', false);
-            }
-        });
-    });
 //-->
 </script>
@@ -323,5 +313,5 @@
             <th>全商品発送日</th>
             <th>対応状況</th>
-            <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" /></th>
+            <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" onclick="fnAllCheck(this, 'input[name=pdf_order_id[]]')" /></th>
             <th>編集</th>
             <th>メール</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19711)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19755)
@@ -83,6 +83,4 @@
 
   <div class="btn">
-    <button type="button" onclick="fnAllCheck(); return false;"><span>全選択</span></button>
-    <button type="button" onclick="fnAllUnCheck(); return false;"><span>全解除</span></button>
     <button type="button" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></button>
   </div>
@@ -94,5 +92,5 @@
   <table class="list">
     <tr>
-      <th>登録</th>
+      <th><label for="allCheck">登録</label> <input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /></th>
       <th>規格1(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
       <th>規格2(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
@@ -101,6 +99,6 @@
       <th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
       <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
-      <th>商品種別<span class="attention"> *</span></th>
-      <th>支払方法<span class="attention"> *</span></th>
+      <th>商品種別<span class="attention">*</span></th>
+      <th><label for="allPaymentIds">支払方法</label><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /></th>
       <th>ダウンロードファイル名<BR><span class="red"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></th>
       <th>ダウンロード商品用ファイルアップロード<BR>登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}-->　(パラメータ DOWNLOAD_EXTENSION)</th>