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

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

Revision: 6421
          http://sourceforge.net/p/web-erp/reponame/6421
Author:   daintree
Date:     2013-11-19 07:21:24 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
Prepare SQL scripts for new release

Modified Paths:
--------------
    trunk/UpgradeDatabase.php
    trunk/sql/mysql/upgrade4.11-4.12.sql

Added Paths:
-----------
    trunk/sql/mysql/upgrade4.11.1-4.11.2.sql

Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php	2013-11-19 07:11:39 UTC (rev 6420)
+++ trunk/UpgradeDatabase.php	2013-11-19 07:21:24 UTC (rev 6421)
@@ -177,6 +177,9 @@
 				case '4.10.1':
 					$SQLScripts[] = './sql/mysql/upgrade4.10-4.11.sql';
 				case '4.11.0':
+				case '4.11.1':
+					$SQLScripts[] = './sql/mysql/upgrade4.11.1-4.11.2.sql';
+				case '4.11.2':
 					break;
 			} //end switch
 		}
@@ -269,4 +272,4 @@
 } /*Dont do upgrade */
 
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql	2013-11-19 07:11:39 UTC (rev 6420)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql	2013-11-19 07:21:24 UTC (rev 6421)
@@ -1,10 +1,4 @@
-INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
-INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
-ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
-INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
-INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
-INSERT INTO  `scripts` (`script` , `pagesecurity` , `description`) VALUES ('StockClone.php',  '11',  'Script to copy a stock item and associated properties, image, price, purchase and cost data');
-#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
-ALTER table locstock change bin bin varchar(10) NOT NULL DEFAULT ''; 
 
+#--UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
 
+

Added: trunk/sql/mysql/upgrade4.11.1-4.11.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.1-4.11.2.sql	                        (rev 0)
+++ trunk/sql/mysql/upgrade4.11.1-4.11.2.sql	2013-11-19 07:21:24 UTC (rev 6421)
@@ -0,0 +1,9 @@
+INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
+INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
+ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
+INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
+INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
+INSERT INTO  `scripts` (`script` , `pagesecurity` , `description`) VALUES ('StockClone.php',  '11',  'Script to copy a stock item and associated properties, image, price, purchase and cost data');
+ALTER table locstock change bin bin varchar(10) NOT NULL DEFAULT ''; 
+UPDATE config SET confvalue='4.11.2' WHERE confname='VersionNumber';
+