Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3390] trunk
|
From: <tim...@us...> - 2010-03-16 15:02:18
|
Revision: 3390
http://web-erp.svn.sourceforge.net/web-erp/?rev=3390&view=rev
Author: tim_schofield
Date: 2010-03-16 15:02:10 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines
Modified Paths:
--------------
trunk/PO_SelectPurchOrder.php
trunk/doc/Change.log.html
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2010-03-16 09:35:52 UTC (rev 3389)
+++ trunk/PO_SelectPurchOrder.php 2010-03-16 15:02:10 UTC (rev 3390)
@@ -1,66 +1,49 @@
<?php
-
/* $Id$*/
-
$PageSecurity = 2;
-
-include('includes/session.inc');
-
+include ('includes/session.inc');
$title = _('Search Purchase Orders');
-
-include('includes/header.inc');
-
-if (isset($_GET['SelectedStockItem'])){
- $SelectedStockItem=$_GET['SelectedStockItem'];
-} elseif (isset($_POST['SelectedStockItem'])){
- $SelectedStockItem=$_POST['SelectedStockItem'];
+include ('includes/header.inc');
+echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Purchase Orders') . '" alt="">' . ' ' . _('Purchase Orders') . '';
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])) {
+ $SelectedStockItem = $_POST['SelectedStockItem'];
}
-
-if (isset($_GET['OrderNumber'])){
- $OrderNumber=$_GET['OrderNumber'];
-} elseif (isset($_POST['OrderNumber'])){
- $OrderNumber=$_POST['OrderNumber'];
+if (isset($_GET['OrderNumber'])) {
+ $OrderNumber = $_GET['OrderNumber'];
+} elseif (isset($_POST['OrderNumber'])) {
+ $OrderNumber = $_POST['OrderNumber'];
}
-
-if (isset($_GET['SelectedSupplier'])){
- $SelectedSupplier=$_GET['SelectedSupplier'];
-} elseif (isset($_POST['SelectedSupplier'])){
- $SelectedSupplier=$_POST['SelectedSupplier'];
+if (isset($_GET['SelectedSupplier'])) {
+ $SelectedSupplier = $_GET['SelectedSupplier'];
+} elseif (isset($_POST['SelectedSupplier'])) {
+ $SelectedSupplier = $_POST['SelectedSupplier'];
}
-
echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
-
-
-If ($_POST['ResetPart']){
- unset($SelectedStockItem);
+if (isset($_POST['ResetPart'])) {
+ unset($SelectedStockItem);
}
-
-If (isset($OrderNumber) && $OrderNumber!="") {
- if (!is_numeric($OrderNumber)){
- prnMsg( _('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
- unset ($OrderNumber);
+if (isset($OrderNumber) && $OrderNumber != "") {
+ if (!is_numeric($OrderNumber)) {
+ prnMsg(_('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
+ unset($OrderNumber);
} else {
echo _('Order Number') . ' - ' . $OrderNumber;
}
} else {
- If ($SelectedSupplier) {
+ if (isset($SelectedSupplier)) {
echo _('For supplier') . ': ' . $SelectedSupplier . ' ' . _('and') . ' ';
echo '<input type=hidden name="SelectedSupplier" value=' . $SelectedSupplier . '>';
}
- If ($SelectedStockItem) {
- echo _('for the part') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type=hidden name="SelectedStockItem" value="' . $SelectedStockItem . '">';
- }
}
-
-if ($_POST['SearchParts']){
-
- If ($_POST['Keywords'] AND $_POST['StockCode']) {
- prnMsg( _('Stock description keywords have been used in preference to the Stock code extract entered'),'info');
+if (isset($_POST['SearchParts'])) {
+ 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']) {
+ if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) as qoh,
@@ -76,8 +59,7 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
-
- } elseif ($_POST['StockCode']){
+ } elseif ($_POST['StockCode']) {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) AS qoh,
@@ -93,8 +75,7 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
-
- } elseif (!$_POST['StockCode'] AND !$_POST['Keywords']) {
+ } elseif (!$_POST['StockCode'] AND !$_POST['Keywords']) {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) AS qoh,
@@ -108,131 +89,96 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
- }
-
+ }
$ErrMsg = _('No stock items were returned by the SQL because');
$DbgMsg = _('The SQL used to retrieve the searched parts was');
- $StockItemsResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-
+ $StockItemsResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
}
-
/* Not appropriate really to restrict search by date since user may miss older
-ouststanding orders
- $OrdersAfterDate = Date("d/m/Y",Mktime(0,0,0,Date("m")-2,Date("d"),Date("Y")));
+* ouststanding orders
+* $OrdersAfterDate = Date("d/m/Y",Mktime(0,0,0,Date("m")-2,Date("d"),Date("Y")));
*/
-
-if ($OrderNumber=="" OR !isset($OrderNumber)){
-
- echo _('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
+if (!isset($OrderNumber) or $OrderNumber == "") {
+ echo '<table class=selection><tr><td>';
+ if (isset($SelectedStockItem)) {
+ echo _('For the part') . ':<b>' . $SelectedStockItem . '</b> ' . _('and') . ' <input type=hidden name="SelectedStockItem" value="' . $SelectedStockItem . '">';
+ }
+ echo _('Order Number') . ': <input type=text name="OrderNumber" maxlength=8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
$sql = "SELECT loccode, locationname FROM locations";
- $resultStkLocs = DB_query($sql,$db);
- while ($myrow=DB_fetch_array($resultStkLocs)){
- if (isset($_POST['StockLocation'])){
- if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ $resultStkLocs = DB_query($sql, $db);
+ while ($myrow = DB_fetch_array($resultStkLocs)) {
+ if (isset($_POST['StockLocation'])) {
+ if ($myrow['loccode'] == $_POST['StockLocation']) {
+ echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
}
- } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
+ } elseif ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
} else {
echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
}
}
-
- echo '</select> <input type=submit name="SearchOrders" VALUE="' . _('Search Purchase Orders') . '">';
+ echo '</select> <input type=submit name="SearchOrders" value="' . _('Search Purchase Orders') . '"></td></tr></table>';
}
-
-$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
-$result1 = DB_query($SQL,$db);
-
-?>
-
-<hr>
-<font size=1><?php echo _('To search for purchase orders for a specific part use the part selection facilities below'); ?></font>
-<input type=submit name="SearchParts" VALUE="<?php echo _('Search Parts Now'); ?>">
-<input type=submit name="ResetPart" VALUE="<?php echo _('Show All'); ?>">
-<table>
-<tr>
-<td><font size=1><?php echo _('Select a stock category'); ?>:</font>
-<select name="StockCat">
-<?php
+$SQL = "SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
+$result1 = DB_query($SQL, $db);
+echo '<br><br><table class=selection><tr><td>';
+echo '<font size=1>' . _('To search for purchase orders for a specific part use the part selection facilities below') . '</font>';
+echo '<input type=submit name="SearchParts" value="' . _('Search Parts Now') . '">';
+echo '<input type=submit name="ResetPart" value="' . _('Show All') . '">';
+echo '<tr><td><font size=1>' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
- if ($myrow1['categoryid']==$_POST['StockCat']){
- echo "<option selected VALUE='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
+ if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
+ echo "<option selected value='" . $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
} else {
- echo "<option VALUE='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
+ echo "<option value='" . $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
}
}
-?>
-</select>
-<td><font size=1><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</font></td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr>
-<tr><td></td>
-<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><font size=1><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</font></td>
-<td><input type="Text" name="StockCode" size=15 maxlength=18></td>
-</tr>
-</table>
-
-<hr>
-
-<?php
-
-If ($StockItemsResult) {
-
- echo '<table cellpadding=2 colspan=7 BORDER=2>';
+echo '</select><td><font size=1>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>';
+echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr><tr><td></td>';
+echo '<td><font size=3><b>' . _('OR') . ' </b></font><font size=1>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
+echo '<td><input type="text" name="StockCode" size=15 maxlength=18></td></tr></table><br><br>';
+if (isset($StockItemsResult)) {
+ echo '<table cellpadding=2 colspan=7 border=2>';
$TableHeader = '<tr><td class="tableheader">' . _('Code') . '</td>
<td class="tableheader">' . _('Description') . '</td>
<td class="tableheader">' . _('On Hand') . '</td>
<td class="tableheader">' . _('Orders') . '<br>' . _('Outstanding') . '</td>
<td class="tableheader">' . _('Units') . '</td>
</tr>';
-
echo $TableHeader;
-
$j = 1;
- $k=0; //row colour counter
-
- while ($myrow=DB_fetch_array($StockItemsResult)) {
-
- if ($k==1){
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($StockItemsResult)) {
+ if ($k == 1) {
echo '<tr bgcolor="#CCCCCC">';
- $k=0;
+ $k = 0;
} else {
echo '<tr bgcolor="#EEEEEE">';
- $k=1;
+ $k = 1;
}
-
- printf("<td><input type=submit name='SelectedStockItem' VALUE='%s'</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td class=number>%s</td>
- <td>%s</td>
- </tr>",
- $myrow['stockid'],
- $myrow['description'],
- $myrow['qoh'],
- $myrow['qord'],
- $myrow['units']);
-
+ echo "<td><input type=submit name='SelectedStockItem' value='" . $myrow['stockid'] . "'</td>
+ <td>" . $myrow['description'] . "</td>
+ <td class=number>" . $myrow['qoh'] . "</td>
+ <td class=number>" . $myrow['qord'] . "</td>
+ <td>" . $myrow['units'] . "</td>
+ </tr>";
$j++;
- If ($j == 12){
- $j=1;
+ if ($j == 12) {
+ $j = 1;
echo $TableHeader;
}
-//end of page full new headings if
- }
-//end of while loop
+ //end of page full new headings if
+ }
+ //end of while loop
echo '</table>';
-
}
//end if stock search results to show
- else {
-
+else {
//figure out the SQL required from the inputs available
-
- if (isset($OrderNumber) && $OrderNumber !="") {
+ if (isset($OrderNumber) && $OrderNumber != "") {
$SQL = "SELECT purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -246,14 +192,14 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.orderno=". $OrderNumber ."
+ AND purchorders.orderno=" . $OrderNumber . "
GROUP BY purchorders.orderno";
} else {
-
- /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
-
+ /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+ if (empty($_POST['StockLocation'])) {
+ $_POST['StockLocation'] = '';
+ }
if (isset($SelectedSupplier)) {
-
if (isset($SelectedStockItem)) {
$SQL = "SELECT purchorders.orderno,
suppliers.suppname,
@@ -268,9 +214,9 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorderdetails.itemcode='". $SelectedStockItem ."'
- AND purchorders.supplierno='" . $SelectedSupplier ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
+ AND purchorders.supplierno='" . $SelectedSupplier . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -292,8 +238,8 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.supplierno='" . $SelectedSupplier ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorders.supplierno='" . $SelectedSupplier . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -317,8 +263,8 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorderdetails.itemcode='". $SelectedStockItem ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -340,7 +286,7 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -349,17 +295,14 @@
purchorders.allowprint,
suppliers.currcode";
}
-
} //end selected supplier
- } //end not order number selected
+ } //end not order number selected
$ErrMsg = _('No orders were returned by the SQL because');
- $PurchOrdersResult = DB_query($SQL,$db,$ErrMsg);
-
- if (DB_num_rows($PurchOrdersResult)>0){
+ $PurchOrdersResult = DB_query($SQL, $db, $ErrMsg);
+ if (DB_num_rows($PurchOrdersResult) > 0) {
/*show a table of the orders returned by the SQL */
-
- echo '<table cellpadding=2 colspan=7 WIDTH=100%>';
+ echo '<table cellpadding=2 colspan=7 WIDTH=90%>';
$TableHeader = '<tr><td class="tableheader">' . _('View') . '</td>
<td class="tableheader">' . _('Supplier') . '</td>
<td class="tableheader">' . _('Currency') . '</td>
@@ -368,58 +311,41 @@
<td class="tableheader">' . _('Initiator') . '</td>
<td class="tableheader">' . _('Order Total') . '</td>
</tr>';
-
echo $TableHeader;
-
$j = 1;
- $k=0; //row colour counter
- while ($myrow=DB_fetch_array($PurchOrdersResult)) {
-
-
- if ($k==1){ /*alternate bgcolour of row for highlighting */
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchOrdersResult)) {
+ if ($k == 1) { /*alternate bgcolour of row for highlighting */
echo '<tr bgcolor="#CCCCCC">';
- $k=0;
+ $k = 0;
} else {
echo '<tr bgcolor="#EEEEEE">';
$k++;
}
-
$ViewPurchOrder = $rootpath . '/PO_OrderDetails.php?' . SID . 'OrderNo=' . $myrow['orderno'];
-
$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
- $FormatedOrderValue = number_format($myrow['ordervalue'],2);
- /* View Supplier Currency Requisition Order Date Initiator Order Total
- ModifyPage, $myrow["orderno"], $myrow["suppname"], $myrow["currcode"], $myrow["requisitionno"] $FormatedOrderDate, $myrow["initiator"] $FormatedOrderValue */
- printf("<td><a href='%s'>%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ViewPurchOrder,
- $myrow['orderno'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['requisitionno'],
- $FormatedOrderDate,
- $myrow['initiator'],
- $FormatedOrderValue);
-
+ $FormatedOrderValue = number_format($myrow['ordervalue'], 2);
+ /* View Supplier Currency Requisition Order Date Initiator Order Total
+ ModifyPage, $myrow["orderno"], $myrow["suppname"], $myrow["currcode"], $myrow["requisitionno"] $FormatedOrderDate, $myrow["initiator"] $FormatedOrderValue */
+ echo "<td><a href='" . $ViewPurchOrder . "'>" . $myrow['orderno'] . "</a></td>
+ <td>" . $myrow['suppname'] . "</td>
+ <td>" . $myrow['currcode'] . "</td>
+ <td>" . $myrow['requisitionno'] . "</td>
+ <td>" . $FormatedOrderDate . "</td>
+ <td>" . $myrow['initiator'] . "</td>
+ <td class=number>" . $FormatedOrderValue . "</td>
+ </tr>";
$j++;
- If ($j == 12){
- $j=1;
+ if ($j == 12) {
+ $j = 1;
echo $TableHeader;
}
- //end of page full new headings if
+ //end of page full new headings if
}
//end of while loop
-
echo '</table>';
} // end if purchase orders to show
}
-
echo '</form>';
-include('includes/footer.inc');
+include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-16 09:35:52 UTC (rev 3389)
+++ trunk/doc/Change.log.html 2010-03-16 15:02:10 UTC (rev 3390)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines</p>
<p>16/03/10 Anand: DateFunctions.inc - When getting the period number compare the same date formats</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Correctly position link to create a new order</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Change option from Printed to Print in case where order is not yet printed</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
