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

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

Revision: 4784
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4784&view=rev
Author:   daintree
Date:     2011-12-20 06:59:01 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/StockTransfers.php
    trunk/doc/Change.log
    trunk/sql/mysql/weberp-new.sql

Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php	2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/StockTransfers.php	2011-12-20 06:59:01 UTC (rev 4784)
@@ -73,10 +73,11 @@
 if (isset($_GET['StockID'])){	/*carry the stockid through to the form for additional inputs */
 	$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
 } elseif (isset($_POST['StockID'])){	/* initiate a new transfer only if the StockID is different to the previous entry */
-	if (isset($_SESSION['Transfer']) 
-		AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
-		unset($_SESSION['Transfer']);
-		$NewTransfer = true;
+	if (isset($_SESSION['Transfer']->TransferItem[0])) {
+		if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+			unset($_SESSION['Transfer']);
+			$NewTransfer = true;
+		}
 	}
 }
 
@@ -223,7 +224,7 @@
 						'" . $PeriodNo . "',
 						'To " . $_SESSION['Transfer']->StockLocationTo ."',
 						'" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)  . "',
-						'" . $QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) ."'
+						'" . ($QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)) . "'
 						)";
 
 		$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record cannot be inserted because');

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/doc/Change.log	2011-12-20 06:59:01 UTC (rev 4784)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
 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

Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql	2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/sql/mysql/weberp-new.sql	2011-12-20 06:59:01 UTC (rev 4784)
@@ -3142,7 +3142,7 @@
 -- Dumping data for table `www_users`
 --
 
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_IN.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_GB.utf8',0);
 
 --
 -- Dumping data for table `edi_orders_segs`

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