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

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

Revision: 4785
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4785&view=rev
Author:   daintree
Date:     2011-12-20 07:19:02 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/StockLocTransfer.php
    trunk/doc/Change.log

Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php	2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/StockLocTransfer.php	2011-12-20 07:19:02 UTC (rev 4785)
@@ -157,7 +157,9 @@
 if(isset($_POST['Submit']) AND $InputError==False){
 
 	$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
+	
 	DB_Txn_Begin($db);
+	
 	for ($i=0;$i < $_POST['LinesCounter'];$i++){
 
 		if($_POST['StockID' . $i] != ''){
@@ -209,8 +211,7 @@
 
 	}
 
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
-		'" alt="" />' . ' ' . $title . '</p>';
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
 
 	echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -222,9 +223,11 @@
 
 	$sql = "SELECT loccode, locationname FROM locations";
 	$resultStkLocs = DB_query($sql,$db);
+	
 	echo '<tr>
-			<td>'._('From Stock Location').':</td>
+			<td>' . _('From Stock Location') . ':</td>
 			<td><select name="FromStockLocation">';
+			
 	while ($myrow=DB_fetch_array($resultStkLocs)){
 		if (isset($_POST['FromStockLocation'])){
 			if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -322,7 +325,7 @@
 	echo '</table>
 		<br />
 		<div class="centre">
-		<input type="hidden" name="LinesCounter" value="'. $i .'" />
+		<input type="hidden" name="LinesCounter" value="'. $j .'" />
 		<input type=submit name="EnterMoreItems" value="'. _('Add More Items'). '" />
 		<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
 		<br />';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/doc/Change.log	2011-12-20 07:19:02 UTC (rev 4785)
@@ -1,10 +1,11 @@
 webERP Change Log
 
+20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
 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
-14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
+14/12/11 Tim Schofield: check_syntax.sh Script for checking syntax of all php scripts in webERP
 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.
 13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
 13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions

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