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

[<tim...@us...>]

Revision: 3492
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3492&view=rev
Author:   tim_schofield
Date:     2010-06-13 17:39:23 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Tim: upgrade3.11.1-3.12.sql - Extend modules al.lowed field to allow for new modules

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-06-13 10:45:30 UTC (rev 3491)
+++ trunk/doc/Change.log.html	2010-06-13 17:39:23 UTC (rev 3492)
@@ -1,6 +1,7 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
-<p>13/6/10 Phil: Contracts.php new work changes to index.php to allow for new contract costing module</p>
+<p>13/06/10 Tim: upgrade3.11.1-3.12.sql - Extend modules al.lowed field to allow for new modules</p>
+<p>13/06/10 Phil: Contracts.php new work changes to index.php to allow for new contract costing module</p>
 <p>10/06/10 Tim: GoodsReceived.php - session.inc should come before any calls to gettext _() function.</p>
 <p>09/06/10 Harald: Contracts.php - Fix typo in error message. Phil - This script is not even close to working yet anyway!!</p>
 <p>09/06/10 Tim: UserSettings.php - Fix sql error for case when password is being updated.</p>

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-06-13 10:45:30 UTC (rev 3491)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-06-13 17:39:23 UTC (rev 3492)
@@ -225,5 +225,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-ALTER TABLE `salestypes` CHANGE COLUMN `sales_type` `sales_type` VARCHAR(40) NOT NULL DEFAULT '';>>>>>>> .r3482
+ALTER TABLE `salestypes` CHANGE COLUMN `sales_type` `sales_type` VARCHAR(40) NOT NULL DEFAULT '';
 INSERT INTO `config` VALUES ('ShowValueOnGRN', 1);
+
+ALTER TABLE `www_users` CHANGE COLUMN `modulesallowed` `modulesallowed` varchar(40) NOT NULL DEFAULT '1,1,1,1,1,1,1,1,1,1,1,';
\ No newline at end of file


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