[Weberp-cvs] SF.net SVN: web-erp:[3425] trunk

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

Revision: 3425
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3425&view=rev
Author:   daintree
Date:     2010-04-21 08:19:44 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
mods to upgrade script as noted by Ma...@li...

Modified Paths:
--------------
    trunk/doc/Change.log.html
    trunk/sql/mysql/upgrade3.11.1-3.12.sql

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-04-19 22:36:52 UTC (rev 3424)
+++ trunk/doc/Change.log.html	2010-04-21 08:19:44 UTC (rev 3425)
@@ -423,7 +423,6 @@
 <p>16/09/09 Tim: FixedAssetJournal.php - New script to produce a depreciation journal
 <p>16/09/09 Tim: FixedAssetItems.php - New script to define individual Fixed Asset items
 <p>16/09/09 Tim: FixedAssetCategories.php - New script to define categories of Fixed Assets
->>>>>>> .merge-right.r3162
 <p>15/09/09 Tim: PrintCustTransPortrait.php - Correct sql to show invoices
 <p>15/09/09 Tim: StockReOrderLevel.php - Show the correct number of decimal places for stock levels
 <p>15/09/09 Tim: SelectSalesOrder.php - Bug fixes and layout changes

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-04-19 22:36:52 UTC (rev 3424)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-04-21 08:19:44 UTC (rev 3425)
@@ -51,7 +51,7 @@
 
 ALTER TABLE `purchorderauth` ADD COLUMN `offhold` tinyint(1) NOT NULL DEFAULT 0;
 
-UPDATE `www_users` SET `modulesallowed` = '1,1,1,1,1,1,1,1,1,1'
+UPDATE `www_users` SET `modulesallowed` = '1,1,1,1,1,1,1,1,1,1';
 
 UPDATE securitytokens SET tokenname = 'Petty Cash' WHERE tokenid = 6;
 
@@ -74,15 +74,15 @@
   `description` varchar(50) NOT NULL COMMENT 'text description, e.g. meals, train tickets, fuel, etc',
   `glaccount` int(11) NOT NULL COMMENT 'GL related account',
   PRIMARY KEY (`codeexpense`),
-  KEY `pcexpenses_ibfk_1` (`glaccount`)
+  KEY (`glaccount`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
 CREATE TABLE IF NOT EXISTS `pctabexpenses` (
   `typetabcode` varchar(20) NOT NULL,
   `codeexpense` varchar(20) NOT NULL,
-  KEY `pctabexpenses_ibfk_1` (`typetabcode`),
-  KEY `pctabexpenses_ibfk_2` (`codeexpense`)
+  KEY (`typetabcode`),
+  KEY (`codeexpense`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `pctabs` (
@@ -95,11 +95,11 @@
   `glaccountassignment` int(11) NOT NULL COMMENT 'gl account where the money comes from',
   `glaccountpcash` int(11) NOT NULL,
   PRIMARY KEY (`tabcode`),
-  KEY `pctabs_ibfk_1` (`usercode`),
-  KEY `pctabs_ibfk_2` (`typetabcode`),
-  KEY `pctabs_ibfk_3` (`currency`),
-  KEY `pctabs_ibfk_4` (`authorizer`),
-  KEY `pctabs_ibfk_5` (`glaccountassignment`)
+  KEY (`usercode`),
+  KEY (`typetabcode`),
+  KEY (`currency`),
+  KEY (`authorizer`),
+  KEY (`glaccountassignment`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `pctypetabs` (


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.