Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4633] trunk
|
From: <dai...@us...> - 2011-07-16 03:38:05
|
Revision: 4633
http://web-erp.svn.sourceforge.net/web-erp/?rev=4633&view=rev
Author: daintree
Date: 2011-07-16 03:37:58 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
type=text quoting
Modified Paths:
--------------
trunk/PDFDIFOT.php
trunk/PDFOrdersInvoiced.php
trunk/SelectWorkOrder.php
Modified: trunk/PDFDIFOT.php
===================================================================
--- trunk/PDFDIFOT.php 2011-07-16 02:59:14 UTC (rev 4632)
+++ trunk/PDFDIFOT.php 2011-07-16 03:37:58 UTC (rev 4633)
@@ -2,9 +2,6 @@
/* $Id$*/
-/* $Revision: 1.4 $ */
-
-//$PageSecurity = 3;
include ('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -27,45 +24,63 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
. _('DIFOT Report') . '</p>';
- echo "<form method='post' action='" . $_SERVER['PHP_SELF'] . '?' . sid . "'>";
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class=selection><tr><td>' . _('Enter the date from which variances between orders and deliveries are to be listed') . ":</td><td><input type="text" class='date' alt='".$_SESSION['DefaultDateFormat']."' name='FromDate' maxlength=10 size=10 VALUE='" . Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-1,0,Date('y'))) . "'></td></tr>";
- echo '<tr><td>' . _('Enter the date to which variances between orders and deliveries are to be listed') . ":</td><td><input type="text" class='date' alt='".$_SESSION['DefaultDateFormat']."' name='ToDate' maxlength=10 size=10 VALUE='" . Date($_SESSION['DefaultDateFormat']) . "'></td></tr>";
+ echo '<table class=selection>
+ <tr>
+ <td>' . _('Enter the date from which variances between orders and deliveries are to be listed') . ':</td>
+ <td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'].'" name="FromDate" maxlength=10 size=10 value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-1,0,Date('y'))) . '"></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Enter the date to which variances between orders and deliveries are to be listed') . ':</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ToDate" maxlength=10 size=10 value="' . Date($_SESSION['DefaultDateFormat']) . '"></td>
+ </tr>';
if (!isset($_POST['DaysAcceptable'])){
$_POST['DaysAcceptable'] = 1;
}
- echo '<tr><td>' . _('Enter the number of days considered acceptable between delivery requested date and invoice date(ie the date dispatched)') . ":</td><td><input type="text" class=number name='DaysAcceptable' maxlength=2 size=2 VALUE=" . $_POST['DaysAcceptable'] . "></td></tr>";
+ echo '<tr>
+ <td>' . _('Enter the number of days considered acceptable between delivery requested date and invoice date(ie the date dispatched)') . ':</td>
+ <td><input type="text" class="number" name="DaysAcceptable" maxlength=2 size=2 value="' . $_POST['DaysAcceptable'] . '"></td>
+ </tr>';
echo '<tr><td>' . _('Inventory Category') . '</td><td>';
$sql = "SELECT categorydescription, categoryid FROM stockcategory WHERE stocktype<>'D' AND stocktype<>'L'";
$result = DB_query($sql,$db);
- echo "<select name='CategoryID'>";
- echo "<option selected value='All'>" . _('Over All Categories');
+ echo '<select name="CategoryID">';
+ echo '<option selected value="All">' . _('Over All Categories') . '</option>';
- while ($myrow=DB_fetch_array($result)){
- echo "<option value='" . $myrow['categoryid'] . "'>" . $myrow['categorydescription'];
- }
+ while ($myrow=DB_fetch_array($result)){
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
+ }
echo '</select></td></tr>';
- echo '<tr><td>' . _('Inventory Location') . ":</td><td><select name='Location'>";
- echo "<option selected value='All'>" . _('All Locations');
+ echo '<tr><td>' . _('Inventory Location') . ':</td>
+ <td><select name="Location">';
+ echo '<option selected value="All">' . _('All Locations') . '</option>';
- $result= DB_query('SELECT loccode, locationname FROM locations',$db);
- while ($myrow=DB_fetch_array($result)){
- echo "<option value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
- }
+ $result= DB_query("SELECT loccode, locationname FROM locations",$db);
+ while ($myrow=DB_fetch_array($result)){
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
echo '</select></td></tr>';
- echo '<tr><td>' . _('Email the report off') . ":</td><td><select name='Email'>";
- echo "<option selected value='No'>" . _('No');
- echo "<option value='Yes'>" . _('Yes');
- echo "</select></td></tr></table><br /><div class='centre'><input type=submit name='Go' value='" . _('Create PDF') . "'></div>";
+ echo '<tr><td>' . _('Email the report off') . ':</td>
+ <td><select name="Email">
+ <option selected value="No">' . _('No') . '</option>
+ <option value="Yes">' . _('Yes') . '</option>
+ </select></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Go" value="' . _('Create PDF') . '" />
+ </div>';
if ($InputError==1){
prnMsg($msg,'error');
@@ -78,79 +93,79 @@
if ($_POST['CategoryID']=='All' AND $_POST['Location']=='All'){
$sql= "SELECT salesorders.orderno,
- salesorders.deliverydate,
- salesorderdetails.actualdispatchdate,
- TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
- salesorderdetails.quantity,
- salesorderdetails.stkcode,
- stockmaster.description,
- salesorders.debtorno,
- salesorders.branchcode
- FROM salesorderdetails INNER JOIN stockmaster
+ salesorders.deliverydate,
+ salesorderdetails.actualdispatchdate,
+ TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
+ salesorderdetails.quantity,
+ salesorderdetails.stkcode,
+ stockmaster.description,
+ salesorders.debtorno,
+ salesorders.branchcode
+ FROM salesorderdetails INNER JOIN stockmaster
ON salesorderdetails.stkcode=stockmaster.stockid
- INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
- WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- AND (TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable']."'";
+ INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
+ AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ AND (TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable']."'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['Location']=='All') {
$sql= "SELECT salesorders.orderno,
- salesorders.deliverydate,
- salesorderdetails.actualdispatchdate,
- TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
- salesorderdetails.quantity,
- salesorderdetails.stkcode,
- stockmaster.description,
- salesorders.debtorno,
- salesorders.branchcode
- FROM salesorderdetails INNER JOIN stockmaster
- ON salesorderdetails.stkcode=stockmaster.stockid
- INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
- WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- AND stockmaster.categoryid='" . $_POST['CategoryID'] ."'
- AND (TO_DAYS(salesorderdetails.actualdispatchdate)
- - TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable']."'";
+ salesorders.deliverydate,
+ salesorderdetails.actualdispatchdate,
+ TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
+ salesorderdetails.quantity,
+ salesorderdetails.stkcode,
+ stockmaster.description,
+ salesorders.debtorno,
+ salesorders.branchcode
+ FROM salesorderdetails INNER JOIN stockmaster
+ ON salesorderdetails.stkcode=stockmaster.stockid
+ INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
+ AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ AND stockmaster.categoryid='" . $_POST['CategoryID'] ."'
+ AND (TO_DAYS(salesorderdetails.actualdispatchdate)
+ - TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable']."'";
} elseif ($_POST['CategoryID']=='All' AND $_POST['Location']!='All') {
$sql= "SELECT salesorders.orderno,
- salesorders.deliverydate,
- salesorderdetails.actualdispatchdate,
- TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
- salesorderdetails.quantity,
- salesorderdetails.stkcode,
- stockmaster.description,
- salesorders.debtorno,
- salesorders.branchcode
- FROM salesorderdetails INNER JOIN stockmaster
- ON salesorderdetails.stkcode=stockmaster.stockid
- INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
- WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- AND salesorders.fromstkloc='" . $_POST['Location'] . "'
- AND (TO_DAYS(salesorderdetails.actualdispatchdate)
+ salesorders.deliverydate,
+ salesorderdetails.actualdispatchdate,
+ TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
+ salesorderdetails.quantity,
+ salesorderdetails.stkcode,
+ stockmaster.description,
+ salesorders.debtorno,
+ salesorders.branchcode
+ FROM salesorderdetails INNER JOIN stockmaster
+ ON salesorderdetails.stkcode=stockmaster.stockid
+ INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
+ AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ AND salesorders.fromstkloc='" . $_POST['Location'] . "'
+ AND (TO_DAYS(salesorderdetails.actualdispatchdate)
- TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable'] . "'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['Location']!='All'){
$sql= "SELECT salesorders.orderno,
- salesorders.deliverydate,
- salesorderdetails.actualdispatchdate,
- TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
- salesorderdetails.quantity,
- salesorderdetails.stkcode,
- stockmaster.description,
- salesorders.debtorno,
- salesorders.branchcode
- FROM salesorderdetails INNER JOIN stockmaster
- ON salesorderdetails.stkcode=stockmaster.stockid
- INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
- WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- AND stockmaster.categoryid='" . $_POST['CategoryID'] ."'
- AND salesorders.fromstkloc='" . $_POST['Location'] . "'
- AND (TO_DAYS(salesorderdetails.actualdispatchdate)
+ salesorders.deliverydate,
+ salesorderdetails.actualdispatchdate,
+ TO_DAYS(salesorderdetails.actualdispatchdate) - TO_DAYS(salesorders.deliverydate) AS daydiff,
+ salesorderdetails.quantity,
+ salesorderdetails.stkcode,
+ stockmaster.description,
+ salesorders.debtorno,
+ salesorders.branchcode
+ FROM salesorderdetails INNER JOIN stockmaster
+ ON salesorderdetails.stkcode=stockmaster.stockid
+ INNER JOIN salesorders ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.deliverydate >='" . FormatDateForSQL($_POST['FromDate']) . "'
+ AND salesorders.deliverydate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ AND stockmaster.categoryid='" . $_POST['CategoryID'] ."'
+ AND salesorders.fromstkloc='" . $_POST['Location'] . "'
+ AND (TO_DAYS(salesorderdetails.actualdispatchdate)
- TO_DAYS(salesorders.deliverydate)) >'" . $_POST['DaysAcceptable'] . "'";
}
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2011-07-16 02:59:14 UTC (rev 4632)
+++ trunk/PDFOrdersInvoiced.php 2011-07-16 03:37:58 UTC (rev 4633)
@@ -36,8 +36,8 @@
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class=selection><tr><td>' . _('Enter the date from which orders are to be listed') . ':</td><td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="FromDate" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m'),Date('d')-1,Date('y'))) . '"></td></tr>';
- echo '<tr><td>' . _('Enter the date to which orders are to be listed') . ":</td>
- <td><input type="text" class='date' alt='".$_SESSION['DefaultDateFormat']."' name='ToDate' maxlength=10 size=10 VALUE='" . Date($_SESSION['DefaultDateFormat']) . "'></td></tr>";
+ echo '<tr><td>' . _('Enter the date to which orders are to be listed') . ':</td>
+ <td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '"></td></tr>';
echo '<tr><td>' . _('Inventory Category') . '</td><td>';
$sql = "SELECT categorydescription, categoryid FROM stockcategory WHERE stocktype<>'D' AND stocktype<>'L'";
@@ -61,7 +61,9 @@
}
echo '</select></td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '"></div>';
+ echo '</table>
+ <br />
+ <div class="centre"><input type="submit" name="Go" value="' . _('Create PDF') . '"></div>';
include('includes/footer.inc');
exit;
@@ -195,17 +197,17 @@
WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
-
+ GROUP BY salesorders.orderno,
+ salesorders.debtorno,
+ salesorders.branchcode,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.fromstkloc,
+ salesorderdetails.stkcode,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.decimalplaces";
+
} elseif ($_POST['CategoryID']!='All' AND $_POST['location']!='All'){
$sql= "SELECT salesorders.orderno,
@@ -251,7 +253,7 @@
stockmaster.decimalplaces";
}
-$sql .= ' ORDER BY salesorders.orderno';
+$sql .= " ORDER BY salesorders.orderno";
$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here
@@ -367,16 +369,16 @@
/*OK now get the invoices where the item was charged */
$sql = "SELECT debtortrans.order_,
- systypes.typename,
- debtortrans.transno,
- stockmoves.price,
- -stockmoves.qty AS quantity
- FROM debtortrans INNER JOIN stockmoves
- ON debtortrans.type = stockmoves.type
- AND debtortrans.transno=stockmoves.transno
- INNER JOIN systypes ON debtortrans.type=systypes.typeid
- WHERE debtortrans.order_ ='" . $OrderNo . "'
- AND stockmoves.stockid ='" . $myrow['stkcode'] . "'";
+ systypes.typename,
+ debtortrans.transno,
+ stockmoves.price,
+ -stockmoves.qty AS quantity
+ FROM debtortrans INNER JOIN stockmoves
+ ON debtortrans.type = stockmoves.type
+ AND debtortrans.transno=stockmoves.transno
+ INNER JOIN systypes ON debtortrans.type=systypes.typeid
+ WHERE debtortrans.order_ ='" . $OrderNo . "'
+ AND stockmoves.stockid ='" . $myrow['stkcode'] . "'";
$InvoicesResult =DB_query($sql,$db);
if (DB_num_rows($InvoicesResult)>0){
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2011-07-16 02:59:14 UTC (rev 4632)
+++ trunk/SelectWorkOrder.php 2011-07-16 03:37:58 UTC (rev 4633)
@@ -7,7 +7,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
-echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -37,50 +37,50 @@
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat']. "'
- AND stockmaster.mbflag='M'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.description " . LIKE . " '" . $SearchString . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat']. "'
+ AND stockmaster.mbflag='M'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
} elseif (isset($_POST['StockCode'])){
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- sum(locstock.quantity) as qoh,
- stockmaster.units
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- AND stockmaster.mbflag='M'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ sum(locstock.quantity) as qoh,
+ stockmaster.units
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ AND stockmaster.mbflag='M'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
} elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- sum(locstock.quantity) as qoh,
- stockmaster.units
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND stockmaster.categoryid='" . $_POST['StockCat'] ."'
- AND stockmaster.mbflag='M'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ sum(locstock.quantity) as qoh,
+ stockmaster.units
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.categoryid='" . $_POST['StockCat'] ."'
+ AND stockmaster.mbflag='M'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
}
$ErrMsg = _('No items were returned by the SQL because');
@@ -104,11 +104,11 @@
if (!isset($_REQUEST['WO']) or ($_REQUEST['WO']=='')){
echo '<table class=selection><tr><td>';
if (isset($_REQUEST['SelectedStockItem'])) {
- echo _('For the item') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . " <input type=hidden name='SelectedStockItem' value='" . $_REQUEST['SelectedStockItem'] . "'>";
+ echo _('For the item') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $_REQUEST['SelectedStockItem'] . '" />';
}
- echo _('Work Order number') . ": <input type="text" name='WO' MAXLENGTH =8 size=9>  " . _('Processing at') . ":<select name='StockLocation'> ";
+ echo _('Work Order number') . ': <input type="text" name="WO" maxlength="8" size="9" />  ' . _('Processing at') . ':<select name="StockLocation"> ';
- $sql = 'SELECT loccode, locationname FROM locations';
+ $sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
@@ -142,233 +142,235 @@
}
echo '</select>   ';
- echo "<input type=submit name='SearchOrders' value='" . _('Search') . "'>";
- echo ' <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('New Work Order') . '</a></td></tr></table><br />';
+ echo '<input type="submit" name="SearchOrders" value="' . _('Search') . '">';
+ echo ' <a href="' . $rootpath . '/WorkOrderEntry.php">' . _('New Work Order') . '</a></td></tr></table><br />';
}
- $SQL='SELECT categoryid,
+ $SQL="SELECT categoryid,
categorydescription
- FROM stockcategory
- ORDER BY categorydescription';
+ FROM stockcategory
+ ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
- echo "<table class=selection>
- <tr><th colspan=6><font size=3 color=navy>" . _('To search for work orders for a specific item use the item selection facilities below') . "</font></th></tr>
- <tr>
- <td><font size=1>" . _('Select a stock category') . ":</font>
- <select name='StockCat'>";
+ echo '<table class="selection">
+ <tr>
+ <th colspan="6"><font size="3" color="navy">' . _('To search for work orders for a specific item use the item selection facilities below') . '</font></th>
+ </tr>
+ <tr>
+ <td><font size="1">' . _('Select a stock category') . ':</font>
+ <select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
echo '</select>
- <td><font size=1>' . _('Enter text extract(s) in the description') . ':</font></td>
- <td><input type="Text" name="Keywords" size="20" maxlength="25" /></td>
- </tr>
+ <td><font size="1">' . _('Enter text extract(s) in the description') . ':</font></td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ </tr>
<tr><td></td>
<td><font size="3"><b>' . _('OR') . ' </b></font><font size=1>' . _('Enter extract of the Stock Code') . '</b>:</font></td>
- <td><input type="Text" name="StockCode" size="15" maxlength="18"></td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18"></td>
</tr>
</table><br />';
echo '<div class=centre><input type=submit name="SearchParts" value="' . _('Search Items Now') . '">
<input type=submit name="ResetPart" value="' . _('Show All') . '"></div>';
-if (isset($StockItemsResult)) {
-
- echo '<br /><table cellpadding=2 colspan=7 class=selection>';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
- echo $TableHeader;
-
- $j = 1;
- $k=0; //row colour counter
-
- while ($myrow=DB_fetch_array($StockItemsResult)) {
-
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
-
- printf("<td><input type=submit name='SelectedStockItem' value='%s'</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td>%s</td>
- </tr>",
- $myrow['stockid'],
- $myrow['description'],
- $myrow['qoh'],
- $myrow['units']);
-
- $j++;
- if ($j == 12){
- $j=1;
- echo $TableHeader;
- }
-//end of page full new headings if
- }
-//end of while loop
-
- echo '</table>';
-
-}
-//end if stock search results to show
- else {
-
- if (!isset($_POST['StockLocation'])) {
- $_POST['StockLocation'] = '';
- }
-
- //figure out the SQL required from the inputs available
- if (isset($_POST['ClosedOrOpen']) and $_POST['ClosedOrOpen']=='Open_Only'){
- $ClosedOrOpen = 0;
- } else {
- $ClosedOrOpen = 1;
- }
- if (isset($_REQUEST['WO']) && $_REQUEST['WO'] !='') {
- $SQL = "SELECT workorders.wo,
- woitems.stockid,
- stockmaster.description,
- woitems.qtyreqd,
- woitems.qtyrecd,
- workorders.requiredby
- FROM workorders
- INNER JOIN woitems ON workorders.wo=woitems.wo
- INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
- WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND workorders.wo='". $_REQUEST['WO'] ."'
- ORDER BY workorders.wo,
- woitems.stockid";
- } else {
- /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
-
- if (isset($_REQUEST['SelectedStockItem'])) {
- $SQL = "SELECT workorders.wo,
- woitems.stockid,
- stockmaster.description,
- woitems.qtyreqd,
- woitems.qtyrecd,
- workorders.requiredby
- FROM workorders
- INNER JOIN woitems ON workorders.wo=woitems.wo
- INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
- WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND woitems.stockid='". $_REQUEST['SelectedStockItem'] ."'
- AND workorders.loccode='" . $_POST['StockLocation'] . "'
- ORDER BY workorders.wo,
- woitems.stockid";
+ if (isset($StockItemsResult)) {
+
+ echo '<br />
+ <table cellpadding="2" colspan="7" class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
+ echo $TableHeader;
+
+ $j = 1;
+ $k=0; //row colour counter
+
+ while ($myrow=DB_fetch_array($StockItemsResult)) {
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
} else {
- $SQL = "SELECT workorders.wo,
- woitems.stockid,
- stockmaster.description,
- woitems.qtyreqd,
- woitems.qtyrecd,
- workorders.requiredby
- FROM workorders
- INNER JOIN woitems ON workorders.wo=woitems.wo
- INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
- WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND workorders.loccode='" . $_POST['StockLocation'] . "'
- ORDER BY workorders.wo,
- woitems.stockid";
+ echo '<tr class="OddTableRows">';
+ $k++;
}
- } //end not order number selected
-
- $ErrMsg = _('No works orders were returned by the SQL because');
- $WorkOrdersResult = DB_query($SQL,$db,$ErrMsg);
-
- /*show a table of the orders returned by the SQL */
- if (DB_num_rows($WorkOrdersResult)>0) {
- echo '<br /><table cellpadding=2 colspan=7 width=95% class=selection>';
-
-
- $tableheader = '<tr>
- <th>' . _('Modify') . '</th>
- <th>' . _('Status') . '</th>
- <th>' . _('Receive') . '</th>
- <th>' . _('Issue To') . '</th>
- <th>' . _('Costing') . '</th>
- <th>' . _('Item') . '</th>
- <th>' . _('Quantity Required') . '</th>
- <th>' . _('Quantity Received') . '</th>
- <th>' . _('Quantity Outstanding') . '</th>
- <th>' . _('Required Date') . '</th>
- </tr>';
-
- echo $tableheader;
+
+ printf('<td><input type="submit" name="SelectedStockItem" value="%s" /></td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $myrow['qoh'],
+ $myrow['units']);
+
+ $j++;
+ if ($j == 12){
+ $j=1;
+ echo $TableHeader;
+ }
+ //end of page full new headings if
+ }
+ //end of while loop
+
+ echo '</table>';
+
}
- $j = 1;
- $k=0; //row colour counter
- while ($myrow=DB_fetch_array($WorkOrdersResult)) {
-
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
+ //end if stock search results to show
+ else {
+
+ if (!isset($_POST['StockLocation'])) {
+ $_POST['StockLocation'] = '';
+ }
+
+ //figure out the SQL required from the inputs available
+ if (isset($_POST['ClosedOrOpen']) and $_POST['ClosedOrOpen']=='Open_Only'){
+ $ClosedOrOpen = 0;
} else {
- echo '<tr class="OddTableRows">';
- $k++;
+ $ClosedOrOpen = 1;
}
-
- $ModifyPage = $rootpath . '/WorkOrderEntry.php?WO=' . $myrow['wo'];
- $Status_WO = $rootpath . '/WorkOrderStatus.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
- $Receive_WO = $rootpath . '/WorkOrderReceive.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
- $Issue_WO = $rootpath . '/WorkOrderIssue.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
- $Costing_WO =$rootpath . '/WorkOrderCosting.php?WO=' .$myrow['wo'];
-
- $FormatedRequiredByDate = ConvertSQLDate($myrow['requiredby']);
-
-
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Status') . "</a></td>
- <td><a href='%s'>" . _('Receive') . "</a></td>
- <td><a href='%s'>" . _('Issue To') . "</a></td>
- <td><a href='%s'>" . _('Costing') . "</a></td>
- <td>%s - %s</td>
- <td class=number>%s</td>
- <td class=number>%s</td>
- <td class=number>%s</td>
- <td>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['wo'],
- $Status_WO,
- $Receive_WO,
- $Issue_WO,
- $Costing_WO,
- $myrow['stockid'],
- $myrow['description'],
- $myrow['qtyreqd'],
- $myrow['qtyrecd'],
- $myrow['qtyreqd']-$myrow['qtyrecd'],
- $FormatedRequiredByDate);
-
- $j++;
- if ($j == 12){
- $j=1;
+ if (isset($_REQUEST['WO']) && $_REQUEST['WO'] !='') {
+ $SQL = "SELECT workorders.wo,
+ woitems.stockid,
+ stockmaster.description,
+ woitems.qtyreqd,
+ woitems.qtyrecd,
+ workorders.requiredby
+ FROM workorders
+ INNER JOIN woitems ON workorders.wo=woitems.wo
+ INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
+ WHERE workorders.closed='" . $ClosedOrOpen . "'
+ AND workorders.wo='". $_REQUEST['WO'] ."'
+ ORDER BY workorders.wo,
+ woitems.stockid";
+ } else {
+ /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+
+ if (isset($_REQUEST['SelectedStockItem'])) {
+ $SQL = "SELECT workorders.wo,
+ woitems.stockid,
+ stockmaster.description,
+ woitems.qtyreqd,
+ woitems.qtyrecd,
+ workorders.requiredby
+ FROM workorders
+ INNER JOIN woitems ON workorders.wo=woitems.wo
+ INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
+ WHERE workorders.closed='" . $ClosedOrOpen . "'
+ AND woitems.stockid='". $_REQUEST['SelectedStockItem'] ."'
+ AND workorders.loccode='" . $_POST['StockLocation'] . "'
+ ORDER BY workorders.wo,
+ woitems.stockid";
+ } else {
+ $SQL = "SELECT workorders.wo,
+ woitems.stockid,
+ stockmaster.description,
+ woitems.qtyreqd,
+ woitems.qtyrecd,
+ workorders.requiredby
+ FROM workorders
+ INNER JOIN woitems ON workorders.wo=woitems.wo
+ INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
+ WHERE workorders.closed='" . $ClosedOrOpen . "'
+ AND workorders.loccode='" . $_POST['StockLocation'] . "'
+ ORDER BY workorders.wo,
+ woitems.stockid";
+ }
+ } //end not order number selected
+
+ $ErrMsg = _('No works orders were returned by the SQL because');
+ $WorkOrdersResult = DB_query($SQL,$db,$ErrMsg);
+
+ /*show a table of the orders returned by the SQL */
+ if (DB_num_rows($WorkOrdersResult)>0) {
+ echo '<br />
+ <table cellpadding="2" colspan="7" width="95%" class="selection">';
+
+
+ $tableheader = '<tr>
+ <th>' . _('Modify') . '</th>
+ <th>' . _('Status') . '</th>
+ <th>' . _('Receive') . '</th>
+ <th>' . _('Issue To') . '</th>
+ <th>' . _('Costing') . '</th>
+ <th>' . _('Item') . '</th>
+ <th>' . _('Quantity Required') . '</th>
+ <th>' . _('Quantity Received') . '</th>
+ <th>' . _('Quantity Outstanding') . '</th>
+ <th>' . _('Required Date') . '</th>
+ </tr>';
+
echo $tableheader;
}
- //end of page full new headings if
+ $j = 1;
+ $k=0; //row colour counter
+ while ($myrow=DB_fetch_array($WorkOrdersResult)) {
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+
+ $ModifyPage = $rootpath . '/WorkOrderEntry.php?WO=' . $myrow['wo'];
+ $Status_WO = $rootpath . '/WorkOrderStatus.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
+ $Receive_WO = $rootpath . '/WorkOrderReceive.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
+ $Issue_WO = $rootpath . '/WorkOrderIssue.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
+ $Costing_WO =$rootpath . '/WorkOrderCosting.php?WO=' .$myrow['wo'];
+
+ $FormatedRequiredByDate = ConvertSQLDate($myrow['requiredby']);
+
+
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Status') . '</a></td>
+ <td><a href="%s">' . _('Receive') . '</a></td>
+ <td><a href="%s">' . _('Issue To') . '</a></td>
+ <td><a href="%s">' . _('Costing') . '</a></td>
+ <td>%s - %s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['wo'],
+ $Status_WO,
+ $Receive_WO,
+ $Issue_WO,
+ $Costing_WO,
+ $myrow['stockid'],
+ $myrow['description'],
+ $myrow['qtyreqd'],
+ $myrow['qtyrecd'],
+ $myrow['qtyreqd']-$myrow['qtyrecd'],
+ $FormatedRequiredByDate);
+
+ $j++;
+ if ($j == 12){
+ $j=1;
+ echo $tableheader;
+ }
+ //end of page full new headings if
+ }
+ //end of while loop
+
+ echo '</table>';
}
- //end of while loop
-
- echo '</table>';
+
+ echo '<script>defaultControl(document.forms[0].WO);</script>';
+
+ echo '</form>';
}
-echo "<script>defaultControl(document.forms[0].WO);</script>";
-
-?>
-</form>
-
-<?php }
-
include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
