Index: branches/5.2.x/units/products/products_config.php
===================================================================
diff -u -N -r14569 -r14582
--- branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14569)
+++ branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14582)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 14569 2011-09-20 10:30:56Z alex $
+* @version	$Id: products_config.php 14582 2011-09-23 14:42:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -492,12 +492,12 @@
 					    'Expire'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
 					    'Type'					=>	Array (
 					    	'type' => 'int',
-					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,							
+					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
 							'options' => Array (
 								PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
 								PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
 								PRODUCT_TYPE_SERVICE => 'la_product_service',
-								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable', 
+								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
 								/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
 							),
 							'not_null' => 1, 'default' => 1,
@@ -506,9 +506,9 @@
 					    'ModifiedById'			=>	Array ('type' => 'int', 'default' => NULL),
 					    'CreatedById' => Array (
 			            	'type' => 'int',
-			            	'formatter' => 'kLEFTFormatter', 
+			            	'formatter' => 'kLEFTFormatter',
 			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser 
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
 			            					WHERE `%s` = \'%s\'',
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Login',
@@ -640,21 +640,20 @@
 								'NEW' => 'icon16_product_new.png',
 							),
 							'Fields' => Array (
-								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'QtyInStock'	=>	Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'QtyBackOrdered'	=>	Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'OnSale'	=>	Array ('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),							/*
-								'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'Type'	=>	Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'Manufacturer'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Price'	=>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'QtyInStock'	=>	Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'QtyBackOrdered'	=>	Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'OnSale'	=>	Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								/*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
 								'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-								'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-							*/
+								'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/
 							),
 						),
 
@@ -668,16 +667,16 @@
 							),
 							'Selector' => 'radio',
 							'Fields' => Array (
-								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'QtyInStock'	=>	Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'QtyBackOrdered'	=>	Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'Type'	=>	Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'Manufacturer'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Price'	=>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'QtyInStock'	=>	Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'QtyBackOrdered'	=>	Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
 
 							),
 						),