[Weberp-cvs] SF.net SVN: web-erp:[3443] trunk

[<tim...@us...>]

Revision: 3443
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3443&view=rev
Author:   tim_schofield
Date:     2010-05-04 13:39:34 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Tim: SelectProduct.php - Correctly display the product when selected from more than one page.

Modified Paths:
--------------
    trunk/SelectProduct.php
    trunk/doc/Change.log.html

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2010-05-03 13:03:00 UTC (rev 3442)
+++ trunk/SelectProduct.php	2010-05-04 13:39:34 UTC (rev 3443)
@@ -12,7 +12,7 @@
 	$_POST['Select'] = trim(strtoupper($_GET['StockID']));
 }
 echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Inventory Items') . '" alt="">' . ' ' . _('Inventory Items') . '';
-if (isset($_GET['NewSearch'])) {
+if (isset($_GET['NewSearch']) or isset($_POST['Next']) or isset($_POST['Previous']) or isset($_POST['Go'])) {
 	unset($StockID);
 	unset($_SESSION['SelectedStockItem']);
 	unset($_POST['Select']);
@@ -493,6 +493,9 @@
 echo '<script  type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
 echo '</form>';
 // query for list of record(s)
+if(isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+	$_POST['Search']='Search';
+}
 if (isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
 	if (!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) {
 		// if Search then set to first page
@@ -663,7 +666,7 @@
 			echo '<input type=hidden name=Keywords value="'.$_POST['Keywords'].'">';
 			echo '<input type=hidden name=StockCat value="'.$_POST['StockCat'].'">';
 			echo '<input type=hidden name=StockCode value="'.$_POST['StockCode'].'">';
-			echo '<input type=hidden name=Search value="Search">';
+//			echo '<input type=hidden name=Search value="Search">';
 			echo '<p></div>';
 		}
 		echo '<table cellpadding=2 colspan=7>';
@@ -694,7 +697,7 @@
 			} else {
 				$qoh = number_format($myrow["qoh"], $myrow['decimalplaces']);
 			}
-			echo "<td><input type=submit name='Select' value='".$myrow['stockid']."'</td>
+			echo "<td><input type=submit name='Select' value='".$myrow['stockid']."'></td>
 				<td>".$myrow['description']."</td>
 				<td class='number'>".$qoh."</td>
 				<td>".$myrow['units']."</td>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-03 13:03:00 UTC (rev 3442)
+++ trunk/doc/Change.log.html	2010-05-04 13:39:34 UTC (rev 3443)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>04/05/10 Tim: SelectProduct.php - Correctly display the product when selected from more than one page.</p>
 <p>03/05/10 Lindsay: More installer tweaks: better error handling</p>
 <p>03/05/10 Tim: PurchData.php - Do not show thousands seperator in price field</p>
 <p>02/05/10 Tim: Add picking list printing</p>


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