Index: branches/5.2.x/units/reports/reports_event_handler.php
===================================================================
--- branches/5.2.x/units/reports/reports_event_handler.php	(revision 16695)
+++ branches/5.2.x/units/reports/reports_event_handler.php	(revision 16696)
@@ -1,848 +1,869 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ReportsEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			// user can view any form on front-end
 			'OnRunReport' => Array ('self' => 'view'),
 			'OnUpdateConfig' => Array ('self' => 'view'),
 			'OnChangeStatistics' => Array ('self' => 'view'),
 			'OnPieChart' => Array ('self' => 'view'),
 			'OnPrintChart' => Array ('self' => 'view'),
 			'OnExportReport' => Array ('self' => 'view'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	function OnRunReport(kEvent $event)
 	{
 		$this->Application->LinkVar('reports_finish_t');
 		$progress_t = $this->Application->GetVar('progress_t');
 		$event->redirect = $progress_t;
 
 		$field_values = $this->getSubmittedFields($event);
 
 		/** @var kDBItem $object */
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
 
 		$object->UpdateFormattersMasterFields();
 
 		$field_values['offset'] = 0;
+		$field_values['export_ignore'] = '';
 		$table_name = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_SaleReport';
 		$field_values['table_name'] = $table_name;
 		$this->Conn->Query('DROP TABLE IF EXISTS '.$table_name);
 
 		$filter_value = '';
 		$from = $object->GetDBField('FromDateTime');
 		$to = $object->GetDBField('ToDateTime');
 
 		$day_seconds = 23 * 60 * 60 + 59 * 60 + 59;
 		if ($from && !$to) {
 			$to = $from + $day_seconds;
 		}
 		elseif (!$from && $to) {
 			$from = $to - $day_seconds;
 		}
 
 		if ($from && $to) {
 			$filter_value = 'AND o.OrderDate >= '.$from.' AND o.OrderDate <= '.$to;
 		}
 
 		$ebay_table_fields = '';
 		$ebay_joins = '';
 		$ebay_query_fields = '';
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$sql = 'DELETE FROM '.TABLE_PREFIX.'UserPersistentSessionData
 			WHERE
 				PortalUserId = "'.$user_id.'"
 				AND VariableName LIKE \'rep_columns_%\'';
 		$this->Conn->Query($sql);
 
 		if ($this->Application->isModuleEnabled('in-auction'))
 		{
 			if (in_array($field_values['ReportType'], Array(1,5)))  // not overall.
 			{
 				$ebay_table_fields = ',
 					StoreQty int(11) NOT NULL DEFAULT 0,
 					eBayQty int(11) NOT NULL DEFAULT 0,
 					StoreAmount double(10,4) NOT NULL DEFAULT 0,
 					eBayAmount double(10,4) NOT NULL DEFAULT 0,
 					StoreProfit double(10,4) NOT NULL DEFAULT 0,
 					eBayProfit double(10,4) NOT NULL DEFAULT 0';
 
 				$ebay_joins = '
 					LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
 					ON od.OptionsSalt = eod.OptionsSalt
 				';
 
 				$ebay_query_fields = ',
 					SUM(IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)) as StoreQty,
 					SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)) as eBayQty,
 					SUM(IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)) as StoreAmount,
 					SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)) as eBayAmount,
 					SUM(IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)) as StoreProfit,
 					SUM(IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)) as eBayProfit
 				';
 			}
 
 		}
 
 		if ($field_values['ReportType'] == 1) { // by Category
+			$field_values['id_field'] = $field_values['export_ignore'] = 'CategoryId';
+			$field_values['grid'] = 'ByCategory';
 			$q = 'CREATE TABLE '.$table_name.' (
 							CategoryId int(11) NOT NULL DEFAULT 0,
 							Qty int(11) NOT NULL DEFAULT 0,
 							Cost double(10,4) NOT NULL DEFAULT 0,
 							Amount double(10,4) NOT NULL DEFAULT 0,
 							Tax double(10,4) NOT NULL DEFAULT 0,
 							Shipping double(10,4) NOT NULL DEFAULT 0,
 							Processing double(10,4) NOT NULL DEFAULT 0,
 							Profit double(10,4) NOT NULL DEFAULT 0
 							'.$ebay_table_fields.'
 						)';
 			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
 			$this->Conn->Query($q);
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
 						SELECT
 							c.CategoryId,
 							SUM(od.Quantity) as Qty,
 							SUM(od.Cost * od.Quantity) as Cost,
 							SUM(od.Price * od.Quantity) as SaleAmount,
 							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
 							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
 							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
 							SUM((od.Price - od.Cost) * od.Quantity) as Profit'
 							.$ebay_query_fields.'
 						FROM '.TABLE_PREFIX.'Orders AS o
 						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 						ON od.OrderId = o.OrderId
 						LEFT JOIN '.TABLE_PREFIX.'Products AS p
 						ON p.ProductId = od.ProductId
 						LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
 						ON ci.ItemResourceId = p.ResourceId
 						LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 						ON c.CategoryId = ci.CategoryId
 						'.$ebay_joins.'
 						WHERE
 							o.Status IN (4,6)
 							AND
 							ci.PrimaryCat = 1
 							'.$filter_value.'
 						GROUP BY c.CategoryId
 						HAVING NOT ISNULL(CategoryId)
 						';
 			$this->Conn->Query($q);
 		}
 		elseif ($field_values['ReportType'] == 2) { // by User
+			$field_values['id_field'] = $field_values['export_ignore'] = 'PortalUserId';
+			$field_values['grid'] = 'ByUser';
 			$q = 'CREATE TABLE '.$table_name.' (
 							PortalUserId int(11) NOT NULL DEFAULT 0,
 							Qty int(11) NOT NULL DEFAULT 0,
 							Cost double(10,4) NOT NULL DEFAULT 0,
 							Amount double(10,4) NOT NULL DEFAULT 0,
 							Tax double(10,4) NOT NULL DEFAULT 0,
 							Shipping double(10,4) NOT NULL DEFAULT 0,
 							Processing double(10,4) NOT NULL DEFAULT 0,
 							Profit double(10,4) NOT NULL DEFAULT 0
 						)';
 			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
 			$this->Conn->Query($q);
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
 						SELECT
 							u.PortalUserId,
 							SUM(od.Quantity) as Qty,
 							SUM(od.Cost * od.Quantity) as Cost,
 							SUM(od.Price * od.Quantity) as SaleAmount,
 							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
 							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
 							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
 							SUM((od.Price - od.Cost) * od.Quantity) as Profit
 						FROM '.TABLE_PREFIX.'Orders AS o
 						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 						ON od.OrderId = o.OrderId
 						LEFT JOIN '.TABLE_PREFIX.'Users AS u
 						ON u.PortalUserId = o.PortalUserId
 						WHERE
 							o.Status IN (4,6)
 							'.$filter_value.'
 						GROUP BY u.PortalUserId
 						HAVING NOT ISNULL(PortalUserId)
 						';
 			$this->Conn->Query($q);
 		}
 		elseif ($field_values['ReportType'] == 5) { // by Product
+			$field_values['id_field'] = $field_values['export_ignore'] = 'ProductId';
+			$field_values['grid'] = 'ByProduct';
 			$q = 'CREATE TABLE '.$table_name.' (
 							ProductId int(11) NOT NULL DEFAULT 0,
 							Qty int(11) NOT NULL DEFAULT 0,
 							Cost double(10,4) NOT NULL DEFAULT 0,
 							Amount double(10,4) NOT NULL DEFAULT 0,
 							Tax double(10,4) NOT NULL DEFAULT 0,
 							Shipping double(10,4) NOT NULL DEFAULT 0,
 							Processing double(10,4) NOT NULL DEFAULT 0,
 							Profit double(10,4) NOT NULL DEFAULT 0'
 							.$ebay_table_fields.'
 						)';
 			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Products');
 			$this->Conn->Query($q);
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
 						SELECT
 							p.ProductId,
 							SUM(od.Quantity) as Qty,
 							SUM(od.Cost * od.Quantity) as Cost,
 							SUM(od.Price * od.Quantity) as SaleAmount,
 							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
 							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
 							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
 							SUM((od.Price - od.Cost)  * od.Quantity) as Profit'
 							.$ebay_query_fields.'
 						FROM '.TABLE_PREFIX.'Orders AS o
 						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 						ON od.OrderId = o.OrderId
 						LEFT JOIN '.TABLE_PREFIX.'Products AS p
 						ON p.ProductId = od.ProductId
 						'.$ebay_joins.'
 						WHERE
 							o.Status IN (4,6)
 							'.$filter_value.'
 						GROUP BY p.ProductId
 						HAVING NOT ISNULL(ProductId)
 						';
 			$this->Conn->Query($q);
 		}
 		elseif ($field_values['ReportType'] == 12) { // Overall
+			$field_values['id_field'] = 'Marketplace';
+			$field_values['grid'] = 'Overall';
 			$q = 'CREATE TABLE '.$table_name.' (
 							Marketplace tinyint(1) NOT NULL DEFAULT 0,
 							Qty int(11) NOT NULL DEFAULT 0,
 							Cost double(10,4) NOT NULL DEFAULT 0,
 							Amount double(10,4) NOT NULL DEFAULT 0,
 							Tax double(10,4) NOT NULL DEFAULT 0,
 							Shipping double(10,4) NOT NULL DEFAULT 0,
 							Processing double(10,4) NOT NULL DEFAULT 0,
 							Profit double(10,4) NOT NULL DEFAULT 0
 						)';
 			$this->Conn->Query($q);
 
 			if ($this->Application->isModuleEnabled('in-auction'))
 			{
 				$field_values['total'] = 2;
 
 				$q = 'INSERT INTO '.$field_values['table_name'].'
 							SELECT
 								1 AS Marketplace,
 								SUM(IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)) as Qty,
 								SUM(IF(ISNULL(eod.OptionsSalt), od.Cost * od.Quantity, 0)) as Cost,
 								SUM(IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)) as SaleAmount,
 								SUM(IF(ISNULL(eod.OptionsSalt), o.VAT * od.Price * od.Quantity / o.SubTotal, 0)) as Tax,
 								SUM(IF(ISNULL(eod.OptionsSalt), o.ShippingCost * od.Price * od.Quantity / o.SubTotal, 0)) as Shipping,
 								SUM(IF(ISNULL(eod.OptionsSalt), o.ProcessingFee * od.Price * od.Quantity / o.SubTotal, 0)) as Processing,
 								SUM(IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost)  * od.Quantity, 0)) as Profit
 							FROM '.TABLE_PREFIX.'Orders AS o
 							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 							ON od.OrderId = o.OrderId
 							LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
 							ON od.OptionsSalt = eod.OptionsSalt
 							WHERE
 								o.Status IN (4,6)
 								'.$filter_value;
 				$this->Conn->Query($q);
 
 
 				$q = 'INSERT INTO '.$field_values['table_name'].'
 							SELECT
 								2 AS Marketplace,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)) as Qty,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Cost * od.Quantity)) as Cost,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)) as SaleAmount,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.VAT * od.Price * od.Quantity / o.SubTotal)) as Tax,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.ShippingCost * od.Price * od.Quantity / o.SubTotal)) as Shipping,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.ProcessingFee * od.Price * od.Quantity / o.SubTotal)) as Processing,
 								SUM(IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost)  * od.Quantity)) as Profit
 							FROM '.TABLE_PREFIX.'Orders AS o
 							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 							ON od.OrderId = o.OrderId
 							LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
 							ON od.OptionsSalt = eod.OptionsSalt
 							WHERE
 								o.Status IN (4,6)
 								'.$filter_value;
 				$this->Conn->Query($q);
 			} else {
 				$field_values['total'] = 1;
 				$q = 'INSERT INTO '.$field_values['table_name'].'
 							SELECT
 								1 AS Marketplace,
 								SUM(od.Quantity) as Qty,
 								SUM(od.Cost * od.Quantity) as Cost,
 								SUM(od.Price * od.Quantity) as SaleAmount,
 								SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
 								SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
 								SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
 								SUM((od.Price - od.Cost)  * od.Quantity) as Profit
 							FROM '.TABLE_PREFIX.'Orders AS o
 							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 							ON od.OrderId = o.OrderId
 							WHERE
 								o.Status IN (4,6)
 								'.$filter_value;
 				$this->Conn->Query($q);
 
 			}
 		}
 
-		$vars = array('rep_Page', 'rep_Sort1', 'rep_Sort1_Dir', 'rep_Sort2', 'rep_Sort2_Dir');
-		foreach ($vars as $var_name) {
-			$this->Application->RemoveVar($var_name);
-		}
+		$event->CallSubEvent('OnResetSorting');
 
 		//temporary
 		$event->redirect = $this->Application->GetVar('reports_finish_t');
 
 		$field_values['from'] = $from;
 		$field_values['to'] = $to;
 
 		$this->Application->StoreVar('report_options', serialize($field_values));
 	}
 
 	function OnUpdateConfig($event)
 	{
 		$report = $this->Application->RecallVar('report_options');
 		if (!$report) {
 			return ;
 		}
 
 		$field_values = unserialize($report);
+		$grid = $field_values['grid'];
 
 		$rep_options = $this->Application->getUnitOptions('rep');
 		$new_options = Array ();
 
 		$new_options['TableName'] = $field_values['table_name'];
 
 		$new_options['Fields'] = Array (
 			'Qty' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
 			'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 			'Amount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 			'Tax' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 			'Shipping' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 			'Processing' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 			'Profit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 		);
 
 		if ( $this->Application->isModuleEnabled('in-auction') ) {
 			if ( in_Array ($field_values['ReportType'], Array (1, 5)) ) {
 				$new_options['Fields'] += Array (
 					'StoreQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
 					'StoreAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 					'StoreProfit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 					'eBayQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
 					'eBayAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 					'eBayProfit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
 				);
 			}
 		}
 
 		if ($field_values['ReportType'] == 1) { // by Category
 
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s
 				 LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 				 ON c.CategoryId = %1$s.CategoryId';
-			$new_options['Grids']['Default'] = Array (
+			$new_options['Fields']['CategoryId'] = Array ('type' => 'int', 'default' => null);
+			$new_options['Grids'][$grid] = Array (
 				'Icons' => Array (
 					'default' => 'icon16_item.png',
 					'module' => 'core',
 				),
 				'Fields' => Array (
+					'CategoryId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'hidden' => 1),
 					'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'),
 					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 				),
 
 			);
 
 			if (!$this->Application->isModuleEnabled('in-auction')) {
-				$a_fields =& $new_options['Grids']['Default']['Fields'];
+				$a_fields =& $new_options['Grids'][$grid]['Fields'];
 				unset($a_fields['StoreQty']);
 				unset($a_fields['eBayQty']);
 				unset($a_fields['StoreAmount']);
 				unset($a_fields['eBayAmount']);
 				unset($a_fields['StoreProfit']);
 				unset($a_fields['eBayProfit']);
 			}
 
 			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
 				'CategoryName' => Array ('type' => 'string', 'default' => ''),
 	            'Metric' => Array (
 	            	'type' => 'int',
 	            	'formatter' => 'kOptionsFormatter',
-	            	'options' => $this->GetMetricOptions($new_options, 'CategoryName'),
+	            	'options' => $this->GetMetricOptions($new_options, array('CategoryId', 'CategoryName'), $grid),
 	            	'use_phrases' => 1,
 	            	'default' => 0,
 	            ),
 			));
 
 			$lang = $this->Application->GetVar('m_lang');
 
 			// products root category
 			$products_category_id = $this->Application->findModule('Name', 'In-Commerce', 'RootCat');
 			// get root category name
 			$sql = 'SELECT LENGTH(l' . $lang . '_CachedNavbar)
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = '.$products_category_id;
 			$root_length = $this->Conn->GetOne($sql) + 4;
 
 			$new_options['CalculatedFields'][''] = array(
 				'CategoryName' => 'REPLACE(SUBSTR(c.l'.$lang.'_CachedNavbar, '.$root_length.'), "&|&", " > ")',
 			);
 		}
 		elseif ($field_values['ReportType'] == 2) { // by User
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s
 				 LEFT JOIN '.TABLE_PREFIX.'Users AS u
 				 ON u.PortalUserId = %1$s.PortalUserId';
-
-			$new_options['Grids']['Default'] = Array (
+			$new_options['Fields']['PortalUserId'] = Array ('type' => 'int', 'default' => null);
+			$new_options['Grids'][$grid] = Array (
 				'Icons' => Array (
 								'default' => 'icon16_item.png',
 								'module' => 'core',
 							),
 				'Fields' => Array (
+					'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'hidden' => 1),
 					'Login' => Array ('filter_block' => 'grid_like_filter'),
 					'FirstName' => Array ('filter_block' => 'grid_like_filter'),
 					'LastName' => Array ('filter_block' => 'grid_like_filter'),
 					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 				),
 			);
 
 			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
 				'Login' => Array ('type' => 'string', 'default' => ''),
 				'FirstName' => Array ('type' => 'string', 'default' => ''),
 				'LastName' => Array ('type' => 'string', 'default' => ''),
 			));
 
 			$new_options['CalculatedFields'][''] = Array (
 				'Login' => 'u.Username',
 				'FirstName' => 'u.FirstName',
 				'LastName' => 'u.LastName',
 			);
 		}
 		elseif ($field_values['ReportType'] == 5) { // by Product
 
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s
 				 LEFT JOIN '.TABLE_PREFIX.'Products AS p
 				 ON p.ProductId = %1$s.ProductId';
-
-			$new_options['Grids']['Default'] = Array (
+			$new_options['Fields']['ProductId'] = Array ('type' => 'int', 'default' => null);
+			$new_options['Grids'][$grid] = Array (
 				'Icons' => Array (
 					'default' => 'icon16_item.png',
 					'module' => 'core',
 					),
 				'Fields' => Array (
+					'ProductId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'hidden' => 1),
 					'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'),
 					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
 					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 				),
 
 			);
 
 			if (!$this->Application->isModuleEnabled('in-auction'))
 			{
-				$a_fields =& $new_options['Grids']['Default']['Fields'];
+				$a_fields =& $new_options['Grids'][$grid]['Fields'];
 				unset($a_fields['StoreQty']);
 				unset($a_fields['eBayQty']);
 				unset($a_fields['StoreAmount']);
 				unset($a_fields['eBayAmount']);
 				unset($a_fields['StoreProfit']);
 				unset($a_fields['eBayProfit']);
 			}
 
 
 			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
 				'ProductName' => Array ('type' => 'string', 'default' => ''),
 	            'Metric' => Array (
 	            	'type' => 'int',
 	            	'formatter' => 'kOptionsFormatter',
-	            	'options' => $this->GetMetricOptions($new_options, 'ProductName'),
+	            	'options' => $this->GetMetricOptions($new_options, array('ProductId', 'ProductName'), $grid),
 	            	'use_phrases' => 1,
 	            	'default' => 0
 	            ),
 			));
 
 			$lang = $this->Application->GetVar('m_lang');
 
 			$new_options['CalculatedFields'][''] = Array (
 				'ProductName' => 'p.l'.$lang.'_Name',
 			);
 		}
 		elseif ($field_values['ReportType'] == 12) { // Overall
 
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s';
 
 			$new_options['Fields']['Marketplace'] = Array (
+				'type' => 'int',
 				'formatter' => 'kOptionsFormatter',
 				'options' => Array (
 					1 => 'la_OnlineStore',
 					2 => 'la_eBayMarketplace',
 				),
 				'use_phrases' => 1,
 				'default' => 1
 			);
 
-			$new_options['Grids']['Default'] = Array(
+			$new_options['Grids'][$grid] = Array(
 				'Icons' => Array(
 					'default' => 'icon16_item.png',
 					'module' => 'core',
 				),
 				'Fields' => Array(
 					'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'),
 					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 				),
 
 			);
 
 
 			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], array(
 	            'Metric' => Array (
 	            	'type' => 'int',
 	            	'formatter' => 'kOptionsFormatter',
-	            	'options' => $this->GetMetricOptions($new_options, 'Marketplace'),
+	            	'options' => $this->GetMetricOptions($new_options, array('Marketplace'), $grid),
 	            	'use_phrases' => 1,
 	            	'default' => 0
 	            ),
 			));
 
 			$lang = $this->Application->GetVar('m_lang');
 
 		}
 
 		$new_options['ListSortings'] = Array(
 			'' => Array(
 				'Sorting' => Array('Amount' => 'desc'),
 			)
 		);
 
 		foreach ($new_options as $key => $val) {
 			$this->Application->setUnitOption('rep', $key, $val);
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kdbItem $object
 	 * @param string $search_field
 	 * @param string $value
 	 * @param string $type
 	 */
 	function processRangeField(&$object, $search_field, $type)
 	{
 		$value = $object->GetField($search_field);
 		if (!$value) return false;
 
 		$lang_current = $this->Application->recallObject('lang.current');
 		$dt_separator = getArrayValue($object->GetFieldOptions($search_field), 'date_time_separator');
 		if (!$dt_separator) {
 			$dt_separator = ' ';
 		}
 
 		$time = ($type == 'from') ? adodb_mktime(0, 0, 0) : adodb_mktime(23, 59, 59);
 		$time = adodb_date($lang_current->GetDBField('InputTimeFormat'), $time);
 
 		$full_value = $value.$dt_separator.$time;
 
 		$formatter = $this->Application->recallObject( $object->GetFieldOption($search_field, 'formatter') );
 
 		$value_ts = $formatter->Parse($full_value, $search_field, $object);
 
 		if ( $object->GetErrorPseudo($search_field) ) {
 			// invalid format -> ignore this date in search
 			$object->RemoveError($search_field);
 
 			return false;
 		}
 		return $value_ts;
 	}
 
 	/**
 	 * Generate Metric Field Options
 	 *
-	 * @param array $a_config_options
-	 * @param string $exclude_field
+	 * @param array  $a_config_options Config options.
+	 * @param array  $exclude_fields   Exclude fields.
+	 * @param string $grid             Grid.
+	 *
+	 * @return array
 	 */
-	function GetMetricOptions(&$a_config_options, $exclude_field)
+	function GetMetricOptions(&$a_config_options, array $exclude_fields, $grid)
 	{
-		$a_ret = Array();
-		foreach ($a_config_options['Grids']['Default']['Fields'] AS $field => $a_options)
-		{
-			if ($field == $exclude_field)
-			{
+		$a_ret = array();
+
+		foreach ( $a_config_options['Grids'][$grid]['Fields'] as $field => $a_options ) {
+			if ( in_array($field, $exclude_fields) ) {
 				continue;
 			}
-			$a_ret[$field] = $a_options['title'];
+
+			$a_ret[$field] = isset($a_options['title']) ? $a_options['title'] : 'column:la_fld_' . $field;
 		}
+
 		return $a_ret;
 	}
 
 	function OnChangeStatistics($event)
 	{
 		$this->Application->StoreVar('ChartMetric', $this->Application->GetVar('metric'));
 	}
 
 	function OnPieChart($event)
 	{
 
 		$ChartHelper = $this->Application->recallObject('ChartHelper');
 
 		$this->Application->setContentType('image/png');
 
 		$width = $event->getEventParam('width');
 		if (!$width) {
 			$width = 800;
 		}
 
 		$height = $event->getEventParam('height');
 		if (!$height) {
 			$height = 600;
 		}
 
 		$a_data = unserialize($this->Application->RecallVar('graph_data'));
 		$chart = new LibchartPieChart($width, $height);
 
 		$dataSet = new LibchartXYDataSet();
 		foreach ($a_data AS $key=>$a_values)
 		{
 			$dataSet->addPoint(new LibchartPoint($a_values['Name'], $a_values['Metric']));
 //			$dataSet->addPoint(new LibchartPoint($a_values['Name'].' ('.$a_values['Metric'].')', $a_values['Metric']));
 		}
 
 		$chart->setDataSet($dataSet);
 
 		$chart->setTitle($this->Application->RecallVar('graph_metric'));
 		$chart->render();
 		$event->status = kEvent::erSTOP;
 	}
 
 	/** Generates png-chart output
 	 *
 	 * @param kEvent $event
 	 */
 
 	function OnPrintChart($event)
 	{
 		$ChartHelper = $this->Application->recallObject('ChartHelper');
 
 		$this->Application->setContentType('image/png');
 
 		$width = $this->Application->GetVar('width');
 		if ($width == 0)
 		{
 			$width = 800;
 		}
 
 		$height = $this->Application->GetVar('height');
 		if ($height == 0)
 		{
 			$height = 400;
 		}
 
 		$chart = new LibchartLineChart($width, $height);
 
 		$a_labels = unserialize($this->Application->RecallVar('graph_labels'));
 
 		if ($this->Application->isModuleEnabled('in-auction'))
 		{
 			$serie1 = new LibchartXYDataSet();
 			$a_serie = unserialize($this->Application->RecallVar('graph_serie1'));
 			foreach ($a_labels AS $key=>$value)
 			{
 				$serie1->addPoint(new LibchartPoint($value, $a_serie[$key]));
 			}
 		}
 
 		$serie2 = new LibchartXYDataSet();
 		$a_serie = unserialize($this->Application->RecallVar('graph_serie2'));
 		foreach ($a_labels AS $key=>$value)
 		{
 			$serie2->addPoint(new LibchartPoint($value, $a_serie[$key]));
 		}
 
 		$dataSet = new LibchartXYSeriesDataSet();
 		if ($this->Application->isModuleEnabled('in-auction'))
 		{
 			$dataSet->addSerie($this->Application->RecallVar('graph_serie1_label'), $serie1);
 		}
 
 		$dataSet->addSerie($this->Application->RecallVar('graph_serie2_label'), $serie2);
 
 		$chart->setDataSet($dataSet);
 
 		$chart->setTitle($this->Application->RecallVar('graph_metric'));
 		$Plot =& $chart->getPlot();
 		$Plot->setGraphCaptionRatio(0.7);
 		$chart->render();
 
 		$event->status = kEvent::erSTOP;
 
 	}
 
 	function OnExportReport($event)
 	{
 		/** @var kDBList $report */
 		$report = $this->Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) );
 
 		/** @var kDBItem $ReportItem */
 		$ReportItem = $this->Application->recallObject('rep.item', 'rep', Array('skip_autoload' => true));
 
- 		$a_grids = $this->Application->getUnitOption('rep', 'Grids');
- 		$a_fields = $a_grids['Default']['Fields'];
+		$report_options = unserialize($this->Application->RecallVar('report_options'));
+
+		$a_grids = $this->Application->getUnitOption('rep', 'Grids');
+		$a_fields = $a_grids[$report_options['grid']]['Fields'];
+
+		if ( $report_options['export_ignore'] ) {
+			unset($a_fields[$report_options['export_ignore']]);
+		}
+
 		$ret = '';
 
 		foreach ($a_fields AS $field => $a_props)
 		{
 			$ret .= '<commas>'.$field.'<commas><tab>';
 		}
 
 		$ret = substr($ret, 0, strlen($ret) - 5).'<cr>';
 
 
 		$report->Query(true);
 		$report->GoFirst();
 
 		$counter = 0;
 		$a_totals = Array();
 
 		foreach ($a_fields AS $field => $a_props) {
 			$counter++;
 			if ($counter == 1)
 			{
 				continue;
 			}
 			$a_totals[$field] = 0;
 		}
 
 		foreach($report->Records as $a_row) {
 			// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
 			$ReportItem->SetFieldsFromHash($a_row);
 			$row = '';
 			foreach ($a_fields AS $field => $a_props)
 			{
 				$row .= '<commas>'.$ReportItem->GetField($field).'<commas><tab>';
 				$a_totals[$field] += $a_row[$field];
 			}
 			$ret .= substr($row, 0, strlen($row) - 5).'<cr>';
 		}
 
 		// totals
 		// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
 		$ReportItem->SetFieldsFromHash($a_totals);
 		$counter = 0;
 		foreach ($a_fields AS $field => $a_props)
 		{
 			$counter++;
 			if ($counter == 1)
 			{
 				$row = '<commas><commas><tab>';
 				continue;
 			}
 			$row .= '<commas>'.$ReportItem->GetField($field).'<commas><tab>';
 		}
 		$ret .= substr($row, 0, strlen($row) - 5).'<cr>';
 
 		$ret = str_replace("\r",'', $ret);
 		$ret = str_replace("\n",'', $ret);
 		$ret = str_replace('"','\'\'', $ret);
 
 		$ret = str_replace('<commas>','"', $ret);
 		$ret = str_replace('<tab>',',', $ret);
 		$ret = str_replace('<cr>',"\r", $ret);
 
-		$report_options = unserialize($this->Application->RecallVar('report_options'));
-
 		switch ($report_options['ReportType'])
 		{
 			case 1:
 				$file_name = '-ByCategory';
 				break;
 			case 2:
 				$file_name = '-ByUser';
 				break;
 			case 5:
 				$file_name = '-ByProduct';
 				break;
 			case 12:
 				$file_name = '';
 				break;
 		}
 
 		header("Content-type: application/txt");
 		header("Content-length: ".(string)strlen($ret));
 		header("Content-Disposition: attachment; filename=\"".html_entity_decode('SalesReport'.$file_name.'-'.date('d-M-Y').'.csv')."\"");
 		header("Pragma: no-cache"); //some IE-fixing stuff
 		echo $ret;
 		exit();
 	}
 }
Index: branches/5.2.x/units/reports/reports_config.php
===================================================================
--- branches/5.2.x/units/reports/reports_config.php	(revision 16695)
+++ branches/5.2.x/units/reports/reports_config.php	(revision 16696)
@@ -1,132 +1,132 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 $config = Array (
 	'Prefix' => 'rep',
 	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 	'EventHandlerClass' => Array ('class' => 'ReportsEventHandler', 'file' => 'reports_event_handler.php', 'build_event' => 'OnBuild'),
 	'TagProcessorClass' => Array ('class' => 'ReportsTagProcessor', 'file' => 'reports_tag_processor.php', 'build_event' => 'OnBuild'),
 	'AutoLoad' => true,
 
 	'QueryString' => Array (
 		1 => 'id',
 		2 => 'Page',
 		3 => 'PerPage',
 		4 => 'event',
 		5 => 'mode',
 	),
 
 	'Hooks' => Array (
 		Array (
 			'Mode' => hBEFORE,
 			'Conditional' => false,
 			'HookToPrefix' => 'rep',
 			'HookToSpecial' => '*',
 			'HookToEvent' => Array ('OnAfterConfigRead'),
 			'DoPrefix' => '',
 			'DoSpecial' => '',
 			'DoEvent' => 'OnUpdateConfig',
 		),
 	),
 
-	'IDField' => 'CategoryId',
+	'IDField' => '__DYNAMIC__',
 
 	'TitlePresets' => Array (
 		'default' => Array (
 			'new_status_labels' => Array ('d' => '!la_title_Adding_Discount!'),
 			'edit_status_labels' => Array ('d' => '!la_title_Editing_Discount!'),
 			'new_titlefield' => Array ('d' => '!la_title_New_Discount!'),
 		),
 
 		'report_options' =>Array ('format' => "!la_title_ReportOptions!"),
 		'report_results' =>Array ('format' => "!la_title_ReportResults!"),
 		'report_chart' =>Array ('format' => "!la_title_SalesReportChart!"),
 	),
 
 	'PermSection' => Array ('main' => 'in-commerce:reports'),
 
 	'Sections' => Array (
 		'in-commerce:reports' => Array (
 			'parent' => 'in-commerce',
 			'icon' => 'in-commerce:sales_report',
 			'label' => 'la_tab_SaleReports',
 			'url' => Array ('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event' => 'OnNew'),
 			'permissions' => Array ('view', 'add'),
 			'priority' => 2,
 			'type' => stTREE,
 		),
 	),
 
 	'ListSQLs' => Array (
 		'' => '	SELECT %1$s.* %2$s
 				FROM %1$s',
 	),
 
 	'ListSortings' => Array (
 		'' => Array (
 			'Sorting' => Array ('Name' => 'asc'),
 		)
 	),
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'CategoryId' => '0',
 		),
 	),
 
+	'Fields' => array(),
+
 	'VirtualFields' => Array (
 		'ReportType' => array('formatter' => 'kOptionsFormatter', 'options' =>array(
 				12 => 'la_Overall',
 				1 => 'la_ByCategory',
 				2 => 'la_ByUser',
 				5 => 'la_byProduct'
 			),
 			'use_phrases' => 1, 'default' => 12,
 		),
 		'FromDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
 		'ToDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
 		'Recursive' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter',
 			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 		),
 		'SkipEmpty' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter',
 			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 		),
-		'CategoryId' => Array ('type' => 'int', 'default' => 0),
 	),
 
 	'Grids' => Array (
 		'Default' => Array (
 			'Icons' => Array (
 				'default' => 'icon16_item.png',
 				'module' => 'core',
 			),
 			'Fields' => Array (
 				'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
 				'Start' => Array ('filter_block' => 'grid_date_range_filter'),
 				'End' => Array ('filter_block' => 'grid_date_range_filter'),
 				'GroupId' => Array ( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'),
 				'Type' => Array ('filter_block' => 'grid_options_filter'),
 				'Amount' => Array ('filter_block' => 'grid_range_filter'),
 			),
 		),
 	),
 );
Index: branches/5.2.x/units/reports/reports_tag_processor.php
===================================================================
--- branches/5.2.x/units/reports/reports_tag_processor.php	(revision 16695)
+++ branches/5.2.x/units/reports/reports_tag_processor.php	(revision 16696)
@@ -1,438 +1,467 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ReportsTagProcessor extends kDBTagProcessor {
 
 	function ReportStatus($params)
 	{
 		$field_values = $this->CalcReport($params);
 
 		if ($field_values['offset'] == $field_values['total']) {
 			$this->Application->Redirect($this->Application->RecallVar('reports_finish_t'));
 			$this->Application->RemoveVar('report_options');
 		}
 		else {
 			$this->Application->StoreVar('report_options', serialize($field_values));
 		}
 
 		return $field_values['offset']  * 100 / $field_values['total'];
 	}
 
 	function CalcReport($params)
 	{
 		$field_values = unserialize($this->Application->RecallVar('report_options'));
 		$per_step = 20;
 
 		$cats = $this->Conn->Query('SELECT * FROM '.TABLE_PREFIX.'Categories ORDER BY CategoryId LIMIT '.$field_values['offset'].', '.$per_step);
 
 		foreach ($cats as $a_cat) {
 			if ($field_values['Recursive']) {
 				$cat_filter = 'c.ParentPath LIKE '.$this->Conn->qstr($a_cat['ParentPath'].'%');
 			}
 			else {
 				$cat_filter = 'c.CategoryId = '.$a_cat['CategoryId'];
 			}
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
 						SELECT
 							c.CategoryId,
 							SUM(od.Quantity) as Qty,
 							SUM(od.Cost) as Cost,
 							SUM(od.Price) as SaleAmount,
 							0 as Tax,
 							0 as Shipping,
 							0 as Processing,
 							SUM(od.Price - od.Cost) as Profit
 						FROM '.TABLE_PREFIX.'Orders AS o
 						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 						ON od.OrderId = o.OrderId
 						LEFT JOIN '.TABLE_PREFIX.'Products AS p
 						ON p.ProductId = od.ProductId
 						LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
 						ON ci.ItemResourceId = p.ResourceId
 						LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 						ON c.CategoryId = ci.CategoryId
 						WHERE
 							o.Status = 4
 							AND
 							ci.PrimaryCat = 1
 							AND
 							'.$cat_filter.'
 						GROUP BY c.CategoryId';
 			$this->Conn->Query($q);
 
 			$field_values['offset']++;
 		}
 
 		return $field_values;
 	}
 
 	function ReportTypeEquals($params)
 	{
 		$field_values = unserialize($this->Application->RecallVar('report_options'));
 		return ($field_values['ReportType'] == $params['value']);
 	}
 
+	/**
+	 * Returns report option value.
+	 *
+	 * @param array $params Tag params.
+	 *
+	 * @return string
+	 */
+	protected function ReportOptionValue(array $params)
+	{
+		$field_values = unserialize($this->Application->RecallVar('report_options'));
+
+		return $field_values[$params['name']];
+	}
+
+	/**
+	 * Replaces "IDField" unit config option to be inline with current report
+	 *
+	 * @param array $params Tag params.
+	 *
+	 * @return string
+	 */
+	protected function SyncIDFieldDeclaration(array $params)
+	{
+		$field_values = unserialize($this->Application->RecallVar('report_options'));
+		$this->Application->setUnitOption($this->Prefix, 'IDField', $field_values['id_field']);
+
+		return '';
+	}
+
 	function CalculateChart($params)
 	{
 
 		$a_report_options = unserialize($this->Application->RecallVar('report_options'));
 		$metric = $this->Application->RecallVar('ChartMetric');
 		if ($metric == '')
 		{
 			// get first option from unit config
 			$a_virtual_fields = $this->Application->getUnitOption('rep', 'VirtualFields');
 			foreach ($a_virtual_fields['Metric']['options'] AS $field => $label)
 			{
 				$metric = $field;
 				break;
 			}
 		}
 
 
 		/** @var kDBItem $object */
 		$object = $this->Application->recallObject('rep.params', null, Array('skip_autoload' => true));
 
 		$object->setID(1);
 		$object->SetDBField('Metric', $metric);
 
 		if (!($a_report_options['from'] && $a_report_options['to'])) {
 			// calculate from & to as extreme order dates
 			$sql = 'SELECT MAX(OrderDate) AS date_to, MIN(OrderDate) AS date_frm
 				FROM '.TABLE_PREFIX.'Orders
 				WHERE
 					Status IN (4,6)
 			';
 			$a_dates = $this->Conn->GetRow($sql);
 			$a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_frm']), date('d', $a_dates['date_frm']), date('Y', $a_dates['date_frm']));
 			$a_report_options['to'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_to']), date('d', $a_dates['date_to']) + 1, date('Y', $a_dates['date_to'])) - 1;
 		}
 
 		$filter_value = 'AND o.OrderDate >= '.$a_report_options['from'].' AND o.OrderDate <= '.$a_report_options['to'];
 
 
 		if ($a_report_options['ReportType'] == 12)
 		{
 			// Overall
 
 			$selected_days = round(($a_report_options['to'] - $a_report_options['from'] + 1) / 3600 / 24);
 			// determine date interval
 			if ($selected_days < 2)
 			{
 				$step_seconds = 3600;
 				$step_labels = Array();
 				for ($i=0; $i<24; $i++)
 				{
 					$hour = str_pad($i, 2, '0', STR_PAD_LEFT);
 					$step_labels[$i] = $hour;
 				}
 			} elseif (
 				($selected_days < 31)
 				|| (date('mY', $a_report_options['from']) == date('mY', $a_report_options['to']))
 			)
 			{
 				$step_seconds = 24*3600;
 				$step_labels = Array();
 				$curr_date = $a_report_options['from'];
 				while ($curr_date <= $a_report_options['to'])
 				{
 					$curr_date += $step_seconds;
 					$step_labels[] = date('d-M', $curr_date);
 				}
 			} else {
 				$start_year = date('Y', $a_report_options['from']);
 				$start_month = date('m', $a_report_options['from']);
 				$end_month_year = date('Ym', $a_report_options['to']);
 				// big interval - move from date to the first day ot the month
 				$a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_report_options['from']), 1, date('Y', $a_report_options['from']));
 				$curr_time = $a_report_options['from'];
 				while (date('Ym', $curr_time) <= $end_month_year)
 				{
 					$step_labels[date('Ym', $curr_time)] = date('M-Y', $curr_time);
 					// add month
 					$curr_time = adodb_mktime(0,0,0, date('m', $curr_time) + 1, 1, date('Y', $curr_time));
 				}
 				$step_seconds = 0;
 			}
 
 			$a_expressions = Array(
 				'Qty' => 'od.Quantity',
 				'Cost' => 'od.Cost * od.Quantity',
 				'Amount' => 'od.Price * od.Quantity',
 				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
 				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
 				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
 				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
 			);
 
 			if ($step_seconds)
 			{
 				$period_sql = 'FLOOR(
 								(o.OrderDate - '.$a_report_options['from'].')
 								/'.$step_seconds.'
 							)';
 			} else {
 				$period_sql = 'CONCAT(YEAR(FROM_UNIXTIME(o.OrderDate)),LPAD(MONTH(FROM_UNIXTIME(o.OrderDate)), 2, \'0\'))';
 			}
 
 			if ($this->Application->isModuleEnabled('in-auction'))
 			{
 				$sql = 'SELECT
 							'.$period_sql.' AS Period,
 							SUM(IF(ISNULL(eod.OptionsSalt), '.$a_expressions[$metric].', 0)) as StoreMetric,
 							SUM(IF(ISNULL(eod.OptionsSalt), 0, '.$a_expressions[$metric].')) as eBayMetric
 					FROM '.TABLE_PREFIX.'Orders AS o
 					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 					ON od.OrderId = o.OrderId
 					LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
 					ON od.OptionsSalt = eod.OptionsSalt
 					WHERE
 						o.Status IN (4,6)
 						'.$filter_value.'
 						GROUP BY Period';
 			} else 	{
 
 				$sql = 'SELECT
 							'.$period_sql.' AS Period,
 							SUM('.$a_expressions[$metric].') as StoreMetric,
 							0 as eBayMetric
 					FROM '.TABLE_PREFIX.'Orders AS o
 					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 					ON od.OrderId = o.OrderId
 					WHERE
 						o.Status IN (4,6)
 						'.$filter_value.'
 						GROUP BY Period';
 
 			}
 
 			$a_data = $this->Conn->Query($sql, 'Period');
 
 			// create series array
 			$a_serie1 = Array();
 			$a_serie2 = Array();
 			foreach ($step_labels AS $key => $label)
 			{
 				$a_serie1[$key] = (isset($a_data[$key]['eBayMetric']) && !is_null($a_data[$key]['eBayMetric'])) ? $a_data[$key]['eBayMetric'] : 0;
 				$a_serie2[$key] = (isset($a_data[$key]['StoreMetric']) && !is_null($a_data[$key]['StoreMetric'])) ? $a_data[$key]['StoreMetric'] : 0;
 			}
 
 			$show_date_from = date('m/d/Y', $a_report_options['from']);
 			$show_date_to = date('m/d/Y', $a_report_options['to']);
 			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
 
 			$this->Application->StoreVar('graph_metric', $object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
 			$this->Application->StoreVar('graph_serie1', serialize($a_serie1));
 			$this->Application->StoreVar('graph_serie2', serialize($a_serie2));
 
 			$this->Application->StoreVar('graph_serie1_label', $this->Application->Phrase('la_eBayMarketplace'));
 			$this->Application->StoreVar('graph_serie2_label', $this->Application->Phrase('la_OnlineStore'));
 			$this->Application->StoreVar('graph_labels', serialize($step_labels));
 
 			return;
 
 		}
 
 
 		$ebay_joins = '';
 		if ($this->Application->isModuleEnabled('in-auction'))
 		{
 			$ebay_joins = '
 				LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
 				ON od.OptionsSalt = eod.OptionsSalt
 			';
 		}
 
 		if ($a_report_options['ReportType'] == 1)
 		{
 			// pie chart by category
 
 			$a_expressions = Array(
 				'Qty' => 'od.Quantity',
 				'Cost' => 'od.Cost * od.Quantity',
 				'Amount' => 'od.Price * od.Quantity',
 				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
 				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
 				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
 				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
 				'StoreQty' => 'IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)',
 				'eBayQty' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)',
 				'StoreAmount' => 'IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)',
 				'eBayAmount' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)',
 				'StoreProfit' => 'IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)',
 				'eBayProfit' => 'IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)',
 			);
 
 			$lang = $this->Application->GetVar('m_lang');
 
 			$sql = 'SELECT
 						LEFT(c.l'.$lang.'_Name, 60) AS Name,
 						c.CategoryId,
 						SUM('.$a_expressions[$metric].') as Metric
 				FROM '.TABLE_PREFIX.'Orders AS o
 				LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 				ON od.OrderId = o.OrderId
 				LEFT JOIN '.TABLE_PREFIX.'Products AS p
 				ON p.ProductId = od.ProductId
 				LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
 				ON ci.ItemResourceId = p.ResourceId
 				LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 				ON c.CategoryId = ci.CategoryId
 				'.$ebay_joins.'
 				WHERE
 					o.Status IN (4,6)
 					'.$filter_value.'
 				GROUP BY c.CategoryId
 				HAVING NOT ISNULL(CategoryId)
 				ORDER BY Metric DESC
 				LIMIT 0,8
 				';
 			$a_data = $this->Conn->Query($sql, 'CategoryId');
 
 			$other_metric = 0;
 			if (count($a_data) > 7)
 			{
 				// gather ids for "others" call
 				$ids = join(',', array_keys($a_data));
 				$sql = 'SELECT
 							SUM('.$a_expressions[$metric].')
 					FROM '.TABLE_PREFIX.'Orders AS o
 					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 					ON od.OrderId = o.OrderId
 					LEFT JOIN '.TABLE_PREFIX.'Products AS p
 					ON p.ProductId = od.ProductId
 					LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
 					ON ci.ItemResourceId = p.ResourceId
 					LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 					ON c.CategoryId = ci.CategoryId
 					'.$ebay_joins.'
 					WHERE
 						o.Status IN (4,6)
 						'.$filter_value.'
 						AND c.CategoryId NOT IN ('.$ids.')
 					';
 				$other_metric = $this->Conn->GetOne($sql);
 				if ($other_metric != 0)
 				{
 					$a_data[0] = Array(
 						'Metric' => $other_metric,
 						'Name' => $this->Application->Phrase('la_text_Others'),
 					);
 				}
 			}
 
 
 			$show_date_from = date('m/d/Y', $a_report_options['from']);
 			$show_date_to = date('m/d/Y', $a_report_options['to']);
 			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
 
 			$this->Application->StoreVar('graph_metric', $this->Application->Phrase('la_text_ReportByTopProductCategories').' '.$object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
 			$this->Application->StoreVar('graph_data', serialize($a_data));
 			return;
 		}
 
 
 		if ($a_report_options['ReportType'] == 5)
 		{
 			// pie chart by product
 
 			$a_expressions = Array(
 				'Qty' => 'od.Quantity',
 				'Cost' => 'od.Cost * od.Quantity',
 				'Amount' => 'od.Price * od.Quantity',
 				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
 				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
 				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
 				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
 				'StoreQty' => 'IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)',
 				'eBayQty' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)',
 				'StoreAmount' => 'IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)',
 				'eBayAmount' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)',
 				'StoreProfit' => 'IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)',
 				'eBayProfit' => 'IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)',
 			);
 
 			$lang = $this->Application->GetVar('m_lang');
 
 			$sql = 'SELECT
 						LEFT(p.l'.$lang.'_Name, 60) AS Name,
 						p.ProductId,
 						SUM('.$a_expressions[$metric].') as Metric
 				FROM '.TABLE_PREFIX.'Orders AS o
 				LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 				ON od.OrderId = o.OrderId
 				LEFT JOIN '.TABLE_PREFIX.'Products AS p
 				ON p.ProductId = od.ProductId
 				'.$ebay_joins.'
 				WHERE
 					o.Status IN (4,6)
 					'.$filter_value.'
 				GROUP BY p.ProductId
 				HAVING NOT ISNULL(ProductId)
 				ORDER BY Metric DESC
 				LIMIT 0,8
 				';
 			$a_data = $this->Conn->Query($sql, 'ProductId');
 
 			$other_metric = 0;
 			if (count($a_data) > 7)
 			{
 				// gather ids for "others" call
 				$ids = join(',', array_keys($a_data));
 				$sql = 'SELECT
 							SUM('.$a_expressions[$metric].')
 					FROM '.TABLE_PREFIX.'Orders AS o
 					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 					ON od.OrderId = o.OrderId
 					LEFT JOIN '.TABLE_PREFIX.'Products AS p
 					ON p.ProductId = od.ProductId
 					'.$ebay_joins.'
 					WHERE
 						o.Status IN (4,6)
 						'.$filter_value.'
 						AND p.ProductId NOT IN ('.$ids.')
 					';
 				$other_metric = $this->Conn->GetOne($sql);
 				if ($other_metric != 0)
 				{
 					$a_data[0] = Array(
 						'Metric' => $other_metric,
 						'Name' => $this->Application->Phrase('la_Others'),
 					);
 				}
 			}
 
 
 			$show_date_from = date('m/d/Y', $a_report_options['from']);
 			$show_date_to = date('m/d/Y', $a_report_options['to']);
 			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
 
 			$this->Application->StoreVar('graph_metric', $this->Application->Phrase('la_text_ReportByTopProducts').' '.$object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
 			$this->Application->StoreVar('graph_data', serialize($a_data));
 		}
 
 	}
 
 	function GetRandom($params)
 	{
 		return rand(1,10000000);
 	}
 
 	function IsPHPxOrGreater($params)
 	{
 		$curver = explode(".", phpversion());
 		return ($curver[0] >= $params['version']);
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/admin_templates/reports/results.tpl
===================================================================
--- branches/5.2.x/admin_templates/reports/results.tpl	(revision 16695)
+++ branches/5.2.x/admin_templates/reports/results.tpl	(revision 16696)
@@ -1,68 +1,77 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" pagination="1" title_preset="report_results"/>
+
+<inp2:rep.metric_SyncIDFieldDeclaration/>
+<inp2:rep.metric_ReportOptionValue name="grid" result_to_var="grid"/>
+
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" grid="$grid" pagination="1" title_preset="report_results"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
 <tbody>
 	<tr>
   	<td>
 			<script type="text/javascript">
 				function edit()
 				{
 					// do nothing
 				}
 
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>', function() {
 //							window.location = '<inp2:m_t t="../../plugins/reports/admin_templates/reports" "pass"="m,rep" "rep_event="OnNew" no_amp="1" js_escape="1"/>'
 							window.location = '<inp2:m_Link template="in-commerce/reports/reports" pass="m,rep" rep_event="OnNew" no_amp="1" js_escape="1"/>';
 							return true;
 						}
 				 ) );
 
 				 a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
 				 			window.print();
 						}
 				 ) );
 
 				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 								show_viewmenu(a_toolbar,'view');
 							}
 					) );
 
 				 a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
 								submit_event('rep','OnExportReport');
+
+								set_hidden_field('events[rep]', null);
+								submitted = false;
 							}
 					) );
 
 				<inp2:m_if check="rep.metric_ReportTypeEquals" value="2">
 					// By Users report have no chart
 				<inp2:m_else/>
 					// Only PHP5 have chart
 					<inp2:m_if check="rep_IsPHPxOrGreater" version="5">
 						// Chart window open button
 						 a_toolbar.AddButton( new ToolBarButton('in-commerce:view_chart', '<inp2:m_phrase label="la_ToolTip_View_Chart" escape="1"/>', function() {
 								openSelector('rep', '<inp2:m_Link template="in-commerce/reports/chart" pass="all" no_amp="1" js_escape="1"/>');
 							}
 							) );
 					</inp2:m_if>
 
 				</inp2:m_if>
 
 				a_toolbar.Render();
 			</script>
 		</td>
 
-	  	<inp2:m_RenderElement name="search_main_toolbar" prefix="rep" grid="Default"/>
+	  	<inp2:m_RenderElement name="search_main_toolbar" prefix="rep" grid="$grid"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="rep" IdField="CategoryId" grid="Default" totals_render_as="grid_total_row"/>
+<inp2:rep.metric_ReportOptionValue name="id_field" result_to_var="id_field"/>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="rep" IdField="$id_field" grid="$grid" totals_render_as="grid_total_row"/>
 <script type="text/javascript">
 	Grids['rep'].SetDependantToolbarButtons( new Array() );
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>