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

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

Revision: 4779
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4779&view=rev
Author:   daintree
Date:     2011-12-15 09:25:53 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/UpgradeDatabase.php
    trunk/doc/Change.log
    trunk/sql/mysql/upgrade3.11.1-4.00.sql

Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php	2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/UpgradeDatabase.php	2011-12-15 09:25:53 UTC (rev 4779)
@@ -34,6 +34,10 @@
 				</select></td>
 			</tr>
 		</table>';
+		prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+		echo '<div class="centre">
+					<input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+				</div>';
 	} else {
 		if ($_SESSION['VersionNumber']=='4.00RC1'){
 			$_SESSION['VersionNumber']='3.12';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/doc/Change.log	2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
 15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
 15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
 13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.

Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql	2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql	2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,3 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
 ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
 ALTER TABLE areas  CONVERT TO CHARACTER SET utf8;
@@ -853,4 +854,5 @@
   DROP `netweight`,
   DROP `total_amount`;
   UPDATE purchdata INNER JOIN unitsofmeasure  ON purchdata.suppliersuom=unitsofmeasure.unitid SET suppliersuom = unitsofmeasure.unitname;
-UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
+SET FOREIGN_KEY_CHECKS=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.