Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3521] trunk
|
From: <tim...@us...> - 2010-06-24 22:08:47
|
Revision: 3521
http://web-erp.svn.sourceforge.net/web-erp/?rev=3521&view=rev
Author: tim_schofield
Date: 2010-06-24 22:08:41 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Layout changes
Modified Paths:
--------------
trunk/SelectWorkOrder.php
trunk/doc/Change.log.html
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2010-06-24 19:31:09 UTC (rev 3520)
+++ trunk/SelectWorkOrder.php 2010-06-24 22:08:41 UTC (rev 3521)
@@ -12,11 +12,11 @@
echo '<form action=' . $_SERVER['PHP_SELF'] .'?' .SID . ' method=post>';
-If (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+if (isset($_POST['ResetPart'])){
+ unset($_REQUEST['SelectedStockItem']);
}
-If (isset($_REQUEST['WO']) AND $_REQUEST['WO']!='') {
+if (isset($_REQUEST['WO']) AND $_REQUEST['WO']!='') {
$_REQUEST['WO'] = trim($_REQUEST['WO']);
if (!is_numeric($_REQUEST['WO'])){
prnMsg(_('The work order number entered MUST be numeric'),'warn');
@@ -34,10 +34,10 @@
if (isset($_POST['SearchParts'])){
- If ($_POST['Keywords'] AND $_POST['StockCode']) {
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
echo _('Stock description keywords have been used in preference to the Stock code extract entered');
}
- If ($_POST['Keywords']) {
+ if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -101,13 +101,13 @@
if (!isset($StockID)) {
- /* Not appropriate really to restrict search by date since may miss older
- ouststanding orders
+ /* Not appropriate really to restrict search by date since may miss older
+ ouststanding orders
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
- */
+ */
if (!isset($_REQUEST['WO']) or ($_REQUEST['WO']=='')){
-
+ echo '<table class=selection><tr><td>';
echo _('Work Order number') . ": <input type=text name='WO' MAXLENGTH =8 size=9>  " . _('Processing at') . ":<select name='StockLocation'> ";
$sql = 'SELECT loccode, locationname FROM locations';
@@ -117,9 +117,9 @@
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo "<option selected Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
+ 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']){
echo "<option selected Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
@@ -145,7 +145,7 @@
echo '</select>   ';
echo "<input type=submit name='SearchOrders' VALUE='" . _('Search') . "'>";
- echo ' <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('New Work Order') . '</a>';
+ echo ' <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('New Work Order') . '</a></td></tr></table>';
}
$SQL='SELECT categoryid,
@@ -156,30 +156,30 @@
$result1 = DB_query($SQL,$db);
echo '<hr>
- <font size=1>' . _('To search for work orders for a specific item use the item selection facilities below') . "</font>
+ <table class=selection><tr><td><font size=1>' . _('To search for work orders for a specific item use the item selection facilities below') . "</font>
<input type=submit name='SearchParts' VALUE='" . _('Search Items Now') . "'>
- <input type=submit name='ResetPart' VALUE='" . _('Show All') . "'>
- <table>
- <tr>
- <td><font size=1>" . _('Select a stock category') . ":</font>
- <select name='StockCat'>";
+ <input type=submit name='ResetPart' VALUE='" . _('Show All') . "'> </td></tr></table><br>
+ <table class=selection>
+ <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'];
}
- 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>
+ 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>
- <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>
- </tr>
- </table>
- <hr>";
+ <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>
+ </tr>
+ </table>
+ <hr>";
-If (isset($StockItemsResult)) {
+if (isset($StockItemsResult)) {
echo '<table cellpadding=2 colspan=7 BORDER=2>';
$TableHeader = "<tr>
@@ -214,7 +214,7 @@
$myrow['units']);
$j++;
- If ($j == 12){
+ if ($j == 12){
$j=1;
echo $TableHeader;
}
@@ -227,7 +227,7 @@
}
//end if stock search results to show
else {
-
+
if (!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = '';
}
@@ -253,7 +253,7 @@
ORDER BY workorders.wo,
woitems.stockid";
} else {
- /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+ /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
if (isset($_REQUEST['SelectedStockItem'])) {
$SQL = "SELECT workorders.wo,
@@ -356,7 +356,7 @@
$FormatedRequiredByDate);
$j++;
- If ($j == 12){
+ if ($j == 12){
$j=1;
echo $tableheader;
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-06-24 19:31:09 UTC (rev 3520)
+++ trunk/doc/Change.log.html 2010-06-24 22:08:41 UTC (rev 3521)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>24/06/10 Tim: SelectWorkOrder.php - Layout changes</p>
<p>24/06/10 Tim: WorkOrderEntry.php - sql string must be unset before it can become an array</p>
<p>24/06/10 Tim: upgrade3.11.1-3.12.sql - Add fields in salesorderfdetails table to enable new salesman commission program</p>
<p>24/06/10 Phil: WOCosting.php fix to variances calculation were based on total quantity of the work order items required not the actual quantity of the work order items received as finished!!! Was correct when first released but has been wrong for several years</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
