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

[<vv...@us...>]

Revision: 5293
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5293&view=rev
Author:   vvs2012
Date:     2012-04-28 19:41:43 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
xhtml

Modified Paths:
--------------
    trunk/SuppLoginSetup.php
    trunk/SuppPaymentRun.php
    trunk/SuppPriceList.php
    trunk/SuppShiptChgs.php
    trunk/SuppTransGLAnalysis.php
    trunk/SupplierTenderCreate.php
    trunk/SupplierTransInquiry.php
    trunk/SupplierTypes.php
    trunk/Suppliers.php
    trunk/SystemParameters.php
    trunk/Tax.php
    trunk/TaxAuthorities.php
    trunk/TaxAuthorityRates.php
    trunk/TaxCategories.php
    trunk/TaxGroups.php
    trunk/TaxProvinces.php
    trunk/TopItems.php
    trunk/UnitsOfMeasure.php
    trunk/UpgradeDatabase.php
    trunk/UserSettings.php
    trunk/WOSerialNos.php
    trunk/WWW_Access.php
    trunk/WWW_Users.php
    trunk/WhereUsedInquiry.php
    trunk/WorkCentres.php
    trunk/WorkOrderCosting.php
    trunk/WorkOrderEntry.php
    trunk/WorkOrderIssue.php
    trunk/WorkOrderStatus.php
    trunk/includes/MainMenuLinksArray.php

Modified: trunk/SuppLoginSetup.php
===================================================================
--- trunk/SuppLoginSetup.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SuppLoginSetup.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -109,6 +109,7 @@
 } 
 
 echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 
@@ -133,7 +134,7 @@
 }
 echo '<tr>
 		<td>' . _('Password') . ':</td>
-		<td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" />
+		<td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" /></td>
 	</tr>
 	<tr>
 		<td>' . _('Full Name') . ':</td>
@@ -178,8 +179,10 @@
 }
 
 if (!$FoundTheSupplierRole){
+    echo '</table>
+          </div>
+          </form>';
 	prnMsg(_('The supplier login role is expected to contain just one token - number 9. There is no such role currently defined - so a supplier login cannot be set up until this role is defined'),'error');
-	echo '</table>';
 	include('includes/footer.inc');
 	exit;
 }
@@ -292,6 +295,7 @@
 	<div class="centre">
 		<input type="submit" name="submit" value="' . _('Enter Information') . '" />
 	</div>
+    </div>
 	</form>';
 
 echo '<script  type="text/javascript">defaultControl(document.forms[0].UserID);</script>';

Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SuppPaymentRun.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -246,9 +246,10 @@
 
 	/* show form to allow input	*/
 
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
-			<table class="selection">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+    echo '<div>';
+    echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	echo '<table class="selection">';
 
 	if (!isset($_POST['FromCriteria']) or mb_strlen($_POST['FromCriteria'])<1){
 		$DefaultFromCriteria = '1';
@@ -384,7 +385,8 @@
 				<input type="submit" name="PrintPDF" value="' . _('Print PDF Only') . '" />
 				<input type="submit" name="PrintPDFAndProcess" value="' . _('Print and Process Payments') . '" />
 			</div>';
-
+    echo '</div>
+          </form>';
 	include ('includes/footer.inc');
 } /*end of else not PrintPDF */
 ?>
\ No newline at end of file

Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SuppPriceList.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -203,9 +203,9 @@
 	echo '<div class="page_help_text">' . _('View the Price List from supplier') . '</div><br />';
 
 	echo '<br/>
-		<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
-		<table>';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+		<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+    echo '<div>';
+    echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	$sql = "SELECT supplierid,suppname FROM `suppliers`";
 	$result = DB_query($sql,$db);
@@ -255,6 +255,8 @@
 				<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
 			</div>';
 
+    echo '</div>
+          </form>';
 	include('includes/footer.inc');
 
 } /*end of else not PrintPDF */

Modified: trunk/SuppShiptChgs.php
===================================================================
--- trunk/SuppShiptChgs.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SuppShiptChgs.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -94,13 +94,14 @@
 }
 
 echo '<tr>
-	<td class="number"><font size="2" color=navy>' . _('Total') . ':</font></td>
-	<td class="number"><font size="2" color=navy><U>' . locale_number_format($TotalShiptValue,2) . '</U></font></td>
+	<td class="number">' . _('Total') . ':</td>
+	<td class="number">' . locale_number_format($TotalShiptValue,2) . '</td>
 </tr>
 </table><br />';
 
 /*Set up a form to allow input of new Shipment charges */
 echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 if (!isset($_POST['ShiptRef'])) {
@@ -152,6 +153,7 @@
 	<div class="centre">
 		<input type="submit" name="AddShiptChgToInvoice" value="' . _('Enter Shipment Charge') . '" />
 	</div>
+    </div>
 	</form>';
 	
 include('includes/footer.inc');

Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SuppTransGLAnalysis.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -131,8 +131,8 @@
 }
 
 echo '<tr>
-		<td colspan="2" class="number"><font size="4" color="blue">' . _('Total') . ':</font></td>
-		<td class="number"><font size="2" color="navy"><u>' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</u></font></td>
+		<td colspan="2" class="number">' . _('Total') . ':</td>
+		<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 	</tr>
 	</table>';
 
@@ -150,6 +150,7 @@
 
 /*Set up a form to allow input of new GL entries */
 echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 echo '<br />
@@ -159,8 +160,8 @@
 }
 echo '<tr>
 		<td>' . _('Account Code') . ':</td>
-		<td><input type="text" name="GLCode" size="12" maxlength="11" value="' .  $_POST['GLCode'] . '" /></td>
-		<input type="hidden" name="JobRef" value="" />
+		<td><input type="text" name="GLCode" size="12" maxlength="11" value="' .  $_POST['GLCode'] . '" />
+		<input type="hidden" name="JobRef" value="" /></td>
 	</tr>';
 echo '<tr>
 	<td>' . _('Account Selection') . ':
@@ -178,7 +179,7 @@
 	} else {
 		echo '<option value="';
 	}
-	echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+	echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
 }
 
 echo '</select>
@@ -206,6 +207,7 @@
 		<input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '" />
 	</div>';
 
-echo '</form>';
+echo '</div>
+      </form>';
 include('includes/footer.inc');
 ?>
\ No newline at end of file

Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php	2012-04-28 13:20:43 UTC (rev 5292)
+++ trunk/SupplierTenderCreate.php	2012-04-28 19:41:43 UTC (rev 5293)
@@ -1,865 +1,875 @@
-<?php
-/* $Id: SupplierTenderCreate.php 4821 2012-01-20 13:48:53Z tim_schofield $ */
-
-include('includes/DefineTenderClass.php');
-include('includes/SQL_CommonFunctions.inc');
-include('includes/session.inc');
-
-if (empty($_GET['identifier'])) {
-	/*unique session identifier to ensure that there is no conflict with other supplier tender sessions on the same machine  */
-	$identifier=date('U');
-} else {
-	$identifier=$_GET['identifier'];
-}
-
-if (isset($_GET['New']) and isset($_SESSION['tender'.$identifier])) {
-	unset($_SESSION['tender'.$identifier]);
-}
-
-if (isset($_GET['New']) and $_SESSION['CanCreateTender']==0) {
-	$title = _('Authorisation Problem');
-	include('includes/header.inc');
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . $title . '" alt="" />  '.$title . '</p>';
-	prnMsg( _('You do not have authority to create supplier tenders for this company.') . '<br />' .
-			_('Please see your system administrator'), 'warn');
-	include('includes/footer.inc');
-	exit;
-}
-
-if (isset($_GET['Edit']) and $_SESSION['CanCreateTender']==0) {
-	$title = _('Authorisation Problem');
-	include('includes/header.inc');
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . $title . '" alt="" />  '.$title . '</p>';
-	prnMsg( _('You do not have authority to amend supplier tenders for this company.') . '<br />' .
-			_('Please see your system administrator'), 'warn');
-	include('includes/footer.inc');
-	exit;
-}
-
-$ShowTender = 0;
-
-if (isset($_GET['ID'])) {
-	$sql="SELECT tenderid,
-				location,
-				address1,
-				address2,
-				address3,
-				address4,
-				address5,
-				address6,
-				telephone
-			FROM tenders
-			WHERE tenderid='" . $_GET['ID'] . "'";
-	$result=DB_query($sql, $db);
-	$myrow=DB_fetch_array($result);
-	if (isset($_SESSION['tender'.$identifier])) {
-		unset($_SESSION['tender'.$identifier]);
-	}
-	$_SESSION['tender'.$identifier] = new Tender();
-	$_SESSION['tender'.$identifier]->TenderId = $myrow['tenderid'];
-	$_SESSION['tender'.$identifier]->Location = $myrow['location'];
-	$_SESSION['tender'.$identifier]->DelAdd1 = $myrow['address1'];
-	$_SESSION['tender'.$identifier]->DelAdd2 = $myrow['address2'];
-	$_SESSION['tender'.$identifier]->DelAdd3 = $myrow['address3'];
-	$_SESSION['tender'.$identifier]->DelAdd4 = $myrow['address4'];
-	$_SESSION['tender'.$identifier]->DelAdd5 = $myrow['address5'];
-	$_SESSION['tender'.$identifier]->DelAdd6 = $myrow['address6'];
-
-	$sql="SELECT tenderid,
-				tendersuppliers.supplierid,
-				suppliers.suppname,
-				tendersuppliers.email
-			FROM tendersuppliers
-			LEFT JOIN suppliers
-			ON tendersuppliers.supplierid=suppliers.supplierid
-			WHERE tenderid='" . $_GET['ID'] . "'";
-	$result=DB_query($sql, $db);
-	while ($myrow=DB_fetch_array($result)) {
-		$_SESSION['tender'.$identifier]->add_supplier_to_tender($myrow['supplierid'],
-																$myrow['suppname'],
-																$myrow['email']);
-	}
-
-	$sql="SELECT tenderid,
-				tenderitems.stockid,
-				tenderitems.quantity,
-				stockmaster.description,
-				tenderitems.units,
-				stockmaster.decimalplaces
-			FROM tenderitems
-			LEFT JOIN stockmaster
-			ON tenderitems.stockid=stockmaster.stockid
-			WHERE tenderid='" . $_GET['ID'] . "'";
-	$result=DB_query($sql, $db);
-	while ($myrow=DB_fetch_array($result)) {
-		$_SESSION['tender'.$identifier]->add_item_to_tender($_SESSION['tender'.$identifier]->LinesOnTender,
-															$myrow['stockid'],
-															$myrow['quantity'],
-															$myrow['description'],
-															$myrow['units'],
-															$myrow['decimalplaces'],
-															DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
-	}
-	$ShowTender = 1;
-}
-
-if (isset($_GET['Edit'])) {
-	$title = _('Edit an Existing Supplier Tender Request');
-	include('includes/header.inc');
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
-	$sql="SELECT tenderid,
-				location,
-				address1,
-				address2,
-				address3,
-				address4,
-				address5,
-				address6,
-				telephone
-			FROM tenders
-			WHERE closed=0";
-	$result=DB_query($sql, $db);
-	echo '<table class="selection">';
-	echo '<tr>
-			<th>' . _('Tender ID') . '</th>
-			<th>' . _('Location') . '</th>
-			<th>' . _('Address 1') . '</th>
-			<th>' . _('Address 2') . '</th>
-			<th>' . _('Address 3') . '</th>
-			<th>' . _('Address 4') . '</th>
-			<th>' . _('Address 5') . '</th>
-			<th>' . _('Address 6') . '</th>
-			<th>' . _('Telephone') . '</th>
-		</tr>';
-	while ($myrow=DB_fetch_array($result)) {
-		echo '<tr>
-				<td>' . $myrow['tenderid'] . '</td>
-				<td>' . $myrow['location'] . '</td>
-				<td>' . $myrow['address1'] . '</td>
-				<td>' . $myrow['address2'] . '</td>
-				<td>' . $myrow['address3'] . '</td>
-				<td>' . $myrow['address4'] . '</td>
-				<td>' . $myrow['address5'] . '</td>
-				<td>' . $myrow['address6'] . '</td>
-				<td>' . $myrow['telephone'] . '</td>
-				<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>
-			</tr>';
-	}
-	echo '</table>';
-	include('includes/footer.inc');
-	exit;
-} else if (isset($_GET['ID']) or (isset($_SESSION['tender'.$identifier]->TenderId))) {
-	$title = _('Edit an Existing Supplier Tender Request');
-	include('includes/header.inc');
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
-} else {
-	$title = _('Create a New Supplier Tender Request');
-	include('includes/header.inc');
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
-}
-
-if (isset($_POST['Save'])) {
-	$_SESSION['tender'.$identifier]->RequiredByDate=$_POST['RequiredByDate'];
-	$_SESSION['tender'.$identifier]->save($db);
-	$_SESSION['tender'.$identifier]->EmailSuppliers();
-	prnMsg( _('The tender has been successfully saved'), 'success');
-	include('includes/footer.inc');
-	exit;
-}
-
-if (isset($_GET['DeleteSupplier'])) {
-	$_SESSION['tender'.$identifier]->remove_supplier_from_tender($_GET['DeleteSupplier']);
-	$ShowTender = 1;
-}
-
-if (isset($_GET['DeleteItem'])) {
-	$_SESSION['tender'.$identifier]->remove_item_from_tender($_GET['DeleteItem']);
-	$ShowTender = 1;
-}
-
-if (isset($_POST['SelectedSupplier'])) {
-	$sql = "SELECT suppname,
-					email
-				FROM suppliers
-				WHERE supplierid='" . $_POST['SelectedSupplier'] . "'";
-	$result = DB_query($sql, $db);
-	$myrow = DB_fetch_array($result);
-	if (mb_strlen($myrow['email'])>0) {
-		$_SESSION['tender'.$identifier]->add_supplier_to_tender($_POST['SelectedSupplier'],
-																$myrow['suppname'],
-																$myrow['email']);
-	} else {
-		prnMsg( _('The supplier must have an email set up or they cannot be part of a tender'), 'warn');
-	}
-	$ShowTender = 1;
-}
-
-if (isset($_POST['NewItem']) and !isset($_POST['Refresh'])) {
-	foreach ($_POST as $key => $value) {
-		if (mb_substr($key,0,7)=='StockID') {
-			$Index = mb_substr($key,7,mb_strlen($key)-7);
-			$StockID = $value;
-			$Quantity = filter_number_format($_POST['Qty'.$Index]);
-			$UOM = $_POST['UOM'.$Index];
-			$sql="SELECT description, decimalplaces FROM stockmaster WHERE stockid='".$StockID."'";
-			$result=DB_query($sql, $db);
-			$myrow=DB_fetch_array($result);
-			$_SESSION['tender'.$identifier]->add_item_to_tender($_SESSION['tender'.$identifier]->LinesOnTender,
-																$StockID,
-																$Quantity,
-																$myrow['description'],
-																$UOM,
-																$myrow['decimalplaces'],
-																DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
-			unset($UOM);
-		}
-	}
-	$ShowTender = 1;
-}
-
-if (!isset($_SESSION['tender'.$identifier])
-	or isset($_POST['LookupDeliveryAddress'])
-	or $ShowTender==1) {
-
-	/* Show Tender header screen */
-	if (!isset($_SESSION['tender'.$identifier])) {
-		$_SESSION['tender'.$identifier]=new Tender();
-	}
-	echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<table class="selection">';
-	echo '<tr>
-			<th colspan="4"><font size="3" color="#616161">' . _('Tender header details') . '</font></th>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Delivery Must Be Made Before') . '</td>
-			<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
-		</tr>';
-
-	if (!isset($_POST['StkLocation']) or $_POST['StkLocation']==''){
-	/* If this is the first time
-	* the form loaded set up defaults */
-
-		$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
-
-		$sql = "SELECT deladd1,
-						deladd2,
-						deladd3,
-						deladd4,
-						deladd5,
-						deladd6,
-						tel,
-						contact
-					FROM locations
-					WHERE loccode='" . $_POST['StkLocation'] . "'";
-
-		$LocnAddrResult = DB_query($sql,$db);
-		if (DB_num_rows($LocnAddrResult)==1){
-			$LocnRow = DB_fetch_array($LocnAddrResult);
-			$_POST['DelAdd1'] = $LocnRow['deladd1'];
-			$_POST['DelAdd2'] = $LocnRow['deladd2'];
-			$_POST['DelAdd3'] = $LocnRow['deladd3'];
-			$_POST['DelAdd4'] = $LocnRow['deladd4'];
-			$_POST['DelAdd5'] = $LocnRow['deladd5'];
-			$_POST['DelAdd6'] = $LocnRow['deladd6'];
-			$_POST['Tel'] = $LocnRow['tel'];
-			$_POST['Contact'] = $LocnRow['contact'];
-
-			$_SESSION['tender'.$identifier]->Location= $_POST['StkLocation'];
-			$_SESSION['tender'.$identifier]->DelAdd1 = $_POST['DelAdd1'];
-			$_SESSION['tender'.$identifier]->DelAdd2 = $_POST['DelAdd2'];
-			$_SESSION['tender'.$identifier]->DelAdd3 = $_POST['DelAdd3'];
-			$_SESSION['tender'.$identifier]->DelAdd4 = $_POST['DelAdd4'];
-			$_SESSION['tender'.$identifier]->DelAdd5 = $_POST['DelAdd5'];
-			$_SESSION['tender'.$identifier]->DelAdd6 = $_POST['DelAdd6'];
-			$_SESSION['tender'.$identifier]->Telephone = $_POST['Tel'];
-			$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
-
-		} else {
-			 /*The default location of the user is crook */
-			prnMsg(_('The default stock location set up for this user is not a currently defined stock location') .
-				'. ' . _('Your system administrator needs to amend your user record'),'error');
-		}
-
-
-	} elseif (isset($_POST['LookupDeliveryAddress'])){
-
-		$sql = "SELECT deladd1,
-						deladd2,
-						deladd3,
-						deladd4,
-						deladd5,
-						deladd6,
-						tel,
-						contact
-					FROM locations
-					WHERE loccode='" . $_POST['StkLocation'] . "'";
-
-		$LocnAddrResult = DB_query($sql,$db);
-		if (DB_num_rows($LocnAddrResult)==1){
-			$LocnRow = DB_fetch_array($LocnAddrResult);
-			$_POST['DelAdd1'] = $LocnRow['deladd1'];
-			$_POST['DelAdd2'] = $LocnRow['deladd2'];
-			$_POST['DelAdd3'] = $LocnRow['deladd3'];
-			$_POST['DelAdd4'] = $LocnRow['deladd4'];
-			$_POST['DelAdd5'] = $LocnRow['deladd5'];
-			$_POST['DelAdd6'] = $LocnRow['deladd6'];
-			$_POST['Tel'] = $LocnRow['tel'];
-			$_POST['Contact'] = $LocnRow['contact'];
-
-			$_SESSION['tender'.$identifier]->Location= $_POST['StkLocation'];
-			$_SESSION['tender'.$identifier]->DelAdd1 = $_POST['DelAdd1'];
-			$_SESSION['tender'.$identifier]->DelAdd2 = $_POST['DelAdd2'];
-			$_SESSION['tender'.$identifier]->DelAdd3 = $_POST['DelAdd3'];
-			$_SESSION['tender'.$identifier]->DelAdd4 = $_POST['DelAdd4'];
-			$_SESSION['tender'.$identifier]->DelAdd5 = $_POST['DelAdd5'];
-			$_SESSION['tender'.$identifier]->DelAdd6 = $_POST['DelAdd6'];
-			$_SESSION['tender'.$identifier]->Telephone = $_POST['Tel'];
-			$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
-		}
-	}
-	echo '<tr>
-			<td>' . _('Warehouse') . ':</td>
-			<td><select name="StkLocation" onchange="ReloadForm(form1.LookupDeliveryAddress)">';
-
-	$sql = "SELECT loccode,
-					locationname
-					FROM locations";
-	$LocnResult = DB_query($sql,$db);
-
-	while ($LocnRow=DB_fetch_array($LocnResult)){
-		if ((isset($_SESSION['tender'.$identifier]->Location) and $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
-			echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
-		} else {
-			echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
-		}
-	}
-
-	echo '</select>
-		<input type="submit" name="LookupDeliveryAddress" value="' ._('Select') . '" /></td>
-		</tr>';
-
-	/* Display the details of the delivery location
-	 */
-	echo '<tr>
-			<td>' . _('Delivery Contact') . ':</td>
-			<td><input type="text" name="Contact" size="41"  value="' . $_SESSION['tender'.$identifier]->Contact . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 1 :</td>
-			<td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 2 :</td>
-			<td><input type="text" name="DelAdd2" size="41" maxlength="40" value="' . $_POST['DelAdd2'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 3 :</td>
-			<td><input type="text" name="DelAdd3" size="41" maxlength="40" value="' . $_POST['DelAdd3'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 4 :</td>
-			<td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 5 :</td>
-			<td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Address') . ' 6 :</td>
-			<td><input type="text" name="DelAdd6" size="16" maxlength="15" value="' . $_POST['DelAdd6'] . '" /></td>
-		</tr>';
-	echo '<tr>
-			<td>' . _('Phone') . ':</td>
-			<td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['tender'.$identifier]->Telephone . '" /></td>
-		</tr>';
-	echo '</table><br />';
-
-	/* Display the supplier/item details
-	 */
-	echo '<table>';
-
-	/* Supplier Details
-	 */
-	echo '<tr>
-			<td valign="top">
-			<table class="selection">';
-	echo '<tr>
-			<th colspan="4"><font size="3" color="#616161">' . _('Suppliers To Send Tender') . '</font></th>
-		</tr>';
-	echo '<tr>
-			<th>'. _('Supplier Code') . '</th>
-			<th>' ._('Supplier Name') . '</th>
-			<th>' ._('Email Address') . '</th>
-		</tr>';
-	foreach ($_SESSION['tender'.$identifier]->Suppliers as $Supplier) {
-		echo '<tr>
-				<td>' . $Supplier->SupplierCode . '</td>
-				<td>' . $Supplier->SupplierName . '</td>
-				<td>' . $Supplier->EmailAddress . '</td>
-				<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES,'UTF-8') . '&DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td>
-			</tr>';
-	}
-	echo '</table></td>';
-	/* Item Details
-	 */
-	echo '<td valign="top"><table class="selection">';
-	echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('Items in Tender') . '</font></th></tr>';
-	echo '<tr>
-			<th>'._('Stock ID').'</th>
-			<th>'._('Description').'</th>
-			<th>'._('Quantity').'</th>
-			<th>'._('UOM').'</th>
-		</tr>';
-	$k=0;
-	foreach ($_SESSION['tender'.$identifier]->LineItems as $LineItems) {
-		if ($LineItems->Deleted==False) {
-			if ($k==1){
-				echo '<tr class="EvenTableRows">';
-				$k=0;
-			} else {
-				echo '<tr class="OddTableRows">';
-				$k=1;
-			}
-			echo '<td>'.$LineItems->StockID.'</td>
-				<td>'.$LineItems->ItemDescription.'</td>
-				<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>
-				<td>'.$LineItems->Units.'</td>
-				<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier,ENT_QUOTES,'UTF-8') . '&DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td>
-				</tr>';
-			echo '</tr>';
-		}
-	}
-	echo '</table></td></tr></table><br />';
-
-	echo '<div class="centre">
-			<input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />
-			<input type="submit" name="Items" value="' . _('Select Item Details') . '" />
-		</div>
-		<br />';
-	if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
-		and $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
-
-		echo '<div class="centre">
-				<input type="submit" name="Save" value="' . _('Save Tender') . '" />
-			</div>';
-	}
-	echo '</form>';
-	include('includes/footer.inc');
-	exit;
-}
-
-if (isset($_POST['SearchSupplier']) or isset($_POST['Go'])
-	or isset($_POST['Next']) or isset($_POST['Previous'])) {
-
-	if (mb_strlen($_POST['Keywords']) > 0 and mb_strlen($_POST['SupplierCode']) > 0) {
-		prnMsg( '<br />' . _('Supplier name keywords have been used in preference to the Supplier code extract entered'), 'info' );
-	}
-	if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
-		$SQL = "SELECT supplierid,
-					suppname,
-					currcode,
-					address1,
-					address2,
-					address3,
-					address4
-				FROM suppliers
-				ORDER BY suppname";
-	} else {
-		if (mb_strlen($_POST['Keywords']) > 0) {
-			$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
-			//insert wildcard characters in spaces
-			$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-			$SQL = "SELECT supplierid,
-					suppname,
-					currcode,
-					address1,
-					address2,
-					address3,
-					address4
-				FROM suppliers
-				WHERE suppname " . LIKE . " '$SearchString'
-				ORDER BY suppname";
-		} elseif (mb_strlen($_POST['SupplierCode']) > 0) {
-			$_POST['SupplierCode'] = mb_strtoupper($_POST['SupplierCode']);
-			$SQL = "SELECT supplierid,
-					suppname,
-					currcode,
-					address1,
-					address2,
-					address3,
-					address4
-				FROM suppliers
-				WHERE supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'
-				ORDER BY supplierid";
-		}
-	} //one of keywords or SupplierCode was more than a zero length string
-	$result = DB_query($SQL, $db);
-	if (DB_num_rows($result) == 1) {
-		$myrow = DB_fetch_array($result);
-		$SingleSupplierReturned = $myrow['supplierid'];
-	}
-} //end of if search
-if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
-	$_SESSION['SupplierID'] = $SingleSupplierReturned;
-	unset($_POST['Keywords']);
-	unset($_POST['SupplierCode']);
-}
-
-if (!isset($_POST['PageOffset'])) {
-	$_POST['PageOffset'] = 1;
-} else {
-	if ($_POST['PageOffset'] == 0) {
-		$_POST['PageOffset'] = 1;
-	}
-}
-
-if (isset($_POST['Suppliers'])) {
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES,'UTF-8') . '" method="post">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
-		<table cellpadding="3" class="selection">
-			<tr>
-				<td>' . _('Enter a partial Name') . ':</td>
-				<td>';
-	if (isset($_POST['Keywords'])) {
-		echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
-	} else {
-		echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
-	}
-	echo '</td><td><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Code') . ':</font></td><td>';
-	if (isset($_POST['SupplierCode'])) {
-		echo '<input type="text" name="SupplierCode" value="' . $_POST['SupplierCode'] . '" size="15" maxlength="18" />';
-	} else {
-		echo '<input type="text" name="SupplierCode" size="15" maxlength="18" />';
-	}
-	echo '</td></tr></table><br /><div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Search Now') . '" /></div>';
-	echo '</form>';
-}
-
-if (isset($_POST['SearchSupplier'])) {
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES, 'UTF-8') . '" method="post">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	$ListCount = DB_num_rows($result);
-	$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
-	if (isset($_POST['Next'])) {
-		if ($_POST['PageOffset'] < $ListPageMax) {
-			$_POST['PageOffset'] = $_POST['PageOffset'] + 1;
-		}
-	}
-	if (isset($_POST['Previous'])) {
-		if ($_POST['PageOffset'] > 1) {
-			$_POST['PageOffset'] = $_POST['PageOffset'] - 1;
-		}
-	}
-	if ($ListPageMax > 1) {
-		echo '<br />&nbsp;&nbsp;' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
-		echo '<select name="PageOffset">';
-		$ListPage = 1;
-		while ($ListPage <= $ListPageMax) {
-			if ($ListPage == $_POST['PageOffset']) {
-				echo '<option value="' . $ListPage . '" selected="selected">' . $ListPage . '</option>';
-			} else {
-				echo '<option value="' . $ListPage . '">' . $ListPage . '</option>';
-			}
-			$ListPage++;
-		}
-		echo '</select>
-			<input type="submit" name="Go" value="' . _('Go') . '" />
-			<input type="submit" name="Previous" value="' . _('Previous') . '" />
-			<input type="submit" name="Next" value="' . _('Next') . '" />';
-		echo '<br />';
-	}
-	echo '<input type="hidden" name="Search" value="' . _('Search Now') . '" />';
-	echo '<br />
-		<br />
-		<br />
-		<table cellpadding="2">';
-	echo '<tr>
-	  		<th>' . _('Code') . '</th>
-			<th>' . _('Supplier Name') . '</th>
-			<th>' . _('Currency') . '</th>
-			<th>' . _('Address 1') . '</th>
-			<th>' . _('Address 2') . '</th>
-			<th>' . _('Address 3') . '</th>
-			<th>' . _('Address 4') . '</th>
-		</tr>';
-	$j = 1;
-	$k = 0; //row counter to determine background colour
-	$RowIndex = 0;
-	if (DB_num_rows($result) <> 0) {
-		DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
-	}
-	while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
-		if ($k == 1) {
-			echo '<tr class="EvenTableRows">';
-			$k = 0;
-		} else {
-			echo '<tr class="OddTableRows">';
-			$k = 1;
-		}
-		echo '<td><input type="submit" name="SelectedSupplier" value="'.$myrow['supplierid'].'" /></td>
-			<td>'.$myrow['suppname'].'</td>
-			<td>'.$myrow['currcode'].'</td>
-			<td>'.$myrow['address1'].'</td>
-			<td>'.$myrow['address2'].'</td>
-			<td>'.$myrow['address3'].'</td>
-			<td>'.$myrow['address4'].'</td>
-			</tr>';
-		$RowIndex = $RowIndex + 1;
-		//end of page full new headings if
-	}
-	//end of while loop
-	echo '</table>';
-}
-
-/*The supplier has chosen option 2
- */
-if (isset($_POST['Items'])) {
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES, 'UTF-8') . '" method="post">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items') . '</p>';
-	$sql = "SELECT categoryid,
-				categorydescription
-			FROM stockcategory
-			ORDER BY categorydescription";
-	$result = DB_query($sql, $db);
-	if (DB_num_rows($result) == 0) {
-		echo '<br /><font size="4" color="red">' . _('Problem Report') . ':</font><br />' .
-			_('There are no stock categories currently defined please use the link below to set them up');
-		echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
-		exit;
-	}
-	echo '<table class="selection">
-		<tr>
-			<td>' . _('In Stock Category') . ':<select name="StockCat">';
-	if (!isset($_POST['StockCat'])) {
-		$_POST['StockCat'] = '';
-	}
-	if ($_POST['StockCat'] == 'All') {
-		echo '<option selected="selected" value="All">' . _('All') . '</option>';
-	} else {
-		echo '<option value="All">' . _('All') . '</option>';
-	}
-	while ($myrow1 = DB_fetch_array($result)) {
-		if ($myrow1['categoryid'] == $_POST['StockCat']) {
-			echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
-		} else {
-			echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
-		}
-	}
-	echo '</select></td>
-		<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td>
-		<td>';
-	if (isset($_POST['Keywords'])) {
-		echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
-	} else {
-		echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
-	}
-	echo '</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>
-			<td>';
-	if (isset($_POST['StockCode'])) {
-		echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />';
-	} else {
-		echo '<input type="text" name="StockCode" size="15" maxlength="18" />';
-	}
-	echo '</td></tr>
-		</table>
-		<br />
-		<div class="centre">
-			<input type="submit" name="Search" value="' . _('Search Now') . '" />
-		</div>
-		<br />
-		</form>';
-	echo '<script  type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
-}
-
-if (isset($_POST['Search'])){  /*ie seach for stock items */
-	echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier,ENT_QUOTES,'UTF-8') .'">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Tenders') . '" alt="" />' . ' ' . _('Select items required on this tender').'</p>';
-
-	if ($_POST['Keywords'] and $_POST['StockCode']) {
-		prnMsg( _('Stock description keywords have been used in preference to the Stock code extract entered'), 'info' );
-	}
-	if ($_POST['Keywords']) {
-		//insert wildcard characters in spaces
-		$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
-		if ($_POST['StockCat']=='All'){
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					AND stockmaster.description " . LIKE . " '$SearchString'
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		} else {
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					AND stockmaster.description " . LIKE . " '$SearchString'
-					AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		}
-
-	} elseif ($_POST['StockCode']){
-
-		$_POST['StockCode'] = '%' . $_POST['StockCode'] . '%';
-
-		if ($_POST['StockCat']=='All'){
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		} else {
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
-					AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		}
-
-	} else {
-		if ($_POST['StockCat']=='All'){
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		} else {
-			$sql = "SELECT stockmaster.stockid,
-						stockmaster.description,
-						stockmaster.units
-					FROM stockmaster INNER JOIN stockcategory
-					ON stockmaster.categoryid=stockcategory.categoryid
-					WHERE stockmaster.mbflag!='D'
-					AND stockmaster.mbflag!='A'
-					AND stockmaster.mbflag!='K'
-					AND stockmaster.mbflag!='G'
-					AND stockmaster.discontinued!=1
-					AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
-					ORDER BY stockmaster.stockid
-					LIMIT " . $_SESSION['DisplayRecordsMax'];
-		}
-	}
-
-	$ErrMsg = _('There is a problem selecting the part records to display because');
-	$DbgMsg = _('The SQL statement that failed was');
-	$SearchResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
-	if (DB_num_rows($SearchResult)==0 and $debug==1){
-		prnMsg( _('There are no products to display matching the criteria provided'),'warn');
-	}
-	if (DB_num_rows($SearchResult)==1){
-
-		$myrow=DB_fetch_array($SearchResult);
-		$_GET['NewItem'] = $myrow['stockid'];
-		DB_data_seek($SearchResult,0);
-	}
-
-	if (isset($SearchResult)) {
-
-		echo '<table cellpadding="1">';
-		echo '<tr>
-				<th>' . _('Code')  . '</th>
-				<th>' . _('Description') . '</th>
-				<th>' . _('Units') . '</th>
-				<th>' . _('Image') . '</th>
-				<th>' . _('Quantity') . '</th>
-			</tr>';
-
-		$i = 0;
-		$k = 0; //row colour counter
-		$PartsDisplayed=0;
-		while ($myrow=DB_fetch_array($SearchResult)) {
-
-			if ($k==1){
-				echo '<tr class="EvenTableRows">';
-				$k=0;
-			} else {
-				echo '<tr class="OddTableRows">';
-				$k=1;
-			}
-
-			$FileName = $myrow['stockid'] . '.jpg';
-			if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
-
-				$ImageSource = '<img src="'.$rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $FileName . '" width="50" height="50" />';
-
-			} else {
-				$ImageSource = '<i>'._('No Image').'</i>';
-			}
-
-			echo '<td>'.$myrow['stockid'].'</td>
-					<td>'.$myrow['description'].'</td>
-					<td>'.$myrow['units'].'</td>
-					<td>'.$ImageSource.'</td>
-					<td><input class="number" type="text" size="6" value="0" name="Qty'.$i.'" /></td>
-					<input type="hidden" value="'.$myrow['units'].'" name="UOM'.$i.'" />
-					<input type="hidden" value="'.$myrow['stockid'].'" name="StockID'.$i.'" />
-					</tr>';
-
-			$i++;
-#end of page full new headings if
-		}
-#end of while loop
-		echo '</table>';
-
-		echo '<a name="end"></a>
-			<br />
-			<div class="centre">
-				<input type="submit" name="NewItem" value="' . _('Add to Tender') . '" />
-			</div>';
-	}#end if SearchResults to show
-
-	echo '</form>';
-
-} //end of if search
-
-include('includes/footer.inc');
-
+<?php
+/* $Id: SupplierTenderCreate.php 4821 2012-01-20 13:48:53Z tim_schofield $ */
+
+include('includes/DefineTenderClass.php');
+include('includes/SQL_CommonFunctions.inc');
+include('includes/session.inc');
+
+if (empty($_GET['identifier'])) {
+	/*unique session identifier to ensure that there is no conflict with other supplier tender sessions on the same machine  */
+	$identifier=date('U');
+} else {
+	$identifier=$_GET['identifier'];
+}
+
+if (isset($_GET['New']) and isset($_SESSION['tender'.$identifier])) {
+	unset($_SESSION['tender'.$identifier]);
+}
+
+if (isset($_GET['New']) and $_SESSION['CanCreateTender']==0) {
+	$title = _('Authorisation Problem');
+	include('includes/header.inc');
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . $title . '" alt="" />  '.$title . '</p>';
+	prnMsg( _('You do not have authority to create supplier tenders for this company.') . '<br />' .
+			_('Please see your system administrator'), 'warn');
+	include('includes/footer.inc');
+	exit;
+}
+
+if (isset($_GET['Edit']) and $_SESSION['CanCreateTender']==0) {
+	$title = _('Authorisation Problem');
+	include('includes/header.inc');
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . $title . '" alt="" />  '.$title . '</p>';
+	prnMsg( _('You do not have authority to amend supplier tenders for this company.') . '<br />' .
+			_('Please see your system administrator'), 'warn');
+	include('includes/footer.inc');
+	exit;
+}
+
+$ShowTender = 0;
+
+if (isset($_GET['ID'])) {
+	$sql="SELECT tenderid,
+				location,
+				address1,
+				address2,
+				address3,
+				address4,
+				address5,
+				address6,
+				telephone
+			FROM tenders
+			WHERE tenderid='" . $_GET['ID'] . "'";
+	$result=DB_query($sql, $db);
+	$myrow=DB_fetch_array($result);
+	if (isset($_SESSION['tender'.$identifier])) {
+		unset($_SESSION['tender'.$identifier]);
+	}
+	$_SESSION['tender'.$identifier] = new Tender();
+	$_SESSION['tender'.$identifier]->TenderId = $myrow['tenderid'];
+	$_SESSION['tender'.$identifier]->Location = $myrow['location'];
+	$_SESSION['tender'.$identifier]->DelAdd1 = $myrow['address1'];
+	$_SESSION['tender'.$identifier]->DelAdd2 = $myrow['address2'];
+	$_SESSION['tender'.$identifier]->DelAdd3 = $myrow['address3'];
+	$_SESSION['tender'.$identifier]->DelAdd4 = $myrow['address4'];
+	$_SESSION['tender'.$identifier]->DelAdd5 = $myrow['address5'];
+	$_SESSION['tender'.$identifier]->DelAdd6 = $myrow['address6'];
+
+	$sql="SELECT tenderid,
+				tendersuppliers.supplierid,
+				suppliers.suppname,
+				tendersuppliers.email
+			FROM tendersuppliers
+			LEFT JOIN suppliers
+			ON tendersuppliers.supplierid=suppliers.supplierid
+			WHERE tenderid='" . $_GET['ID'] . "'";
+	$result=DB_query($sql, $db);
+	while ($myrow=DB_fetch_array($result)) {
+		$_SESSION['tender'.$identifier]->add_supplier_to_tender($myrow['supplierid'],
+																$myrow['suppname'],
+																$myrow['email']);
+	}
+
+	$sql="SELECT tenderid,
+				tenderitems.stockid,
+				tenderitems.quantity,
+				stockmaster.description,
+				tenderitems.units,
+				stockmaster.decimalplaces
+			FROM tenderitems
+			LEFT JOIN stockmaster
+			ON tenderitems.stockid=stockmaster.stockid
+			WHERE tenderid='" . $_GET['ID'] . "'";
+	$result=DB_query($sql, $db);
+	while ($myrow=DB_fetch_array($result)) {
+		$_SESSION['tender'.$identifier]->add_item_to_tender($_SESSION['tender'.$identifier]->LinesOnTender,
+															$myrow['stockid'],
+															$myrow['quantity'],
+															$myrow['description'],
+															$myrow['units'],
+															$myrow['decimalplaces'],
+															DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
+	}
+	$ShowTender = 1;
+}
+
+if (isset($_GET['Edit'])) {
+	$title = _('Edit an Existing Supplier Tender Request');
+	include('includes/header.inc');
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
+	$sql="SELECT tenderid,
+				location,
+				address1,
+				address2,
+				address3,
+				address4,
+				address5,
+				address6,
+				telephone
+			FROM tenders
+			WHERE closed=0";
+	$result=DB_query($sql, $db);
+	echo '<table class="selection">';
+	echo '<tr>
+			<th>' . _('Tender ID') . '</th>
+			<th>' . _('Location') . '</th>
+			<th>' . _('Address 1') . '</th>
+			<th>' . _('Address 2') . '</th>
+			<th>' . _('Address 3') . '</th>
+			<th>' . _('Address 4') . '</th>
+			<th>' . _('Address 5') . '</th>
+			<th>' . _('Address 6') . '</th>
+			<th>' . _('Telephone') . '</th>
+		</tr>';
+	while ($myrow=DB_fetch_array($result)) {
+		echo '<tr>
+				<td>' . $myrow['tenderid'] . '</td>
+				<td>' . $myrow['location'] . '</td>
+				<td>' . $myrow['address1'] . '</td>
+				<td>' . $myrow['address2'] . '</td>
+				<td>' . $myrow['address3'] . '</td>
+				<td>' . $myrow['address4'] . '</td>
+				<td>' . $myrow['address5'] . '</td>
+				<td>' . $myrow['address6'] . '</td>
+				<td>' . $myrow['telephone'] . '</td>
+				<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&amp;ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>
+			</tr>';
+	}
+	echo '</table>';
+	include('includes/footer.inc');
+	exit;
+} else if (isset($_GET['ID']) or (isset($_SESSION['tender'.$identifier]->TenderId))) {
+	$title = _('Edit an Existing Supplier Tender Request');
+	include('includes/header.inc');
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
+} else {
+	$title = _('Create a New Supplier Tender Request');
+	include('includes/header.inc');
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order Tendering') . '" alt="" />  '.$title . '</p>';
+}
+
+if (isset($_POST['Save'])) {
+	$_SESSION['tender'.$identifier]->RequiredByDate=$_POST['RequiredByDate'];
+	$_SESSION['tender'.$identifier]->save($db);
+	$_SESSION['tender'.$identifier]->EmailSuppliers();
+	prnMsg( _('The tender has been successfully saved'), 'success');
+	include('includes/footer.inc');
+	exit;
+}
+
+if (isset($_GET['DeleteSupplier'])) {
+	$_SESSION['tender'.$identifier]->remove_supplier_from_tender($_GET['DeleteSupplier']);
+	$ShowTender = 1;
+}
+
+if (isset($_GET['DeleteItem'])) {
+	$_SESSION['tender'.$identifier]->remove_item_from_tender($_GET['DeleteItem']);
+	$ShowTender = 1;
+}
+
+if (isset($_POST['SelectedSupplier'])) {
+	$sql = "SELECT suppname,
+					email
+				FROM suppliers
+				WHERE supplierid='" . $_POST['SelectedSupplier'] . "'";
+	$result = DB_query($sql, $db);
+	$myrow = DB_fetch_array($result);
+	if (mb_strlen($myrow['email'])>0) {
+		$_SESSION['tender'.$identifier]->add_supplier_to_tender($_POST['SelectedSupplier'],
+																$myrow['suppname'],
+																$myrow['email']);
+	} else {
+		prnMsg( _('The supplier must have an email set up or they cannot be part of a tender'), 'warn');
+	}
+	$ShowTender = 1;
+}
+
+if (isset($_POST['NewItem']) and !isset($_POST['Refresh'])) {
+	foreach ($_POST as $key => $value) {
+		if (mb_substr($key,0,7)=='StockID') {
+			$Index = mb_substr($key,7,mb_strlen($key)-7);
+			$StockID = $value;
+			$Quantity = filter_number_format($_POST['Qty'.$Index]);
+			$UOM = $_POST['UOM'.$Index];
+			$sql="SELECT description, decimalplaces FROM stockmaster WHERE stockid='".$StockID."'";
+			$result=DB_query($sql, $db);
+			$myrow=DB_fetch_array($result);
+			$_SESSION['tender'.$identifier]->add_item_to_tender($_SESSION['tender'.$identifier]->LinesOnTender,
+																$StockID,
+																$Quantity,
+																$myrow['description'],
+																$UOM,
+																$myrow['decimalplaces'],
+																DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
+			unset($UOM);
+		}
+	}
+	$ShowTender = 1;
+}
+
+if (!isset($_SESSION['tender'.$identifier])
+	or isset($_POST['LookupDeliveryAddress'])
+	or $ShowTender==1) {
+
+	/* Show Tender header screen */
+	if (!isset($_SESSION['tender'.$identifier])) {
+		$_SESSION['tender'.$identifier]=new Tender();
+	}
+	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
+    echo '<div>';
+	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	echo '<table class="selection">';
+	echo '<tr>
+			<th colspan="4"><h3>' . _('Tender header details') . '</h3></th>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Delivery Must Be Made Before') . '</td>
+			<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
+		</tr>';
+
+	if (!isset($_POST['StkLocation']) or $_POST['StkLocation']==''){
+	/* If this is the first time
+	* the form loaded set up defaults */
+
+		$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
+
+		$sql = "SELECT deladd1,
+						deladd2,
+						deladd3,
+						deladd4,
+						deladd5,
+						deladd6,
+						tel,
+						contact
+					FROM locations
+					WHERE loccode='" . $_POST['StkLocation'] . "'";
+
+		$LocnAddrResult = DB_query($sql,$db);
+		if (DB_num_rows($LocnAddrResult)==1){
+			$LocnRow = DB_fetch_array($LocnAddrResult);
+			$_POST['DelAdd1'] = $LocnRow['deladd1'];
+			$_POST['DelAdd2'] = $LocnRow['deladd2'];
+			$_POST['DelAdd3'] = $LocnRow['deladd3'];
+			$_POST['DelAdd4'] = $LocnRow['deladd4'];
+			$_POST['DelAdd5'] = $LocnRow['deladd5'];
+			$_POST['DelAdd6'] = $LocnRow['deladd6'];
+			$_POST['Tel'] = $LocnRow['tel'];
+			$_POST['Contact'] = $LocnRow['contact'];
+
+			$_SESSION['tender'.$identifier]->Location= $_POST['StkLocation'];
+			$_SESSION['tender'.$identifier]->DelAdd1 = $_POST['DelAdd1'];
+			$_SESSION['tender'.$identifier]->DelAdd2 = $_POST['DelAdd2'];
+			$_SESSION['tender'.$identifier]->DelAdd3 = $_POST['DelAdd3'];
+			$_SESSION['tender'.$identifier]->DelAdd4 = $_POST['DelAdd4'];
+			$_SESSION['tender'.$identifier]->DelAdd5 = $_POST['DelAdd5'];
+			$_SESSION['tender'.$identifier]->DelAdd6 = $_POST['DelAdd6'];
+			$_SESSION['tender'.$identifier]->Telephone = $_POST['Tel'];
+			$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
+
+		} else {
+			 /*The default location of the user is crook */
+			prnMsg(_('The default stock location set up for this user is not a currently defined stock location') .
+				'. ' . _('Your system administrator needs to amend your user record'),'error');
+		}
+
+
+	} elseif (isset($_POST['LookupDeliveryAddress'])){
+
+		$sql = "SELECT deladd1,
+						deladd2,
+						deladd3,
+						deladd4,
+						deladd5,
+						deladd6,
+						tel,
+						contact
+					FROM locations
+					WHERE loccode='" . $_POST['StkLocation'] . "'";
+
+		$LocnAddrResult = DB_query($sql,$db);
+		if (DB_num_rows($LocnAddrResult)==1){
+			$LocnRow = DB_fetch_array($LocnAddrResult);
+			$_POST['DelAdd1'] = $LocnRow['deladd1'];
+			$_POST['DelAdd2'] = $LocnRow['deladd2'];
+			$_POST['DelAdd3'] = $LocnRow['deladd3'];
+			$_POST['DelAdd4'] = $LocnRow['deladd4'];
+			$_POST['DelAdd5'] = $LocnRow['deladd5'];
+			$_POST['DelAdd6'] = $LocnRow['deladd6'];
+			$_POST['Tel'] = $LocnRow['tel'];
+			$_POST['Contact'] = $LocnRow['contact'];
+
+			$_SESSION['tender'.$identifier]->Location= $_POST['StkLocation'];
+			$_SESSION['tender'.$identifier]->DelAdd1 = $_POST['DelAdd1'];
+			$_SESSION['tender'.$identifier]->DelAdd2 = $_POST['DelAdd2'];
+			$_SESSION['tender'.$identifier]->DelAdd3 = $_POST['DelAdd3'];
+			$_SESSION['tender'.$identifier]->DelAdd4 = $_POST['DelAdd4'];
+			$_SESSION['tender'.$identifier]->DelAdd5 = $_POST['DelAdd5'];
+			$_SESSION['tender'.$identifier]->DelAdd6 = $_POST['DelAdd6'];
+			$_SESSION['tender'.$identifier]->Telephone = $_POST['Tel'];
+			$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
+		}
+	}
+	echo '<tr>
+			<td>' . _('Warehouse') . ':</td>
+			<td><select name="StkLocation" onchange="ReloadForm(form1.LookupDeliveryAddress)">';
+
+	$sql = "SELECT loccode,
+					locationname
+					FROM locations";
+	$LocnResult = DB_query($sql,$db);
+
+	while ($LocnRow=DB_fetch_array($LocnResult)){
+		if ((isset($_SESSION['tender'.$identifier]->Location) and $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
+			echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
+		} else {
+			echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
+		}
+	}
+
+	echo '</select>
+		<input type="submit" name="LookupDeliveryAddress" value="' ._('Select') . '" /></td>
+		</tr>';
+
+	/* Display the details of the delivery location
+	 */
+	echo '<tr>
+			<td>' . _('Delivery Contact') . ':</td>
+			<td><input type="text" name="Contact" size="41"  value="' . $_SESSION['tender'.$identifier]->Contact . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 1 :</td>
+			<td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 2 :</td>
+			<td><input type="text" name="DelAdd2" size="41" maxlength="40" value="' . $_POST['DelAdd2'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 3 :</td>
+			<td><input type="text" name="DelAdd3" size="41" maxlength="40" value="' . $_POST['DelAdd3'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 4 :</td>
+			<td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 5 :</td>
+			<td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Address') . ' 6 :</td>
+			<td><input type="text" name="DelAdd6" size="16" maxlength="15" value="' . $_POST['DelAdd6'] . '" /></td>
+		</tr>';
+	echo '<tr>
+			<td>' . _('Phone') . ':</td>
+			<td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['tender'.$identifier]->Telephone . '" /></td>
+		</tr>';
+	echo '</table><br />';
+
+	/* Display the supplier/item details
+	 */
+	echo '<table>';
+
+	/* Supplier Details
+	 */
+	echo '<tr>
+			<td valign="top">
+			<table class="selection">';
+	echo '<tr>
+			<th colspan="4"><h3>' . _('Suppliers To Send Tender') . '</h3></th>
+		</tr>';
+	echo '<tr>
+			<th>'. _('Supplier Code') . '</th>
+			<th>' ._('Supplier Name') . '</th>
+			<th>' ._('Email Address') . '</th>
+		</tr>';
+	foreach ($_SESSION['tender'.$identifier]->Suppliers as $Supplier) {
+		echo '<tr>
+				<td>' . $Supplier->SupplierCode . '</td>
+				<td>' . $Supplier->SupplierName . '</td>
+				<td>' . $Supplier->EmailAddress . '</td>
+				<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES,'UTF-8') . '&amp;DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td>
+			</tr>';
+	}
+	echo '</table></td>';
+	/* Item Details
+	 */
+	echo '<td valign="top"><table class="selection">';
+	echo '<tr><th colspan="6"><h3>' . _('Items in Tender') . '</h3></th></tr>';
+	echo '<tr>
+			<th>'._('Stock ID').'</th>
+			<th>'._('Description').'</th>
+			<th>'._('Quantity').'</th>
+			<th>'._('UOM').'</th>
+		</tr>';
+	$k=0;
+	foreach ($_SESSION['tender'.$identifier]->LineItems as $LineItems) {
+		if ($LineItems->Deleted==False) {
+			if ($k==1){
+				echo '<tr class="EvenTableRows">';
+				$k=0;
+			} else {
+				echo '<tr class="OddTableRows">';
+				$k=1;
+			}
+			echo '<td>'.$LineItems->StockID.'</td>
+				<td>'.$LineItems->ItemDescription.'</td>
+				<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>
+				<td>'.$LineItems->Units.'</td>
+				<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier,ENT_QUOTES,'UTF-8') . '&amp;DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td>
+				</tr>';
+		}
+	}
+	echo '</table></td></tr></table><br />';
+
+	echo '<div class="centre">
+			<input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />
+			<input type="submit" name="Items" value="' . _('Select Item Details') . '" />
+		</div>
+		<br />';
+	if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
+		and $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
+
+		echo '<div class="centre">
+				<input type="submit" name="Save" value="' . _('Save Tender') . '" />
+			</div>';
+	}
+	echo '</div>
+          </form>';
+	include('includes/footer.inc');
+	exit;
+}
+
+if (isset($_POST['SearchSupplier']) or isset($_POST['Go'])
+	or isset($_POST['Next']) or isset($_POST['Previous'])) {
+
+	if (mb_strlen($_POST['Keywords']) > 0 and mb_strlen($_POST['SupplierCode']) > 0) {
+		prnMsg( '<br />' . _('Supplier name keywords have been used in preference to the Supplier code extract entered'), 'info' );
+	}
+	if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
+		$SQL = "SELECT supplierid,
+					suppname,
+					currcode,
+					address1,
+					address2,
+					address3,
+					address4
+				FROM suppliers
+				ORDER BY suppname";
+	} else {
+		if (mb_strlen($_POST['Keywords']) > 0) {
+			$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
+			//insert wildcard characters in spaces
+			$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+			$SQL = "SELECT supplierid,
+					suppname,
+					currcode,
+					address1,
+					address2,
+					address3,
+					address4
+				FROM suppliers
+				WHERE suppname " . LIKE . " '$SearchString'
+				ORDER BY suppname";
+		} elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+			$_POST['SupplierCode'] = mb_strtoupper($_POST['SupplierCode']);
+			$SQL = "SELECT supplierid,
+					suppname,
+					currcode,
+					address1,
+					address2,
+					address3,
+					address4
+				FROM suppliers
+				WHERE supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'
+				ORDER BY supplierid";
+		}
+	} //one of keywords or SupplierCode was more than a zero length string
+	$result = DB_query($SQL, $db);
+	if (DB_num_rows($result) == 1) {
+		$myrow = DB_fetch_array($result);
+		$SingleSupplierReturned = $myrow['supplierid'];
+	}
+} //end of if search
+if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
+	$_SESSION['SupplierID'] = $SingleSupplierReturned;
+	unset($_POST['Keywords']);
+	unset($_POST['SupplierCode']);
+}
+
+if (!isset($_POST['PageOffset'])) {
+	$_POST['PageOffset'] = 1;
+} else {
+	if ($_POST['PageOffset'] == 0) {
+		$_POST['PageOffset'] = 1;
+	}
+}
+
+if (isset($_POST['Suppliers'])) {
+	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES,'UTF-8') . '" method="post">';
+    echo '<div>';
+	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
+		<table cellpadding="3" class="selection">
+			<tr>
+				<td>' . _('Enter a partial Name') . ':</td>
+				<td>';
+	if (isset($_POST['Keywords'])) {
+		echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
+	} else {
+		echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
+	}
+	echo '</td><td><b>' . _('OR') . '</b></td><td>' . _('Enter a partial Code') . ':</td><td>';
+	if (isset($_POST['SupplierCode'])) {
+		echo '<input type="text" name="SupplierCode" value="' . $_POST['SupplierCode'] . '" size="15" maxlength="18" />';
+	} else {
+		echo '<input type="text" name="SupplierCode" size="15" maxlength="18" />';
+	}
+	echo '</td></tr></table><br /><div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Search Now') . '" /></div>';
+	echo '</div>
+          </form>';
+}
+
+if (isset($_POST['SearchSupplier'])) {
+	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier, ENT_QUOTES, 'UTF-8') . '" method="post">';
+    echo '<div>';
+	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	$ListCount = DB_num_rows($result);
+	$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
+	if (isset($_POST['Next'])) {
+		if ($_POST['PageOffset'] < $ListPageMax) {
+			$_POST['PageOffset'] = $_POST['PageOffset'] + 1;
+		}
+	}
+	if (isset($_POST['Previous'])) {
+		if ($_POST['PageOffset'] > 1) {...
 
[truncated message content]