[Web-erp-svn] SF.net SVN: web-erp:[5779] trunk

[<dai...@us...>]

Revision: 5779
          http://sourceforge.net/p/web-erp/reponame/5779
Author:   daintree
Date:     2012-12-27 07:00:29 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
remove weberpdemo from sql and use * instead of full field specification in userlogin as sql may fail in prior versions disabling upgrade script

Modified Paths:
--------------
    trunk/includes/UserLogin.php
    trunk/sql/mysql/upgrade4.09-4.10.sql

Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php	2012-12-24 07:09:18 UTC (rev 5778)
+++ trunk/includes/UserLogin.php	2012-12-27 07:00:29 UTC (rev 5779)
@@ -36,23 +36,7 @@
 		if (!isset($Name) or $Name == '') {
 			return  UL_SHOWLOGIN;
 		}
-		$sql = "SELECT userid,
-						fullaccess,
-						customerid,
-						branchcode,
-						pagesize,
-						defaultlocation,
-						email,
-						modulesallowed,
-						realname,
-						theme,
-						language,
-						salesman,
-						cancreatetender,
-						department,
-						blocked,
-						pdflanguage,
-						displayrecordsmax
+		$sql = "SELECT *
 				FROM www_users
 				WHERE www_users.userid='" . $Name . "'
 				AND (www_users.password='" . CryptPass($Password) . "'

Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql	2012-12-24 07:09:18 UTC (rev 5778)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql	2012-12-27 07:00:29 UTC (rev 5779)
@@ -5,7 +5,7 @@
 ALTER TABLE `salesorderdetails` DROP `commissionearned`;
 INSERT INTO scripts VALUES ('CounterReturns.php','5','Allows credits and refunds from the default Counter Sale account for an inventory location');
 ALTER TABLE purchorders MODIFY `initiator` VARCHAR(20);
-INSERT INTO `weberpdemo`.`scripts` (`script` , `pagesecurity` , `description`)
+INSERT INTO `scripts` (`script` , `pagesecurity` , `description`)
 VALUES ('OrderEntryDiscountPricing', '13', 'Not a script but an authority level marker - required if the user is allowed to enter discounts against a customer order'
 );
 ALTER TABLE `gltrans` ADD INDEX ( `tag` );