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

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

Revision: 4570
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4570&view=rev
Author:   daintree
Date:     2011-05-16 07:41:47 +0000 (Mon, 16 May 2011)

Log Message:
-----------
various

Modified Paths:
--------------
    trunk/Suppliers.php
    trunk/UpgradeDatabase.php
    trunk/Z_ChangeStockCode.php
    trunk/doc/Change.log

Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php	2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Suppliers.php	2011-05-16 07:41:47 UTC (rev 4570)
@@ -936,7 +936,7 @@
 
 	DB_data_seek($result, 0);
 
-	$sql = 'SELECT taxgroupid, taxgroupdescription FROM taxgroups';
+	$sql = "SELECT taxgroupid, taxgroupdescription FROM taxgroups";
 	$result = DB_query($sql, $db);
 
 	while ($myrow = DB_fetch_array($result)) {

Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php	2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/UpgradeDatabase.php	2011-05-16 07:41:47 UTC (rev 4570)
@@ -107,6 +107,7 @@
 				case '4.03':
 				case '4.03.2':
 				case '4.03.5':
+				case '4.03.7':
 					$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
 				case '4.03.8':
 					$SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';

Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php	2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Z_ChangeStockCode.php	2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,4 +1,5 @@
 <?php
+
 /* $Id$*/
 
 /*Script to Delete all sales transactions*/
@@ -124,7 +125,7 @@
 	
 		//check if MRP tables exist before assuming 
 		
-		$result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db);
+		$result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
 		if ($DB_error_no==0) {
 			echo '<br />' . _('Changing MRP planned orders information');
 			$sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -133,7 +134,7 @@
 			echo ' ... ' . _('completed');
 		}
 	
-		$result = DB_query("SELECT * FROM mrprequirements" , $db);
+		$result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
 		if (DB_error_no($db)==0){
 			echo '<br />' . _('Changing MRP requirements information');
 			$sql = "UPDATE mrprequirements SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -141,7 +142,7 @@
 			$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
 			echo ' ... ' . _('completed');
 		}
-		$result = DB_query("SELECT * FROM mrpsupplies" , $db);
+		$result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
 		if (DB_error_no($db)==0){
 			echo '<br />' . _('Changing MRP supplies information');
 			$sql = "UPDATE mrpsupplies SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/doc/Change.log	2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,6 +1,7 @@
 webERP Change Log
 
-15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates
+15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
+15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script
 15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed
 14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691
 14/5/11 CustomerInquiry.php now shows the currency decimal places


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