Menu
▾
▴
web-erp-svn
|
From: <tim...@us...> - 2012-01-22 12:50:48
|
Revision: 4834
http://web-erp.svn.sourceforge.net/web-erp/?rev=4834&view=rev
Author: tim_schofield
Date: 2012-01-22 12:50:41 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Fix for the scenario when multiple tenders are open at the same time and session variable was getting overwritten
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-01-22 10:19:44 UTC (rev 4833)
+++ trunk/SupplierTenderCreate.php 2012-01-22 12:50:41 UTC (rev 4834)
@@ -7,10 +7,17 @@
$Maximum_Number_Of_Parts_To_Show=50;
-if (isset($_GET['New']) AND isset($_SESSION['tender'])) {
- unset($_SESSION['tender']);
+if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
+ unset($_SESSION['tender'.$identifier]);
}
+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 $_SESSION['CanCreateTender']==0) {
$title = _('Authorisation Problem');
include('includes/header.inc');
@@ -47,18 +54,18 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
- if (isset($_SESSION['tender'])) {
- unset($_SESSION['tender']);
+ if (isset($_SESSION['tender'.$identifier])) {
+ unset($_SESSION['tender'.$identifier]);
}
- $_SESSION['tender'] = new Tender();
- $_SESSION['tender']->TenderId = $myrow['tenderid'];
- $_SESSION['tender']->Location = $myrow['location'];
- $_SESSION['tender']->DelAdd1 = $myrow['address1'];
- $_SESSION['tender']->DelAdd2 = $myrow['address2'];
- $_SESSION['tender']->DelAdd3 = $myrow['address3'];
- $_SESSION['tender']->DelAdd4 = $myrow['address4'];
- $_SESSION['tender']->DelAdd5 = $myrow['address5'];
- $_SESSION['tender']->DelAdd6 = $myrow['address6'];
+ $_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,
@@ -70,7 +77,7 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
while ($myrow=DB_fetch_array($result)) {
- $_SESSION['tender']->add_supplier_to_tender(
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender(
$myrow['supplierid'],
$myrow['suppname'],
$myrow['email']);
@@ -88,8 +95,8 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
while ($myrow=DB_fetch_array($result)) {
- $_SESSION['tender']->add_item_to_tender(
- $_SESSION['tender']->LinesOnTender,
+ $_SESSION['tender'.$identifier]->add_item_to_tender(
+ $_SESSION['tender'.$identifier]->LinesOnTender,
$myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
@@ -136,12 +143,12 @@
echo '<td>' . $myrow['address5'] . '</td>';
echo '<td>' . $myrow['address6'] . '</td>';
echo '<td>' . $myrow['telephone'] . '</td>';
- echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
+ echo '<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?identifier='.$identifier.'&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
}
echo '</table>';
include('includes/footer.inc');
exit;
-} else if (isset($_GET['ID']) or (isset($_SESSION['tender']->TenderId))) {
+} 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>';
@@ -152,21 +159,21 @@
}
if (isset($_POST['Save'])) {
- $_SESSION['tender']->RequiredByDate=$_POST['RequiredByDate'];
- $_SESSION['tender']->save($db);
- $_SESSION['tender']->EmailSuppliers();
+ $_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']->remove_supplier_from_tender($_GET['DeleteSupplier']);
+ $_SESSION['tender'.$identifier]->remove_supplier_from_tender($_GET['DeleteSupplier']);
$ShowTender = 1;
}
if (isset($_GET['DeleteItem'])) {
- $_SESSION['tender']->remove_item_from_tender($_GET['DeleteItem']);
+ $_SESSION['tender'.$identifier]->remove_item_from_tender($_GET['DeleteItem']);
$ShowTender = 1;
}
@@ -178,7 +185,7 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
if (mb_strlen($myrow['email'])>0) {
- $_SESSION['tender']->add_supplier_to_tender(
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender(
$_POST['SelectedSupplier'],
$myrow['suppname'],
$myrow['email']);
@@ -198,8 +205,8 @@
$sql="SELECT description, decimalplaces FROM stockmaster WHERE stockid='".$StockID."'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
- $_SESSION['tender']->add_item_to_tender(
- $_SESSION['tender']->LinesOnTender,
+ $_SESSION['tender'.$identifier]->add_item_to_tender(
+ $_SESSION['tender'.$identifier]->LinesOnTender,
$StockID,
$Quantity,
$myrow['description'],
@@ -212,12 +219,12 @@
$ShowTender = 1;
}
-if (!isset($_SESSION['tender']) or isset($_POST['LookupDeliveryAddress']) or $ShowTender==1) {
+if (!isset($_SESSION['tender'.$identifier]) or isset($_POST['LookupDeliveryAddress']) or $ShowTender==1) {
/* Show Tender header screen */
- if (!isset($_SESSION['tender'])) {
- $_SESSION['tender']=new Tender();
+ if (!isset($_SESSION['tender'.$identifier])) {
+ $_SESSION['tender'.$identifier]=new Tender();
}
- echo '<form name="form1" action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?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>';
@@ -253,15 +260,15 @@
$_POST['Tel'] = $LocnRow['tel'];
$_POST['Contact'] = $LocnRow['contact'];
- $_SESSION['tender']->Location= $_POST['StkLocation'];
- $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
- $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
- $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
- $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
- $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
- $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
- $_SESSION['tender']->Telephone = $_POST['Tel'];
- $_SESSION['tender']->Contact = $_POST['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 */
@@ -295,15 +302,15 @@
$_POST['Tel'] = $LocnRow['tel'];
$_POST['Contact'] = $LocnRow['contact'];
- $_SESSION['tender']->Location= $_POST['StkLocation'];
- $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
- $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
- $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
- $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
- $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
- $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
- $_SESSION['tender']->Telephone = $_POST['Tel'];
- $_SESSION['tender']->Contact = $_POST['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>
@@ -315,7 +322,7 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if ((isset($_SESSION['tender']->Location) AND $_SESSION['tender']->Location == $LocnRow['loccode'])){
+ if ((isset($_SESSION['tender'.$identifier]->Location) AND $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
echo '<option selected="True" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
@@ -329,7 +336,7 @@
/* Display the details of the delivery location
*/
echo '<tr><td>' . _('Delivery Contact') . ':</td>
- <td><input type="text" name="Contact" size="41" value="' . $_SESSION['tender']->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>
@@ -350,7 +357,7 @@
<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']->Telephone . '" /></td>
+ <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['tender'.$identifier]->Telephone . '" /></td>
</tr>';
echo '</table><br />';
@@ -363,11 +370,11 @@
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']->Suppliers as $Supplier) {
+ foreach ($_SESSION['tender'.$identifier]->Suppliers as $Supplier) {
echo '<tr><td>' . $Supplier->SupplierCode . '</td>';
echo '<td>' . $Supplier->SupplierName . '</td>';
echo '<td>' . $Supplier->EmailAddress . '</td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
}
echo '</table></td>';
/* Item Details
@@ -381,7 +388,7 @@
echo '<th>'._('UOM').'</th>';
echo '</tr>';
$k=0;
- foreach ($_SESSION['tender']->LineItems as $LineItems) {
+ foreach ($_SESSION['tender'.$identifier]->LineItems as $LineItems) {
if ($LineItems->Deleted==False) {
if ($k==1){
echo '<tr class="EvenTableRows">';
@@ -394,7 +401,7 @@
echo '<td>'.$LineItems->ItemDescription.'</td>';
echo '<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>';
echo '<td>'.$LineItems->Units.'</td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
echo '</tr>';
}
}
@@ -402,7 +409,7 @@
echo '<div class="centre"><input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />';
echo '<input type="submit" name="Items" value="' . _('Select Item Details') . '" /></div><br />';
- if ($_SESSION['tender']->LinesOnTender > 0 AND $_SESSION['tender']->SuppliersOnTender > 0) {
+ 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>';
@@ -474,7 +481,7 @@
}
if (isset($_POST['Suppliers'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" 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" colspan="4" class="selection"><tr><td>' . _('Enter a partial Name') . ':</td><td>';
@@ -494,7 +501,7 @@
}
if (isset($_POST['SearchSupplier'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($result);
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
@@ -573,7 +580,7 @@
/*The supplier has chosen option 2
*/
if (isset($_POST['Items'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" 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,
@@ -636,7 +643,7 @@
}
if (isset($_POST['Search'])){ /*ie seach for stock items */
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] .'">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) .'">';
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>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-22 12:50:48
|
Revision: 4834
http://web-erp.svn.sourceforge.net/web-erp/?rev=4834&view=rev
Author: tim_schofield
Date: 2012-01-22 12:50:41 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Fix for the scenario when multiple tenders are open at the same time and session variable was getting overwritten
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-01-22 10:19:44 UTC (rev 4833)
+++ trunk/SupplierTenderCreate.php 2012-01-22 12:50:41 UTC (rev 4834)
@@ -7,10 +7,17 @@
$Maximum_Number_Of_Parts_To_Show=50;
-if (isset($_GET['New']) AND isset($_SESSION['tender'])) {
- unset($_SESSION['tender']);
+if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
+ unset($_SESSION['tender'.$identifier]);
}
+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 $_SESSION['CanCreateTender']==0) {
$title = _('Authorisation Problem');
include('includes/header.inc');
@@ -47,18 +54,18 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
- if (isset($_SESSION['tender'])) {
- unset($_SESSION['tender']);
+ if (isset($_SESSION['tender'.$identifier])) {
+ unset($_SESSION['tender'.$identifier]);
}
- $_SESSION['tender'] = new Tender();
- $_SESSION['tender']->TenderId = $myrow['tenderid'];
- $_SESSION['tender']->Location = $myrow['location'];
- $_SESSION['tender']->DelAdd1 = $myrow['address1'];
- $_SESSION['tender']->DelAdd2 = $myrow['address2'];
- $_SESSION['tender']->DelAdd3 = $myrow['address3'];
- $_SESSION['tender']->DelAdd4 = $myrow['address4'];
- $_SESSION['tender']->DelAdd5 = $myrow['address5'];
- $_SESSION['tender']->DelAdd6 = $myrow['address6'];
+ $_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,
@@ -70,7 +77,7 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
while ($myrow=DB_fetch_array($result)) {
- $_SESSION['tender']->add_supplier_to_tender(
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender(
$myrow['supplierid'],
$myrow['suppname'],
$myrow['email']);
@@ -88,8 +95,8 @@
WHERE tenderid='" . $_GET['ID'] . "'";
$result=DB_query($sql, $db);
while ($myrow=DB_fetch_array($result)) {
- $_SESSION['tender']->add_item_to_tender(
- $_SESSION['tender']->LinesOnTender,
+ $_SESSION['tender'.$identifier]->add_item_to_tender(
+ $_SESSION['tender'.$identifier]->LinesOnTender,
$myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
@@ -136,12 +143,12 @@
echo '<td>' . $myrow['address5'] . '</td>';
echo '<td>' . $myrow['address6'] . '</td>';
echo '<td>' . $myrow['telephone'] . '</td>';
- echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
+ echo '<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?identifier='.$identifier.'&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
}
echo '</table>';
include('includes/footer.inc');
exit;
-} else if (isset($_GET['ID']) or (isset($_SESSION['tender']->TenderId))) {
+} 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>';
@@ -152,21 +159,21 @@
}
if (isset($_POST['Save'])) {
- $_SESSION['tender']->RequiredByDate=$_POST['RequiredByDate'];
- $_SESSION['tender']->save($db);
- $_SESSION['tender']->EmailSuppliers();
+ $_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']->remove_supplier_from_tender($_GET['DeleteSupplier']);
+ $_SESSION['tender'.$identifier]->remove_supplier_from_tender($_GET['DeleteSupplier']);
$ShowTender = 1;
}
if (isset($_GET['DeleteItem'])) {
- $_SESSION['tender']->remove_item_from_tender($_GET['DeleteItem']);
+ $_SESSION['tender'.$identifier]->remove_item_from_tender($_GET['DeleteItem']);
$ShowTender = 1;
}
@@ -178,7 +185,7 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
if (mb_strlen($myrow['email'])>0) {
- $_SESSION['tender']->add_supplier_to_tender(
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender(
$_POST['SelectedSupplier'],
$myrow['suppname'],
$myrow['email']);
@@ -198,8 +205,8 @@
$sql="SELECT description, decimalplaces FROM stockmaster WHERE stockid='".$StockID."'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
- $_SESSION['tender']->add_item_to_tender(
- $_SESSION['tender']->LinesOnTender,
+ $_SESSION['tender'.$identifier]->add_item_to_tender(
+ $_SESSION['tender'.$identifier]->LinesOnTender,
$StockID,
$Quantity,
$myrow['description'],
@@ -212,12 +219,12 @@
$ShowTender = 1;
}
-if (!isset($_SESSION['tender']) or isset($_POST['LookupDeliveryAddress']) or $ShowTender==1) {
+if (!isset($_SESSION['tender'.$identifier]) or isset($_POST['LookupDeliveryAddress']) or $ShowTender==1) {
/* Show Tender header screen */
- if (!isset($_SESSION['tender'])) {
- $_SESSION['tender']=new Tender();
+ if (!isset($_SESSION['tender'.$identifier])) {
+ $_SESSION['tender'.$identifier]=new Tender();
}
- echo '<form name="form1" action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?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>';
@@ -253,15 +260,15 @@
$_POST['Tel'] = $LocnRow['tel'];
$_POST['Contact'] = $LocnRow['contact'];
- $_SESSION['tender']->Location= $_POST['StkLocation'];
- $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
- $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
- $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
- $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
- $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
- $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
- $_SESSION['tender']->Telephone = $_POST['Tel'];
- $_SESSION['tender']->Contact = $_POST['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 */
@@ -295,15 +302,15 @@
$_POST['Tel'] = $LocnRow['tel'];
$_POST['Contact'] = $LocnRow['contact'];
- $_SESSION['tender']->Location= $_POST['StkLocation'];
- $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
- $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
- $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
- $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
- $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
- $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
- $_SESSION['tender']->Telephone = $_POST['Tel'];
- $_SESSION['tender']->Contact = $_POST['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>
@@ -315,7 +322,7 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if ((isset($_SESSION['tender']->Location) AND $_SESSION['tender']->Location == $LocnRow['loccode'])){
+ if ((isset($_SESSION['tender'.$identifier]->Location) AND $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
echo '<option selected="True" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
@@ -329,7 +336,7 @@
/* Display the details of the delivery location
*/
echo '<tr><td>' . _('Delivery Contact') . ':</td>
- <td><input type="text" name="Contact" size="41" value="' . $_SESSION['tender']->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>
@@ -350,7 +357,7 @@
<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']->Telephone . '" /></td>
+ <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['tender'.$identifier]->Telephone . '" /></td>
</tr>';
echo '</table><br />';
@@ -363,11 +370,11 @@
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']->Suppliers as $Supplier) {
+ foreach ($_SESSION['tender'.$identifier]->Suppliers as $Supplier) {
echo '<tr><td>' . $Supplier->SupplierCode . '</td>';
echo '<td>' . $Supplier->SupplierName . '</td>';
echo '<td>' . $Supplier->EmailAddress . '</td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
}
echo '</table></td>';
/* Item Details
@@ -381,7 +388,7 @@
echo '<th>'._('UOM').'</th>';
echo '</tr>';
$k=0;
- foreach ($_SESSION['tender']->LineItems as $LineItems) {
+ foreach ($_SESSION['tender'.$identifier]->LineItems as $LineItems) {
if ($LineItems->Deleted==False) {
if ($k==1){
echo '<tr class="EvenTableRows">';
@@ -394,7 +401,7 @@
echo '<td>'.$LineItems->ItemDescription.'</td>';
echo '<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>';
echo '<td>'.$LineItems->Units.'</td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
echo '</tr>';
}
}
@@ -402,7 +409,7 @@
echo '<div class="centre"><input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />';
echo '<input type="submit" name="Items" value="' . _('Select Item Details') . '" /></div><br />';
- if ($_SESSION['tender']->LinesOnTender > 0 AND $_SESSION['tender']->SuppliersOnTender > 0) {
+ 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>';
@@ -474,7 +481,7 @@
}
if (isset($_POST['Suppliers'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" 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" colspan="4" class="selection"><tr><td>' . _('Enter a partial Name') . ':</td><td>';
@@ -494,7 +501,7 @@
}
if (isset($_POST['SearchSupplier'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($result);
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
@@ -573,7 +580,7 @@
/*The supplier has chosen option 2
*/
if (isset($_POST['Items'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" 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,
@@ -636,7 +643,7 @@
}
if (isset($_POST['Search'])){ /*ie seach for stock items */
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] .'">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) .'">';
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>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-12 10:54:01
|
Revision: 4890
http://web-erp.svn.sourceforge.net/web-erp/?rev=4890&view=rev
Author: tim_schofield
Date: 2012-02-12 10:53:55 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Fix so that $identifier is created before anything else is done
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-12 03:51:25 UTC (rev 4889)
+++ trunk/SupplierTenderCreate.php 2012-02-12 10:53:55 UTC (rev 4890)
@@ -7,10 +7,6 @@
$Maximum_Number_Of_Parts_To_Show=50;
-if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
- unset($_SESSION['tender'.$identifier]);
-}
-
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');
@@ -18,6 +14,10 @@
$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');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-12 10:54:02
|
Revision: 4890
http://web-erp.svn.sourceforge.net/web-erp/?rev=4890&view=rev
Author: tim_schofield
Date: 2012-02-12 10:53:55 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Fix so that $identifier is created before anything else is done
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-12 03:51:25 UTC (rev 4889)
+++ trunk/SupplierTenderCreate.php 2012-02-12 10:53:55 UTC (rev 4890)
@@ -7,10 +7,6 @@
$Maximum_Number_Of_Parts_To_Show=50;
-if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
- unset($_SESSION['tender'.$identifier]);
-}
-
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');
@@ -18,6 +14,10 @@
$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');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-14 19:13:14
|
Revision: 4896
http://web-erp.svn.sourceforge.net/web-erp/?rev=4896&view=rev
Author: tim_schofield
Date: 2012-02-14 19:13:07 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Replace DB_fetch_row() function with DB_fetch_array()
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-14 05:18:13 UTC (rev 4895)
+++ trunk/SupplierTenderCreate.php 2012-02-14 19:13:07 UTC (rev 4896)
@@ -462,8 +462,8 @@
} //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_row($result);
- $SingleSupplierReturned = $myrow[0];
+ $myrow = DB_fetch_array($result);
+ $SingleSupplierReturned = $myrow['supplierid'];
}
} //end of if search
if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-14 19:13:16
|
Revision: 4896
http://web-erp.svn.sourceforge.net/web-erp/?rev=4896&view=rev
Author: tim_schofield
Date: 2012-02-14 19:13:07 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Replace DB_fetch_row() function with DB_fetch_array()
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-14 05:18:13 UTC (rev 4895)
+++ trunk/SupplierTenderCreate.php 2012-02-14 19:13:07 UTC (rev 4896)
@@ -462,8 +462,8 @@
} //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_row($result);
- $SingleSupplierReturned = $myrow[0];
+ $myrow = DB_fetch_array($result);
+ $SingleSupplierReturned = $myrow['supplierid'];
}
} //end of if search
if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-15 06:39:53
|
Revision: 4900
http://web-erp.svn.sourceforge.net/web-erp/?rev=4900&view=rev
Author: daintree
Date: 2012-02-15 06:39:46 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
tidy up
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-15 04:46:19 UTC (rev 4899)
+++ trunk/SupplierTenderCreate.php 2012-02-15 06:39:46 UTC (rev 4900)
@@ -5,8 +5,6 @@
include('includes/SQL_CommonFunctions.inc');
include('includes/session.inc');
-$Maximum_Number_Of_Parts_To_Show=50;
-
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');
@@ -124,26 +122,30 @@
WHERE closed=0";
$result=DB_query($sql, $db);
echo '<table class="selection">';
- echo '<tr><th>' . _('Tender ID') . '</th>';
- echo '<th>' . _('Location') . '</th>';
- echo '<th>' . _('Address 1') . '</th>';
- echo '<th>' . _('Address 2') . '</th>';
- echo '<th>' . _('Address 3') . '</th>';
- echo '<th>' . _('Address 4') . '</th>';
- echo '<th>' . _('Address 5') . '</th>';
- echo '<th>' . _('Address 6') . '</th>';
- echo '<th>' . _('Telephone') . '</th></tr>';
+ 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>';
- echo '<td>' . $myrow['location'] . '</td>';
- echo '<td>' . $myrow['address1'] . '</td>';
- echo '<td>' . $myrow['address2'] . '</td>';
- echo '<td>' . $myrow['address3'] . '</td>';
- echo '<td>' . $myrow['address4'] . '</td>';
- echo '<td>' . $myrow['address5'] . '</td>';
- echo '<td>' . $myrow['address6'] . '</td>';
- echo '<td>' . $myrow['telephone'] . '</td>';
- echo '<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?identifier='.$identifier.'&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
+ 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');
@@ -185,10 +187,9 @@
$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']);
+ $_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');
}
@@ -205,21 +206,23 @@
$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));
+ $_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) {
+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();
@@ -227,9 +230,13 @@
echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?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>';
- echo '<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td></tr>';
+ 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
@@ -313,8 +320,9 @@
$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
}
}
- echo '<tr><td>' . _('Warehouse') . ':</td>
- <td><select name=StkLocation onChange="ReloadForm(form1.LookupDeliveryAddress)">';
+ echo '<tr>
+ <td>' . _('Warehouse') . ':</td>
+ <td><select name="StkLocation" onChange="ReloadForm(form1.LookupDeliveryAddress)">';
$sql = "SELECT loccode,
locationname
@@ -335,29 +343,37 @@
/* 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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 />';
@@ -367,26 +383,36 @@
/* 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>';
+ 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>';
- echo '<td>' . $Supplier->SupplierName . '</td>';
- echo '<td>' . $Supplier->EmailAddress . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
+ 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>';
- echo '<th>'._('Stock ID').'</th>';
- echo '<th>'._('Description').'</th>';
- echo '<th>'._('Quantity').'</th>';
- echo '<th>'._('UOM').'</th>';
- echo '</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) {
@@ -397,27 +423,37 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- echo '<td>'.$LineItems->StockID.'</td>';
- echo '<td>'.$LineItems->ItemDescription.'</td>';
- echo '<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>';
- echo '<td>'.$LineItems->Units.'</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
+ 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') . '" />';
- echo '<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 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 (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' );
}
@@ -481,10 +517,13 @@
}
if (isset($_POST['Suppliers'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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" colspan="4" class="selection"><tr><td>' . _('Enter a partial Name') . ':</td><td>';
+ <table cellpadding="3" colspan="4" 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 {
@@ -643,7 +682,7 @@
}
if (isset($_POST['Search'])){ /*ie seach for stock items */
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) .'">';
+ 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>';
@@ -662,10 +701,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.description " . LIKE . " '$SearchString'
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -674,11 +715,13 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
} elseif ($_POST['StockCode']){
@@ -693,10 +736,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -705,11 +750,13 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
} else {
@@ -722,8 +769,10 @@
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -733,9 +782,11 @@
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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
}
@@ -798,22 +849,13 @@
<input type="hidden" value="'.$myrow['stockid'].'" name="StockID'.$i.'" />
</tr>';
- $PartsDisplayed++;
- if ($PartsDisplayed == $Maximum_Number_Of_Parts_To_Show){
- break;
- }
+
$i++;
#end of page full new headings if
}
#end of while loop
echo '</table>';
- if ($PartsDisplayed == $Maximum_Number_Of_Parts_To_Show){
-
- /*$Maximum_Number_Of_Parts_To_Show defined in config.php */
-
- prnMsg( _('Only the first') . ' ' . $Maximum_Number_Of_Parts_To_Show . ' ' . _('can be displayed') . '. ' .
- _('Please restrict your search to only the parts required'),'info');
- }
+
echo '<a name="end"></a>
<br />
<div class="centre">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-02-15 06:39:53
|
Revision: 4900
http://web-erp.svn.sourceforge.net/web-erp/?rev=4900&view=rev
Author: daintree
Date: 2012-02-15 06:39:46 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
tidy up
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-15 04:46:19 UTC (rev 4899)
+++ trunk/SupplierTenderCreate.php 2012-02-15 06:39:46 UTC (rev 4900)
@@ -5,8 +5,6 @@
include('includes/SQL_CommonFunctions.inc');
include('includes/session.inc');
-$Maximum_Number_Of_Parts_To_Show=50;
-
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');
@@ -124,26 +122,30 @@
WHERE closed=0";
$result=DB_query($sql, $db);
echo '<table class="selection">';
- echo '<tr><th>' . _('Tender ID') . '</th>';
- echo '<th>' . _('Location') . '</th>';
- echo '<th>' . _('Address 1') . '</th>';
- echo '<th>' . _('Address 2') . '</th>';
- echo '<th>' . _('Address 3') . '</th>';
- echo '<th>' . _('Address 4') . '</th>';
- echo '<th>' . _('Address 5') . '</th>';
- echo '<th>' . _('Address 6') . '</th>';
- echo '<th>' . _('Telephone') . '</th></tr>';
+ 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>';
- echo '<td>' . $myrow['location'] . '</td>';
- echo '<td>' . $myrow['address1'] . '</td>';
- echo '<td>' . $myrow['address2'] . '</td>';
- echo '<td>' . $myrow['address3'] . '</td>';
- echo '<td>' . $myrow['address4'] . '</td>';
- echo '<td>' . $myrow['address5'] . '</td>';
- echo '<td>' . $myrow['address6'] . '</td>';
- echo '<td>' . $myrow['telephone'] . '</td>';
- echo '<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?identifier='.$identifier.'&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
+ 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');
@@ -185,10 +187,9 @@
$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']);
+ $_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');
}
@@ -205,21 +206,23 @@
$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));
+ $_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) {
+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();
@@ -227,9 +230,13 @@
echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?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>';
- echo '<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td></tr>';
+ 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
@@ -313,8 +320,9 @@
$_SESSION['tender'.$identifier]->Contact = $_POST['Contact'];
}
}
- echo '<tr><td>' . _('Warehouse') . ':</td>
- <td><select name=StkLocation onChange="ReloadForm(form1.LookupDeliveryAddress)">';
+ echo '<tr>
+ <td>' . _('Warehouse') . ':</td>
+ <td><select name="StkLocation" onChange="ReloadForm(form1.LookupDeliveryAddress)">';
$sql = "SELECT loccode,
locationname
@@ -335,29 +343,37 @@
/* 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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>
+ 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 />';
@@ -367,26 +383,36 @@
/* 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>';
+ 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>';
- echo '<td>' . $Supplier->SupplierName . '</td>';
- echo '<td>' . $Supplier->EmailAddress . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteSupplier=' . $Supplier->SupplierCode . '">' . _('Delete') . '</a></td></tr>';
+ 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>';
- echo '<th>'._('Stock ID').'</th>';
- echo '<th>'._('Description').'</th>';
- echo '<th>'._('Quantity').'</th>';
- echo '<th>'._('UOM').'</th>';
- echo '</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) {
@@ -397,27 +423,37 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- echo '<td>'.$LineItems->StockID.'</td>';
- echo '<td>'.$LineItems->ItemDescription.'</td>';
- echo '<td class="number">' . locale_number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>';
- echo '<td>'.$LineItems->Units.'</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '&DeleteItem=' . $LineItems->LineNo . '">' . _('Delete') . '</a></td></tr>';
+ 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') . '" />';
- echo '<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 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 (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' );
}
@@ -481,10 +517,13 @@
}
if (isset($_POST['Suppliers'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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" colspan="4" class="selection"><tr><td>' . _('Enter a partial Name') . ':</td><td>';
+ <table cellpadding="3" colspan="4" 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 {
@@ -643,7 +682,7 @@
}
if (isset($_POST['Search'])){ /*ie seach for stock items */
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) .'">';
+ 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>';
@@ -662,10 +701,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.description " . LIKE . " '$SearchString'
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -674,11 +715,13 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
} elseif ($_POST['StockCode']){
@@ -693,10 +736,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -705,11 +750,13 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
} else {
@@ -722,8 +769,10 @@
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -733,9 +782,11 @@
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";
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DisplayRecordsMax'];
}
}
@@ -798,22 +849,13 @@
<input type="hidden" value="'.$myrow['stockid'].'" name="StockID'.$i.'" />
</tr>';
- $PartsDisplayed++;
- if ($PartsDisplayed == $Maximum_Number_Of_Parts_To_Show){
- break;
- }
+
$i++;
#end of page full new headings if
}
#end of while loop
echo '</table>';
- if ($PartsDisplayed == $Maximum_Number_Of_Parts_To_Show){
-
- /*$Maximum_Number_Of_Parts_To_Show defined in config.php */
-
- prnMsg( _('Only the first') . ' ' . $Maximum_Number_Of_Parts_To_Show . ' ' . _('can be displayed') . '. ' .
- _('Please restrict your search to only the parts required'),'info');
- }
+
echo '<a name="end"></a>
<br />
<div class="centre">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-15 12:40:00
|
Revision: 4904
http://web-erp.svn.sourceforge.net/web-erp/?rev=4904&view=rev
Author: tim_schofield
Date: 2012-02-15 12:39:49 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Ensure all PHP keywords are in lower case for consistency across the code base, and tidy up the code
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-15 10:15:55 UTC (rev 4903)
+++ trunk/SupplierTenderCreate.php 2012-02-15 12:39:49 UTC (rev 4904)
@@ -12,11 +12,11 @@
$identifier=$_GET['identifier'];
}
-if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
+if (isset($_GET['New']) and isset($_SESSION['tender'.$identifier])) {
unset($_SESSION['tender'.$identifier]);
}
-if (isset($_GET['New']) AND $_SESSION['CanCreateTender']==0) {
+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>';
@@ -26,7 +26,7 @@
exit;
}
-if (isset($_GET['Edit']) AND $_SESSION['CanCreateTender']==0) {
+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>';
@@ -75,10 +75,9 @@
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']);
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender($myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['email']);
}
$sql="SELECT tenderid,
@@ -93,14 +92,13 @@
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));
+ $_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;
}
@@ -196,7 +194,7 @@
$ShowTender = 1;
}
-if (isset($_POST['NewItem']) AND !isset($_POST['Refresh'])) {
+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);
@@ -219,15 +217,15 @@
$ShowTender = 1;
}
-if (!isset($_SESSION['tender'.$identifier])
- OR isset($_POST['LookupDeliveryAddress'])
- OR $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'].'?identifier='.$identifier) . '" method="post">';
+ 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>
@@ -238,7 +236,7 @@
<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 (!isset($_POST['StkLocation']) or $_POST['StkLocation']==''){
/* If this is the first time
* the form loaded set up defaults */
@@ -330,7 +328,7 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if ((isset($_SESSION['tender'.$identifier]->Location) AND $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
+ 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>';
@@ -439,9 +437,9 @@
<input type="submit" name="Items" value="' . _('Select Item Details') . '" />
</div>
<br />';
- if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
- AND $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
-
+ 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>';
@@ -451,13 +449,13 @@
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) {
+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'] == '') {
+ if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
$SQL = "SELECT supplierid,
suppname,
currcode,
@@ -540,7 +538,7 @@
}
if (isset($_POST['SearchSupplier'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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']);
@@ -577,23 +575,22 @@
<br />
<br />
<table cellpadding="2" colspan="7">';
- $TableHeader = '<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>';
- echo $TableHeader;
+ 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'])) {
+ while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
@@ -619,7 +616,7 @@
/*The supplier has chosen option 2
*/
if (isset($_POST['Items'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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,
@@ -686,7 +683,7 @@
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']) {
+ 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']) {
@@ -701,11 +698,11 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.description " . LIKE . " '$SearchString'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -715,12 +712,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
@@ -736,11 +733,11 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -750,12 +747,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
@@ -771,7 +768,7 @@
AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -785,7 +782,7 @@
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
}
@@ -794,7 +791,7 @@
$DbgMsg = _('The SQL statement that failed was');
$SearchResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- if (DB_num_rows($SearchResult)==0 AND $debug==1){
+ 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){
@@ -806,17 +803,15 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7">';
+ echo '<table cellpadding="1">';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Image') . '</th>
+ <th>' . _('Quantity') . '</th>
+ </tr>';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Image') . '</th>
- <th>' . _('Quantity') . '</th>
- </tr>';
- echo $TableHeader;
-
$i = 0;
$k = 0; //row colour counter
$PartsDisplayed=0;
@@ -833,13 +828,12 @@
$FileName = $myrow['stockid'] . '.jpg';
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
- $ImageSource = '<img src="'.$rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" width="50" height="50" />';
+ $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>
@@ -849,13 +843,12 @@
<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">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-15 12:40:00
|
Revision: 4904
http://web-erp.svn.sourceforge.net/web-erp/?rev=4904&view=rev
Author: tim_schofield
Date: 2012-02-15 12:39:49 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Ensure all PHP keywords are in lower case for consistency across the code base, and tidy up the code
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-02-15 10:15:55 UTC (rev 4903)
+++ trunk/SupplierTenderCreate.php 2012-02-15 12:39:49 UTC (rev 4904)
@@ -12,11 +12,11 @@
$identifier=$_GET['identifier'];
}
-if (isset($_GET['New']) AND isset($_SESSION['tender'.$identifier])) {
+if (isset($_GET['New']) and isset($_SESSION['tender'.$identifier])) {
unset($_SESSION['tender'.$identifier]);
}
-if (isset($_GET['New']) AND $_SESSION['CanCreateTender']==0) {
+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>';
@@ -26,7 +26,7 @@
exit;
}
-if (isset($_GET['Edit']) AND $_SESSION['CanCreateTender']==0) {
+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>';
@@ -75,10 +75,9 @@
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']);
+ $_SESSION['tender'.$identifier]->add_supplier_to_tender($myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['email']);
}
$sql="SELECT tenderid,
@@ -93,14 +92,13 @@
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));
+ $_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;
}
@@ -196,7 +194,7 @@
$ShowTender = 1;
}
-if (isset($_POST['NewItem']) AND !isset($_POST['Refresh'])) {
+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);
@@ -219,15 +217,15 @@
$ShowTender = 1;
}
-if (!isset($_SESSION['tender'.$identifier])
- OR isset($_POST['LookupDeliveryAddress'])
- OR $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'].'?identifier='.$identifier) . '" method="post">';
+ 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>
@@ -238,7 +236,7 @@
<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 (!isset($_POST['StkLocation']) or $_POST['StkLocation']==''){
/* If this is the first time
* the form loaded set up defaults */
@@ -330,7 +328,7 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if ((isset($_SESSION['tender'.$identifier]->Location) AND $_SESSION['tender'.$identifier]->Location == $LocnRow['loccode'])){
+ 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>';
@@ -439,9 +437,9 @@
<input type="submit" name="Items" value="' . _('Select Item Details') . '" />
</div>
<br />';
- if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
- AND $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
-
+ 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>';
@@ -451,13 +449,13 @@
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) {
+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'] == '') {
+ if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
$SQL = "SELECT supplierid,
suppname,
currcode,
@@ -540,7 +538,7 @@
}
if (isset($_POST['SearchSupplier'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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']);
@@ -577,23 +575,22 @@
<br />
<br />
<table cellpadding="2" colspan="7">';
- $TableHeader = '<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>';
- echo $TableHeader;
+ 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'])) {
+ while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
@@ -619,7 +616,7 @@
/*The supplier has chosen option 2
*/
if (isset($_POST['Items'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+ 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,
@@ -686,7 +683,7 @@
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']) {
+ 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']) {
@@ -701,11 +698,11 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.description " . LIKE . " '$SearchString'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -715,12 +712,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
@@ -736,11 +733,11 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -750,12 +747,12 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag!='D'
AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
+ 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
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
@@ -771,7 +768,7 @@
AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
@@ -785,7 +782,7 @@
AND stockmaster.mbflag!='G'
AND stockmaster.discontinued!=1
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
+ ORDER BY stockmaster.stockid
LIMIT " . $_SESSION['DisplayRecordsMax'];
}
}
@@ -794,7 +791,7 @@
$DbgMsg = _('The SQL statement that failed was');
$SearchResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- if (DB_num_rows($SearchResult)==0 AND $debug==1){
+ 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){
@@ -806,17 +803,15 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7">';
+ echo '<table cellpadding="1">';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Image') . '</th>
+ <th>' . _('Quantity') . '</th>
+ </tr>';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Image') . '</th>
- <th>' . _('Quantity') . '</th>
- </tr>';
- echo $TableHeader;
-
$i = 0;
$k = 0; //row colour counter
$PartsDisplayed=0;
@@ -833,13 +828,12 @@
$FileName = $myrow['stockid'] . '.jpg';
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
- $ImageSource = '<img src="'.$rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" width="50" height="50" />';
+ $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>
@@ -849,13 +843,12 @@
<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">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2013-03-27 22:09:30
|
Revision: 5829
http://sourceforge.net/p/web-erp/reponame/5829
Author: tim_schofield
Date: 2013-03-27 22:09:27 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Fahad Hatib: Improvements to editing tenders and add a button in to close a tender
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2013-03-22 09:03:15 UTC (rev 5828)
+++ trunk/SupplierTenderCreate.php 2013-03-27 22:09:27 UTC (rev 5829)
@@ -1,875 +1,899 @@
-<?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 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') . '&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') . '&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) {
- $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
- }
- }
- if ($ListPageMax > 1) {
- echo '<br /> ' . $_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>';
- echo '</div>
- </form>';
-}
-
-/*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 '<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 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 /><p class="bad">' . _('Problem Report') . ':</p><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><b>' . _('OR') . ' ' . '</b>' . _('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 />
- </div>
- </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 '<div>';
- 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 '</div>
- </form>';
-
-} //end of if search
-
-include('includes/footer.inc');
-
-?>
\ No newline at end of file
+<?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 noPrint" ><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 noPrint" ><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;
+}
+
+if (isset($_POST['Close'])) {
+ $SQL = "UPDATE tenders SET closed=1 WHERE tenderid='" . $_SESSION['tender'.$identifier]->TenderId . "'";
+ $Result = DB_query($SQL, $db);
+ $_GET['Edit'] = 'Yes';
+ unset($_SESSION['tender'.$identifier]);
+}
+
+$ShowTender = 0;
+
+if (isset($_GET['ID'])) {
+ $sql = "SELECT tenderid,
+ location,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ telephone,
+ requiredbydate
+ 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'];
+ $_SESSION['tender'.$identifier]->RequiredByDate = $myrow['requiredbydate'];
+
+ $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 noPrint" ><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
+ AND requiredbydate > CURRENT_DATE";
+ $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 noPrint" ><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 noPrint" ><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();
+ }
+ if (!isset($_SESSION['tender'.$identifier]->RequiredByDate)) {
+ $_SESSION['tender'.$identifier]->RequiredByDate = FormatDateForSQL(date($_SESSION['DefaultDateFormat']));
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" class="noPrint">';
+ 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="' . ConvertSQLDate($_SESSION['tender'.$identifier]->RequiredByDate) . '" /></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') . '&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') . '&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') . '" />
+ ';
+ if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
+ and $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
+ echo '<input type="submit" name="Close" value="' . _('Close This Tender') . '" />';
+ }
+ echo '</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
+ WHERE email<>''
+ 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'
+ AND email<>''
+ 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'] . "%'
+ AND email<>''
+ 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" class="noPrint">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text noPrint" ><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" class="noPrint">';
+ 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) {
+ $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
+ }
+ }
+ if ($ListPageMax > 1) {
+ echo '<br /> ' . $_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>';
+ echo '</div>
+ </form>';
+}
+
+/*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" class="noPrint">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text noPrint" ><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 /><p class="bad">' . _('Problem Report') . ':</p><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><b>' . _('OR') . ' ' . '</b>' . _('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 />
+ </div>
+ </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" class="noPrint" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier,ENT_QUOTES,'UTF-8') .'">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text noPrint" ><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.cat...
[truncated message content] |
|
From: <ex...@us...> - 2013-08-19 07:46:17
|
Revision: 6249
http://sourceforge.net/p/web-erp/reponame/6249
Author: exsonqu
Date: 2013-08-19 07:46:14 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
19/8/2013 Exson: Add warning messages for no suppliers returned in SupplierTenderCreate.php and make it html5 compatible and table sortable.
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2013-08-19 06:24:59 UTC (rev 6248)
+++ trunk/SupplierTenderCreate.php 2013-08-19 07:46:14 UTC (rev 6249)
@@ -250,7 +250,7 @@
</tr>';
echo '<tr>
<td>' . _('Delivery Must Be Made Before') . '</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . ConvertSQLDate($_SESSION['tender'.$identifier]->RequiredByDate) . '" /></td>
+ <td><input type="text" class="date" required="required" alt="' . $_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' . ConvertSQLDate($_SESSION['tender'.$identifier]->RequiredByDate) . '" /></td>
</tr>';
if (!isset($_POST['StkLocation']) or $_POST['StkLocation']==''){
@@ -360,35 +360,35 @@
*/
echo '<tr>
<td>' . _('Delivery Contact') . ':</td>
- <td><input type="text" name="Contact" size="41" value="' . $_SESSION['tender'.$identifier]->Contact . '" /></td>
+ <td><input type="text" name="Contact" size="41" value="' . $_SESSION['tender'.$identifier]->Contact . '" readonly /></td>
</tr>';
echo '<tr>
<td>' . _('Address') . ' 1 :</td>
- <td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '" /></td>
+ <td><input type="text" name="DelAdd1" pattern=".{1,40}" title="'._('The address should not be over 40 characters').'" 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>
+ <td><input type="text" name="DelAdd2" pattern=".{1,40}" title="'._('The address should not be over 40 characters').'" size="41" 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>
+ <td><input type="text" name="DelAdd3" pattern=".{1,40}" title="'._('The address should not be over 40 characters').'" size="41" 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>
+ <td><input type="text" name="DelAdd4" pattern=".{1,40}" title="'._('The characters should not be over 20 characters').'" size="41" maxlength="40" 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>
+ <td><input type="text" name="DelAdd5" pattern=".{1,20}" title="'._('The characters should not be over 20 characters').'" size="21" maxlength="20" 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>
+ <td><input type="text" name="DelAdd6" pattern=".{1,15}" title="'._('The characters should not be over 15 characters').'" 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>
+ <td><input type="tel" name="Tel" pattern="[\d+)(\s]{1,25}" size="31" title="'._('The input should be telephone number and should not be over 25 charaters').'" maxlength="25" value="' . $_SESSION['tender'.$identifier]->Telephone . '" /></td>
</tr>';
echo '</table><br />';
@@ -549,15 +549,15 @@
<td>' . _('Enter a partial Name') . ':</td>
<td>';
if (isset($_POST['Keywords'])) {
- echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
+ echo '<input type="text" placeholder="'._('Left it blank to show all').'" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
} else {
- echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
+ echo '<input type="text" placeholder="'._('Left it blank to show all').'" 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" />';
+ echo '<input type="text" placeholder="'._('Left it blank to show all').'" name="SupplierCode" value="' . $_POST['SupplierCode'] . '" size="15" maxlength="18" />';
} else {
- echo '<input type="text" name="SupplierCode" size="15" maxlength="18" />';
+ echo '<input type="text" placeholder="'._('Left it blank to show all').'" 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>
@@ -604,19 +604,21 @@
<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>
+ <th class="assending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Supplier Name') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Currency') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Address 1') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Address 2') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Address 3') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('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']);
+ }else{
+ prnMsg(_('There are no suppliers data returned, one reason maybe no email addresses set for those suppliers'),'warn');
}
while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
@@ -683,9 +685,9 @@
<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" />';
+ echo '<input type="text" name="Keywords" placeholder="'._('Leave it bank to show all').'" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
} else {
- echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
+ echo '<input type="text" name="Keywords" placeholder="'._('Leave it bank to show all').'" size="20" maxlength="25" />';
}
echo '</td>
</tr>
@@ -694,9 +696,9 @@
<td><b>' . _('OR') . ' ' . '</b>' . _('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" />';
+ echo '<input type="text" name="StockCode" placeholder="'._('Leave it bank to show all').'" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />';
} else {
- echo '<input type="text" name="StockCode" size="15" maxlength="18" />';
+ echo '<input type="text" name="StockCode" placeholder="'._('Leave it bank to show all').'" size="15" maxlength="18" />';
}
echo '</td></tr>
</table>
@@ -838,11 +840,11 @@
echo '<table cellpadding="1">';
echo '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Image') . '</th>
- <th>' . _('Quantity') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Description') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Units') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Image') . '</th>
+ <th class="assending" onclick="SortSelect(this)">' . _('Quantity') . '</th>
</tr>';
$i = 0;
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X