Index: branches/5.2.x/units/reports/reports_event_handler.php
===================================================================
diff -u -N -r14986 -r15009
--- branches/5.2.x/units/reports/reports_event_handler.php	(.../reports_event_handler.php)	(revision 14986)
+++ branches/5.2.x/units/reports/reports_event_handler.php	(.../reports_event_handler.php)	(revision 15009)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reports_event_handler.php 14986 2012-01-04 16:11:56Z alex $
+* @version	$Id: reports_event_handler.php 15009 2012-01-06 20:37:54Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -78,7 +78,7 @@
 		$ebay_query_fields = '';
 
 		$user_id = $this->Application->RecallVar('user_id');
-		$sql = 'DELETE FROM '.TABLE_PREFIX.'PersistantSessionData
+		$sql = 'DELETE FROM '.TABLE_PREFIX.'UserPersistentSessionData
 			WHERE
 				PortalUserId = "'.$user_id.'"
 				AND VariableName LIKE \'rep_columns_%\'';
@@ -125,7 +125,7 @@
 							Profit double(10,4) NOT NULL DEFAULT 0
 							'.$ebay_table_fields.'
 						)';
-			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Category');
+			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
 			$this->Conn->Query($q);
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
@@ -146,7 +146,7 @@
 						ON p.ProductId = od.ProductId
 						LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
 						ON ci.ItemResourceId = p.ResourceId
-						LEFT JOIN '.TABLE_PREFIX.'Category AS c
+						LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 						ON c.CategoryId = ci.CategoryId
 						'.$ebay_joins.'
 						WHERE
@@ -170,7 +170,7 @@
 							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.'Category');
+			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
 			$this->Conn->Query($q);
 
 			$q = 'INSERT INTO '.$field_values['table_name'].'
@@ -186,7 +186,7 @@
 						FROM '.TABLE_PREFIX.'Orders AS o
 						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
 						ON od.OrderId = o.OrderId
-						LEFT JOIN '.TABLE_PREFIX.'PortalUser AS u
+						LEFT JOIN '.TABLE_PREFIX.'Users AS u
 						ON u.PortalUserId = o.PortalUserId
 						WHERE
 							o.Status IN (4,6)
@@ -371,7 +371,7 @@
 
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s
-				 LEFT JOIN '.TABLE_PREFIX.'Category AS c
+				 LEFT JOIN '.TABLE_PREFIX.'Categories AS c
 				 ON c.CategoryId = %1$s.CategoryId';
 			$new_options['Grids']['Default'] = Array (
 				'Icons' => Array (
@@ -424,7 +424,7 @@
 			$products_category_id = $this->Application->findModule('Name', 'In-Commerce', 'RootCat');
 			// get root category name
 			$sql = 'SELECT LENGTH(l' . $lang . '_CachedNavbar)
-					FROM ' . TABLE_PREFIX . 'Category
+					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = '.$products_category_id;
 			$root_length = $this->Conn->GetOne($sql) + 4;
 
@@ -435,7 +435,7 @@
 		elseif ($field_values['ReportType'] == 2) { // by User
 			$new_options['ListSQLs'][''] =
 				'SELECT %1$s.* %2$s FROM %1$s
-				 LEFT JOIN '.TABLE_PREFIX.'PortalUser AS u
+				 LEFT JOIN '.TABLE_PREFIX.'Users AS u
 				 ON u.PortalUserId = %1$s.PortalUserId';
 
 			$new_options['Grids']['Default'] = Array (