Index: /branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 18876)
@@ -320,31 +320,4 @@
       </td>
     </tr>
-    <!--{*　カラー比較画像、商品詳細ファイルは非対応
-    <tr>
-      <th>カラー比較画像<br />[500×500]</th>
-      <td>
-        <!--{assign var=key value="file1"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <!--{if $arrFile[$key].filepath != ""}-->
-        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
-        <!--{/if}-->
-        <input type="file" name="<!--{$key}-->" size="50" class="box50" />
-        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
-      </td>
-    </tr>
-    <tr>
-      <th>商品詳細ファイル</th>
-      <td>
-        <!--{assign var=key value="file2"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <!--{if $arrFile[$key].filepath != ""}-->
-        <input type="button" name="pdf" value="ファイル確認" onclick="selectAll('category_id'); fnOpenNoMenu('<!--{$arrFile[$key].filepath}-->')"/>
-        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br />
-        <!--{/if}-->
-        <input type="file" name="<!--{$key}-->" size="50" class="box50" />
-        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
-      </td>
-    </tr>
-    *}-->
   </table>
 
Index: /branches/version-2_5-dev/data/class/SC_Product.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Product.php	(revision 18863)
+++ /branches/version-2_5-dev/data/class/SC_Product.php	(revision 18876)
@@ -548,10 +548,4 @@
                     dtb_products.comment6,
                     dtb_products.note,
-                    dtb_products.file1,
-                    dtb_products.file2,
-                    dtb_products.file3,
-                    dtb_products.file4,
-                    dtb_products.file5,
-                    dtb_products.file6,
                     dtb_products.main_list_comment,
                     dtb_products.main_list_image,
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 18863)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 18876)
@@ -436,6 +436,4 @@
             $this->objUpFile->addFile("詳細-サブ拡大画像$cnt", "sub_large_image$cnt", array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_SUBIMAGE_WIDTH, LARGE_SUBIMAGE_HEIGHT);
         }
-        $this->objUpFile->addFile("商品比較画像", 'file1', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, OTHER_IMAGE1_WIDTH, OTHER_IMAGE1_HEIGHT);
-        $this->objUpFile->addFile("商品詳細ファイル", 'file2', array('pdf'), PDF_SIZE, false, 0, 0, false);
     }
 
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 18820)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 18876)
@@ -276,6 +276,4 @@
         $this->objFormParam->addParam("メイン画像", "main_image", LTEXT_LEN, "KVa", array("FILE_EXISTS","SPTAB_CHECK","MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("メイン拡大画像", "main_large_image", LTEXT_LEN, "KVa", array("FILE_EXISTS","SPTAB_CHECK","MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("カラー比較画像", "file1", LTEXT_LEN, "KVa", array("FILE_EXISTS","SPTAB_CHECK","MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("商品詳細ファイル", "file2", LTEXT_LEN, "KVa", array("FILE_EXISTS","SPTAB_CHECK","MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("詳細-サブタイトル(1)", "sub_title1", STEXT_LEN, "KVa", array("SPTAB_CHECK","MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("詳細-サブコメント(1)", "sub_comment1", LLTEXT_LEN, "KVa", array("SPTAB_CHECK","MAX_LENGTH_CHECK"));
Index: /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18862)
+++ /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18876)
@@ -497,6 +497,4 @@
             $this->objUpFile->addFile("詳細-サブ画像$cnt", "sub_image$cnt", array('jpg'), IMAGE_SIZE, false, NORMAL_SUBIMAGE_HEIGHT, NORMAL_SUBIMAGE_HEIGHT);
         }
-        $this->objUpFile->addFile("商品比較画像", 'file1', array('jpg'), IMAGE_SIZE, false, NORMAL_IMAGE_HEIGHT, NORMAL_IMAGE_HEIGHT);
-        $this->objUpFile->addFile("商品詳細ファイル", 'file2', array('pdf'), PDF_SIZE, false, 0, 0, false);
     }
 
Index: /branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- /branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	(revision 18824)
+++ /branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	(revision 18876)
@@ -323,10 +323,4 @@
                         dtb_products.comment6,
                         dtb_products.note,
-                        dtb_products.file1,
-                        dtb_products.file2,
-                        dtb_products.file3,
-                        dtb_products.file4,
-                        dtb_products.file5,
-                        dtb_products.file6,
                         dtb_products.main_list_comment,
                         dtb_products.main_list_image,
Index: /branches/version-2_5-dev/html/install/sql/create_view.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_view.sql	(revision 18824)
+++ /branches/version-2_5-dev/html/install/sql/create_view.sql	(revision 18876)
@@ -13,10 +13,4 @@
         dtb_products.comment6,
         dtb_products.note,
-        dtb_products.file1,
-        dtb_products.file2,
-        dtb_products.file3,
-        dtb_products.file4,
-        dtb_products.file5,
-        dtb_products.file6,
         dtb_products.main_list_comment,
         dtb_products.main_list_image,
Index: /branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18873)
+++ /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18876)
@@ -70,6 +70,4 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (21, 1, 'main_image', '詳細-メイン画像', 21, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (22, 1, 'main_large_image', '詳細-メイン拡大画像 ', 22, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (23, 1, 'file1', 'カラー比較画像', 23, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (24, 1, 'file2', '商品詳細ファイル    ', 24, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (25, 1, 'sub_title1', '詳細-サブタイトル(1)', 25, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (26, 1, 'sub_comment1', '詳細-サブコメント(1)', 26, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -392,6 +390,6 @@
 INSERT INTO dtb_product_categories (product_id, category_id, rank) VALUES (2, 4, 1);
 
-INSERT INTO dtb_products (product_id, name, maker_id, rank, status, comment1, comment2, comment3, comment4, comment5, comment6, note, file1, file2, file3, file4, file5, file6, main_list_comment, main_list_image, main_comment, main_image, main_large_image, sub_title1, sub_comment1, sub_image1, sub_large_image1, sub_title2, sub_comment2, sub_image2, sub_large_image2, sub_title3, sub_comment3, sub_image3, sub_large_image3, sub_title4, sub_comment4, sub_image4, sub_large_image4, sub_title5, sub_comment5, sub_image5, sub_large_image5, sub_title6, sub_comment6, sub_image6, sub_large_image6, del_flg, creator_id, create_date, update_date, deliv_date_id) VALUES (1, 'アイスクリーム', NULL, 1, 1, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか?', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2);
-INSERT INTO dtb_products (product_id, name, maker_id, rank, status, comment1, comment2, comment3, comment4, comment5, comment6, note, file1, file2, file3, file4, file5, file6, main_list_comment, main_list_image, main_comment, main_image, main_large_image, sub_title1, sub_comment1, sub_image1, sub_large_image1, sub_title2, sub_comment2, sub_image2, sub_large_image2, sub_title3, sub_comment3, sub_image3, sub_large_image3, sub_title4, sub_comment4, sub_image4, sub_large_image4, sub_title5, sub_comment5, sub_image5, sub_large_image5, sub_title6, sub_comment6, sub_image6, sub_large_image6, del_flg, creator_id, create_date, update_date, deliv_date_id) VALUES (2, 'おなべ', NULL, 1, 1, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 3);
+INSERT INTO dtb_products (product_id, name, maker_id, rank, status, comment1, comment2, comment3, comment4, comment5, comment6, note, main_list_comment, main_list_image, main_comment, main_image, main_large_image, sub_title1, sub_comment1, sub_image1, sub_large_image1, sub_title2, sub_comment2, sub_image2, sub_large_image2, sub_title3, sub_comment3, sub_image3, sub_large_image3, sub_title4, sub_comment4, sub_image4, sub_large_image4, sub_title5, sub_comment5, sub_image5, sub_large_image5, sub_title6, sub_comment6, sub_image6, sub_large_image6, del_flg, creator_id, create_date, update_date, deliv_date_id) VALUES (1, 'アイスクリーム', NULL, 1, 1, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか?', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2);
+INSERT INTO dtb_products (product_id, name, maker_id, rank, status, comment1, comment2, comment3, comment4, comment5, comment6, note, main_list_comment, main_list_image, main_comment, main_image, main_large_image, sub_title1, sub_comment1, sub_image1, sub_large_image1, sub_title2, sub_comment2, sub_image2, sub_large_image2, sub_title3, sub_comment3, sub_image3, sub_large_image3, sub_title4, sub_comment4, sub_image4, sub_large_image4, sub_title5, sub_comment5, sub_image5, sub_large_image5, sub_title6, sub_comment6, sub_image6, sub_large_image6, del_flg, creator_id, create_date, update_date, deliv_date_id) VALUES (2, 'おなべ', NULL, 1, 1, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 3);
 
 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(1, 1, 10, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL);
Index: /branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 18853)
+++ /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 18876)
@@ -158,10 +158,4 @@
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (157, 'dtb_products', 'comment5', 'コメント5');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (158, 'dtb_products', 'comment6', 'コメント6');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (159, 'dtb_products', 'file1', 'アップロードファイル1');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (160, 'dtb_products', 'file2', 'アップロードファイル2');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (161, 'dtb_products', 'file3', 'アップロードファイル3');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (162, 'dtb_products', 'file4', 'アップロードファイル4');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (163, 'dtb_products', 'file5', 'アップロードファイル5');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (164, 'dtb_products', 'file6', 'アップロードファイル6');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (165, 'dtb_products', 'main_list_comment', 'メイン一覧コメント');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (166, 'dtb_products', 'main_list_image', 'メイン一覧画像');
Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18858)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18876)
@@ -267,10 +267,4 @@
     comment6 text,
     note text,
-    file1 text,
-    file2 text,
-    file3 text,
-    file4 text,
-    file5 text,
-    file6 text,
     main_list_comment text,
     main_list_image text,
Index: /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18858)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18876)
@@ -267,10 +267,4 @@
     comment6 text,
     note text,
-    file1 text,
-    file2 text,
-    file3 text,
-    file4 text,
-    file5 text,
-    file6 text,
     main_list_comment text,
     main_list_image text,