Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5231] trunk
|
From: <vv...@us...> - 2012-04-07 18:10:17
|
Revision: 5231
http://web-erp.svn.sourceforge.net/web-erp/?rev=5231&view=rev
Author: vvs2012
Date: 2012-04-07 18:10:09 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockTransfer.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PeriodsInquiry.php
Modified: trunk/PDFRemittanceAdvice.php
===================================================================
--- trunk/PDFRemittanceAdvice.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PDFRemittanceAdvice.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -130,10 +130,14 @@
$title=_('Remittance Advices');
include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . $title . '" alt="" />' . ' '
+ . $title . '</p>';
/* show form to allow input */
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"><table>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table>';
if (!isset($_POST['FromCriteria']) or mb_strlen($_POST['FromCriteria'])<1){
$DefaultFromCriteria = '1';
@@ -146,7 +150,7 @@
$DefaultToCriteria = $_POST['ToCriteria'];
}
echo '<tr>
- <td>' . _('From Supplier Code') . ':</font></td>
+ <td>' . _('From Supplier Code') . ':</td>
<td><input type="text" maxlength="6" size="7" name="FromCriteria" value="' . $DefaultFromCriteria . '" /></td>
</tr>';
echo '<tr>
@@ -166,9 +170,13 @@
</tr>';
echo '</table>
+ <br />
<div class="centre">
- <input type="submit" Name="PrintPDF" value="' . _('Print PDF') . '" />
+ <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>';
+
+ echo '</div>
+ </form>';
include ('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PDFStockCheckComparison.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -329,10 +329,12 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
. $title . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"><table class="selection">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- echo '<tr><td>' . _('Choose Option'). ':</font></td>
+
+ echo '<table class="selection">';
+ echo '<tr><td>' . _('Choose Option'). ':</td>
<td><select name="ReportOrClose">';
if ($_POST['ReportOrClose']=='ReportAndClose'){
@@ -355,7 +357,10 @@
echo '<option selected="selected" value="Leave">' . _('Do not Adjust System stock to Nil') . '</option>';
}
+ echo '</select></td></tr>';
echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF'). '" /></div>';
+ echo '</div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PDFStockLocTransfer.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -16,6 +16,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . _('Reprint transfer docket').'</p><br />';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table>
<tr>
@@ -23,8 +24,12 @@
<td><input type="text" class="number" size="10" name="TransferNo" /></td>
</tr>
</table>';
- echo '<div class="centre">
- <input type="submit" name="Print" value="' . _('Print') .'" />';
+ echo '<br />
+ <div class="centre">
+ <input type="submit" name="Print" value="' . _('Print') .'" />
+ </div>';
+ echo '</div>
+ </form>';
include ('includes/footer.inc');
exit;
}
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PDFStockTransfer.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -20,7 +20,8 @@
$title = _('Print Stock Transfer');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print Transfer Note') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">
<tr>
@@ -32,6 +33,7 @@
<div class="centre">
<input type="submit" name="Process" value="' . _('Print Transfer Note') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
exit();
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/POReport.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -66,7 +66,7 @@
submitcsv($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . '</img>' . $title.'</p>';
+ '" alt="" />' . $title.'</p>';
display($db);
}
@@ -814,9 +814,10 @@
locale_number_format($TotalExtPrice,2),
locale_number_format($TotalInvQty,2),
' ');
+ echo '</table>';
} // End of if ($_POST['ReportType']
- echo '</table>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="ReportType" value="'.$_POST['ReportType'].'" />';
echo '<input type="hidden" name="DateType" value="'.$_POST['DateType'].'" />';
@@ -834,7 +835,8 @@
echo '<input type="hidden" name="SortBy" value="'.$_POST['SortBy'].'" />';
echo '<input type="hidden" name="SummaryType" value="'.$_POST['SummaryType'].'" />';
echo '<br /><div class="centre"><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} // End of if inputerror != 1
} // End of function submit()
@@ -1495,6 +1497,7 @@
// the page is called.
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -1503,17 +1506,17 @@
echo '<td><select name="ReportType">';
echo '<option selected="selected" value="Detail">' . _('Detail') . '</option>';
echo '<option value="Summary">' . _('Summary') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
echo '<tr><td>' . _('Date Type') . ':</td>';
echo '<td><select name="DateType">';
echo '<option selected="selected" value="Order">' . _('Order Date') . '</option>';
echo '<option value="Delivery">' . _('Delivery Date') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
echo '<tr>
<td>' . _('Date Range') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] .'" /> ' . _('To') . ':  
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] .'" /> ' . _('To') . ':
<input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
</tr>';
@@ -1522,11 +1525,11 @@
echo '<option selected="selected" value="Equals">' . _('Equals') . '</option>';
echo '<option value="LIKE">' . _('Begins With') . '</option>';
echo '</select>';
- echo '  <input type="text" name="PartNumber" size="20" maxlength="20" value="';
+ echo ' <input type="text" name="PartNumber" size="20" maxlength="20" value="';
if (isset($_POST['PartNumber'])) {
echo $_POST['PartNumber'] . '" /></td></tr>';
} else {
- echo '"></td></tr>';
+ echo '" /></td></tr>';
}
echo '<tr><td>' . _('Supplier Number') . ':</td>';
@@ -1534,11 +1537,11 @@
echo '<option selected="selected" value="Equals">' . _('Equals') . '</option>';
echo '<option value="LIKE">' . _('Begins With') . '</option>';
echo '</select>';
- echo '  <input type="text" name="SupplierId" size="10" maxlength="10" value="';
+ echo ' <input type="text" name="SupplierId" size="10" maxlength="10" value="';
if (isset($_POST['SupplierId'])) {
echo $_POST['SupplierId'] . '" /></td></tr>';
} else {
- echo '"></td></tr>';
+ echo '" /></td></tr>';
}
echo '<tr><td>' . _('Supplier Name') . ':</td>';
@@ -1546,7 +1549,7 @@
echo '<option selected="selected" value="LIKE">' . _('Begins With') . '</option>';
echo '<option value="Equals">' . _('Equals') . '</option>';
echo '</select>';
- echo '  <input type="text" name="SupplierName" size="30" maxlength="30" value="';
+ echo ' <input type="text" name="SupplierName" size="30" maxlength="30" value="';
if (isset($_POST['SupplierName'])) {
echo $_POST['SupplierName'] . '" /></td></tr>';
} else {
@@ -1554,12 +1557,12 @@
}
echo '<tr><td>' . _('Order Number') . ':</td>';
- echo '<td>'._('Equals').':  ';
+ echo '<td>'._('Equals').': ';
echo '<input type="text" name="OrderNo" size="10" maxlength="10" value="';
if (isset($_POST['OrderNo'])) {
echo $_POST['OrderNo'] . '" /></td></tr>';
} else {
- echo '"></td></tr>';
+ echo '" /></td></tr>';
}
echo '<tr><td>' . _('Line Item Status') . ':</td>';
@@ -1567,7 +1570,7 @@
echo '<option selected="selected" value="All">' . _('All') . '</option>';
echo '<option value="Completed">' . _('Completed') . '</option>';
echo '<option value="Open">' . _('Not Completed') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
echo '<tr><td>' . _('Stock Categories') . ':</td><td><select name="Category">';
$sql="SELECT categoryid, categorydescription FROM stockcategory";
@@ -1578,16 +1581,16 @@
}
echo '</select></td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Sort By') . ':</td>';
echo '<td><select name="SortBy">';
echo '<option selected="selected" value="purchorderdetails.orderno">' . _('Order Number') . '</option>';
echo '<option value="purchorderdetails.itemcode">' . _('Part Number') . '</option>';
echo '<option value="suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Number') . '</option>';
echo '<option value="suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Name') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>';
echo '<td><select name="SummaryType">';
echo '<option selected="selected" value="orderno">' . _('Order Number') . '</option>';
@@ -1597,9 +1600,9 @@
echo '<option value="suppname">' . _('Supplier Name') . '</option>';
echo '<option value="month">' . _('Month') . '</option>';
echo '<option value="categoryid">' . _('Stock Category') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
- echo '<tr><td> </td></tr>
+ echo '<tr><td> </td></tr>
<tr>
<td colspan="4"><div class="centre"><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></div></td>
</tr>
@@ -1608,7 +1611,8 @@
</tr>
</table>
<br/>';
- echo '</form>';
+ echo '</div>
+ </form>';
} // End of function display()
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_AuthorisationLevels.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -147,10 +147,10 @@
<td>' . $DisplayCanCreate . '</td>
<td>' . $DisplayOffHold . '</td>
<td class="number">'.locale_number_format($myrow['authlevel'],$myrow['decimalplaces']).'</td>
- <td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Edit=Yes&UserID=' . $myrow['userid'] .
- '&Currency='.$myrow['currabrev'].'">'._('Edit').'</td>
- <td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Delete=Yes&UserID=' . $myrow['userid'] .
- '&Currency='.$myrow['currabrev'].'" onclick="return confirm(\'' . _('Are you sure you wish to delete this authorisation level?') . '\');">'._('Delete').'</td>
+ <td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Edit=Yes&UserID=' . $myrow['userid'] .
+ '&Currency='.$myrow['currabrev'].'">'._('Edit').'</a></td>
+ <td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Delete=Yes&UserID=' . $myrow['userid'] .
+ '&Currency='.$myrow['currabrev'].'" onclick="return confirm(\'' . _('Are you sure you wish to delete this authorisation level?') . '\');">'._('Delete').'</a></td>
</tr>';
}
@@ -164,7 +164,8 @@
$AuthLevel=0;
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form1">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -230,7 +231,7 @@
echo '<td><input type="checkbox" name="CanCreate" /></td>
</tr>';
} else {
- echo '<td><input type="checkbox" checked name="CanCreate" /></td>
+ echo '<td><input type="checkbox" checked="checked" name="CanCreate" /></td>
</tr>';
}
@@ -240,7 +241,7 @@
echo '<td><input type="checkbox" name="OffHold" /></td>
</tr>';
} else {
- echo '<td><input type="checkbox" checked name="OffHold" /></td>
+ echo '<td><input type="checkbox" checked="checked" name="OffHold" /></td>
</tr>';
}
@@ -254,14 +255,14 @@
echo '<br />
<div class="centre">
<input type="submit" name="Update" value="'._('Update Information').'" />
- </div>
- </form>';
+ </div>';
} else {
echo '<br />
<div class="centre">
<input type="submit" name="Submit" value="'._('Enter Information').'" />
- </div>
- </form>';
+ </div>';
}
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_AuthoriseMyOrders.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -49,6 +49,7 @@
$result=DB_query($sql, $db);
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -140,6 +141,7 @@
<div class="centre">
<input type="submit" name="UpdateAll" value="' . _('Update'). '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_Header.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -302,13 +302,9 @@
if (isset($_POST['SearchSuppliers'])){
- if (mb_strlen($_POST['Keywords'])>0 AND mb_strlen($_SESSION['PO'.$identifier]->SupplierID)>0) {
- prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'),'warn');
- }
- if ($_POST['Keywords']=='' AND $_POST['SuppCode']=='') {
- echo '<div><br /><br /></div>';
- prnMsg(_('At least one Supplier Name keyword OR an extract of a Supplier Code must be entered for the search'),'error');
- } else {
+ if (mb_strlen($_POST['Keywords'])>0 AND mb_strlen($_SESSION['PO'.$identifier]->SupplierID)>0) {
+ prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'),'warn');
+ }
if (mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -339,7 +335,19 @@
FROM suppliers
WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SuppCode'] . "%'
ORDER BY suppliers.supplierid";
- }
+ } else {
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ ORDER BY suppliers.supplierid";
+ }
$ErrMsg = _('The searched supplier records requested cannot be retrieved because');
$result_SuppSelect = DB_query($SQL,$db,$ErrMsg);
@@ -351,7 +359,6 @@
prnMsg( _('No supplier records contain the selected text') . ' - ' .
_('please alter your search criteria and try again'),'info');
}
- } /*one of keywords or SuppCode was more than a zero length string */
} /*end of if search for supplier codes/names */
@@ -525,32 +532,33 @@
OR $_SESSION['PO'.$identifier]->SupplierID=='' ) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Purchase Order') . '" alt="">' . ' ' . _('Purchase Order: Select Supplier') . '';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post" name="choosesupplier">';
+ _('Purchase Order') . '" alt="" />' . ' ' . _('Purchase Order: Select Supplier') . '</p>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post" id="choosesupplier">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SuppliersReturned)){
echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned .'" />';
}
- echo '<table cellpadding="3" colspan="4" class="selection">
+ echo '<table cellpadding="3" class="selection">
<tr>
- <td><font size="1">' . _('Enter text in the supplier name') . ':</font></td>
+ <td>' . _('Enter text in the supplier name') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter text extract in the supplier code') . ':</font></td>
+ <td><h3><b>' . _('OR') . '</b></h3></td>
+ <td>' . _('Enter text extract in the supplier code') . ':</td>
<td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
</tr>
</table>
<br />
<div class="centre">
<input type="submit" name="SearchSuppliers" value="' . _('Search Now') . '" />
- <input type="submit" action="reset" value="' . _('Reset') . '" /></div>';
+ <input type="submit" value="' . _('Reset') . '" /></div>';
echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
if (isset($result_SuppSelect)) {
- echo '<br /><table cellpadding="3" colspan="7" class="selection">';
+ echo '<br /><table cellpadding="3" class="selection">';
$tableheader = '<tr>
<th>' . _('Code') . '</th>
@@ -597,13 +605,14 @@
} else {
/* everything below here only do if a supplier is selected */
- echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<form id="form1" 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 '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="" />
' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
- ' . $_SESSION['PO'.$identifier]->CurrCode . '<br />';
+ ' . $_SESSION['PO'.$identifier]->CurrCode . '</p>';
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
@@ -712,10 +721,10 @@
$_POST['PaymentTerms']=$_SESSION['PO'.$identifier]->PaymentTerms;
}
- echo '<br /><table colspan="1" width="80%">
+ echo '<br /><table width="80%">
<tr>
- <th><b>' . _('Order Initiation Details') . '</b></th>
- <th><b>' . _('Order Status') . '</b></th>
+ <th><h3>' . _('Order Initiation Details') . '</h3></th>
+ <th><h3>' . _('Order Status') . '</h3></th>
</tr>
<tr><td style="width:50%">';
//sub table starts
@@ -787,10 +796,10 @@
echo '<tr><td colspan="2"><a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['ExistingOrder'] . '&identifier='.$identifier. '">' . _('Reprint Now') . '</a></td></tr>';
}
- echo '</table>';
+ echo '</table></td>';
//Set up the next column with a sub-table in it too
- echo '<td style="width:50%" valign=top>
- <table class="selection" width="100%">';
+ echo '<td style="width:50%" valign="top">
+ <table class="selection" width="100%">';
if($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO'.$identifier]->Status == 'Printed'){
@@ -798,8 +807,8 @@
$_SESSION['PO'.$identifier]->OrderNo . '&identifier=' . $identifier . '">'._('Receive this order').'</a></td></tr>';
}
if ($_SESSION['PO'.$identifier]->Status==''){ //then its a new order
- echo '<input type="hidden" name="Status" value="NewOrder" />';
- echo '<tr><td>' . _('New Purchase Order') . '</td></tr>';
+ echo '<tr><td><input type="hidden" name="Status" value="NewOrder" />';
+ echo _('New Purchase Order') . '</td></tr>';
} else {
echo '<tr><td>' . _('Status') . ' : </td>
<td><select name="Status" onchange="ReloadForm(form1.UpdateStatus)">';
@@ -845,18 +854,17 @@
</tr>';
echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlspecialchars($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
- echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td>';
+ echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td></tr>';
} //end its not a new order
- echo '</tr></table></td>';
+ echo '</table></td></tr>';
- echo '<table width="80%">
- <tr>
- <th><font color=blue size="4"><b>' . _('Warehouse Info') . '</b></font></th>
- <!-- <th><font color=blue size="4"><b>' . _('Delivery To') . '</b></font></th> -->
- <th><font color=blue size="4"><b>' . _('Supplier Info') . '</b></font></th>
+ echo '<tr>
+ <th><h3>' . _('Warehouse Info') . '</h3></th>
+ <!-- <th><h3>' . _('Delivery To') . '</h3></th> -->
+ <th><h3>' . _('Supplier Info') . '</h3></th>
</tr>
- <tr><td valign=top>';
+ <tr><td valign="top">';
/*nested table level1 */
echo '<table class="selection" width="100%">
@@ -1005,7 +1013,7 @@
}
}
- echo '</select></tr></table>';
+ echo '</select></td></tr></table>';
/* end of sub table */
echo '</td><td>'; /*sub table nested */
@@ -1028,8 +1036,7 @@
echo '<input type="submit" name="SearchSuppliers" value="' . _('Select Now') . '" /></td>
</tr>';
- echo '</td></tr>
- <tr>
+ echo '<tr>
<td>' . _('Supplier Contact') . ':</td>
<td><select name="SupplierContact">';
@@ -1106,12 +1113,12 @@
<td><input type="text" name="ExRate" value="'. locale_number_format($_POST['ExRate'],5).'" class="number" size="11" /></td>
</tr>';
} else {
- echo '<input type="hidden" name="ExRate" value="1" />';
+ echo '<tr><td><input type="hidden" name="ExRate" value="1" /></td></tr>';
}
- echo '</td></tr></table>'; /*end of sub table */
+ echo '</table>'; /*end of sub table */
echo '</td></tr>
- <tr><th colspan="4"><font color="blue" size="4"><b>' . _('Comments');
+ <tr><th colspan="4"><h3>' . _('Comments');
$Default_Comments = '';
@@ -1119,11 +1126,9 @@
$_POST['Comments']=$Default_Comments;
}
- echo ':</b></font></th></tr>
- <tr><td colspan="4"><textarea name="Comments" style="width:100%" rows="5">' . $_POST['Comments'] . '</textarea>';
+ echo ':</h3></th></tr>
+ <tr><td colspan="4"><textarea name="Comments" style="width:100%" rows="5" cols="200">' . $_POST['Comments'] . '</textarea>';
- echo '</table>';
-
echo '</td></tr></table><br />'; /* end of main table */
echo '<div class="centre">
@@ -1132,6 +1137,7 @@
} /*end of if supplier selected */
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_Items.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -641,20 +641,21 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*need to set up entry for item description where not a stock item and GL Codes */
if (count($_SESSION['PO'.$identifier]->LineItems)>0 and !isset($_GET['Edit'])){
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Purchase Order') . '" alt=""> '.$_SESSION['PO'.$identifier]->SupplierName;
+ _('Purchase Order') . '" alt="" /> '.$_SESSION['PO'.$identifier]->SupplierName;
if (isset($_SESSION['PO'.$identifier]->OrderNo)) {
echo ' ' . _('Purchase Order') .' '. $_SESSION['PO'.$identifier]->OrderNo ;
}
- echo '<br /><b>'._(' Order Summary') . '</b>';
- echo '<table cellpadding="2" colspan="7" class="selection">';
+ echo '<br /><b>'._(' Order Summary') . '</b></p>';
+ echo '<table cellpadding="2" class="selection">';
echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -705,9 +706,9 @@
<td class="number">' . $DisplayLineTotal . '</td>
<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'].'" name="ReqDelDate' . $POLine->LineNo.'" size="10" value="' .$POLine->ReqDelDate .'" /></td>';
if ($POLine->QtyReceived !=0 AND $POLine->Completed!=1){
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .'&Complete=' . $POLine->LineNo . '">' . _('Complete') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .'&Complete=' . $POLine->LineNo . '">' . _('Complete') . '</a></td>';
} elseif ($POLine->QtyReceived ==0) {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .'&Delete=' . $POLine->LineNo . '">' . _('Delete'). '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .'&Delete=' . $POLine->LineNo . '">' . _('Delete'). '</a></td>';
}
echo '</tr>';
$_SESSION['PO'.$identifier]->Total += $LineTotal;
@@ -1013,10 +1014,9 @@
echo '<table class="selection">
<tr>
- <th colspan="3"><font size="3" color="blue">'. _('Search For Stock Items') . '</th>';
+ <th colspan="3"><h3>'. _('Search For Stock Items') . ':</h3></th>';
- echo ':</font>
- </tr>
+ echo '</tr>
<tr><td>' . _('Item Category') . ': <select name="StockCat">';
echo '<option selected="selected" value="All">' . _('All') . '</option>';
@@ -1048,11 +1048,11 @@
echo 'checked';
}
echo ' /></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font>' . _('Enter extract of the Stock Code') . ':</td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the Stock Code') . ':</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
<tr><td></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td></tr>
+ <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td></tr>
</table>
<br />
@@ -1065,7 +1065,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7" class="selection">';
+ echo '<table cellpadding="1" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
@@ -1133,6 +1133,7 @@
echo '<a name="end"></a><br /><div class="centre"><input type="submit" name="NewItem" value="Order some" /></div>';
}#end if SearchResults to show
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_OrderDetails.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -24,7 +24,7 @@
$OrderRow = DB_fetch_row($OrderResult);
$_GET['OrderNo'] = $OrderRow[0];
- echo '<br /><font size="4" color=BLUE>' . _('Order Number') . ' ' . $_GET['OrderNo'] . '</font>';
+ echo '<br /><h3>' . _('Order Number') . ' ' . $_GET['OrderNo'] . '</h3>';
}
if (!isset($_GET['OrderNo'])) {
@@ -85,30 +85,30 @@
_('Purchase Order') . '" alt="" />' . ' ' . $title . '</p>';
echo '<table class="selection" cellpadding="2">';
-echo '<tr><th colspan="8"><font size="3" color="navy">'. _('Order Header Details'). '</font></th></tr>';
-echo '<tr><th style="text-align:left">' . _('Supplier Code'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['supplierid'] . '</a></td>
- <th style="text-align:left">' . _('Supplier Name'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['suppname'] . '</a></td></tr>';
+echo '<tr><th colspan="8"><b>'. _('Order Header Details'). '</b></th></tr>';
+echo '<tr><td style="text-align:left">' . _('Supplier Code'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['supplierid'] . '</a></td>
+ <td style="text-align:left">' . _('Supplier Name'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['suppname'] . '</a></td></tr>';
-echo '<tr><th style="text-align:left">' . _('Ordered On'). '</td><td>' . ConvertSQLDate($myrow['orddate']) . '</td>
- <th style="text-align:left">' . _('Delivery Address 1'). '</td><td>' . $myrow['deladd1'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Ordered On'). '</td><td>' . ConvertSQLDate($myrow['orddate']) . '</td>
+ <td style="text-align:left">' . _('Delivery Address 1'). '</td><td>' . $myrow['deladd1'] . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Order Currency'). '</td><td>' . $myrow['currcode'] . '</td>
- <th style="text-align:left">' . _('Delivery Address 2'). '</td><td>' . $myrow['deladd2'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Order Currency'). '</td><td>' . $myrow['currcode'] . '</td>
+ <td style="text-align:left">' . _('Delivery Address 2'). '</td><td>' . $myrow['deladd2'] . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Exchange Rate'). '</td><td>' . $myrow['rate'] . '</td>
- <th style="text-align:left">' . _('Delivery Address 3'). '</td><td>' . $myrow['deladd3'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Exchange Rate'). '</td><td>' . $myrow['rate'] . '</td>
+ <td style="text-align:left">' . _('Delivery Address 3'). '</td><td>' . $myrow['deladd3'] . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Deliver Into Location'). '</td><td>' . $myrow['locationname'] . '</td>
- <th style="text-align:left">' . _('Delivery Address 4'). '</td><td>' . $myrow['deladd4'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Deliver Into Location'). '</td><td>' . $myrow['locationname'] . '</td>
+ <td style="text-align:left">' . _('Delivery Address 4'). '</td><td>' . $myrow['deladd4'] . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Initiator'). '</td><td>' . $myrow['realname'] . '</td>
- <th style="text-align:left">' . _('Delivery Address 5'). '</td><td>' . $myrow['deladd5'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Initiator'). '</td><td>' . $myrow['realname'] . '</td>
+ <td style="text-align:left">' . _('Delivery Address 5'). '</td><td>' . $myrow['deladd5'] . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Requisition Ref'). '.</td><td>' . $myrow['requisitionno'] . '</td>
- <th style="text-align:left">' . _('Delivery Address 6'). '</td><td>' . $myrow['deladd6'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Requisition Ref'). '.</td><td>' . $myrow['requisitionno'] . '</td>
+ <td style="text-align:left">' . _('Delivery Address 6'). '</td><td>' . $myrow['deladd6'] . '</td></tr>';
-echo '<tr><th style="text-align:left">'. _('Printing') . '</td><td colspan="3">';
+echo '<tr><td style="text-align:left">'. _('Printing') . '</td><td colspan="3">';
if ($myrow['dateprinted'] == ''){
echo '<i>'. _('Not yet printed') . '</i> ';
@@ -119,9 +119,9 @@
}
echo '</td></tr>';
-echo '<tr><th style="text-align:left">'. _('Status') . '</td><td>'. _($myrow['status']) . '</td></tr>';
+echo '<tr><td style="text-align:left">'. _('Status') . '</td><td>'. _($myrow['status']) . '</td></tr>';
-echo '<tr><th style="text-align:left">' . _('Comments'). '</td><td colspan="3">' . $myrow['comments'] . '</td></tr>';
+echo '<tr><td style="text-align:left">' . _('Comments'). '</td><td colspan="3">' . $myrow['comments'] . '</td></tr>';
echo '</table>';
@@ -140,17 +140,17 @@
$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
-echo '<table colspan="8" class="selection" cellpadding="0">';
-echo '<tr><th colspan="8"><font size="3" color="navy">'. _('Order Line Details'). '</font></th></tr>';
+echo '<table class="selection" cellpadding="0">';
+echo '<tr><th colspan="8"><b>'. _('Order Line Details'). '</b></th></tr>';
echo '<tr>
- <th>' . _('Item Code'). '</td>
- <th>' . _('Item Description'). '</td>
- <th>' . _('Ord Qty'). '</td>
- <th>' . _('Qty Recd'). '</td>
- <th>' . _('Qty Inv'). '</td>
- <th>' . _('Ord Price'). '</td>
- <th>' . _('Chg Price'). '</td>
- <th>' . _('Reqd Date'). '</td>
+ <td>' . _('Item Code'). '</td>
+ <td>' . _('Item Description'). '</td>
+ <td>' . _('Ord Qty'). '</td>
+ <td>' . _('Qty Recd'). '</td>
+ <td>' . _('Qty Inv'). '</td>
+ <td>' . _('Ord Price'). '</td>
+ <td>' . _('Chg Price'). '</td>
+ <td>' . _('Reqd Date'). '</td>
</tr>';
$k =0; //row colour counter
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_PDFPurchOrder.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -349,6 +349,7 @@
else { /*the user has just gone into the page need to ask the question whether to print the order or email it to the supplier */
include ('includes/header.inc');
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ($ViewingOnly==1){
echo '<input type="hidden" name="ViewingOnly" value="1" />';
@@ -421,6 +422,7 @@
<div class="centre">
<input type="submit" name="DoIt" value="' . _('OK') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_SelectOSPurchOrder.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -30,6 +30,7 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -132,7 +133,7 @@
if (!isset($OrderNumber) or $OrderNumber=='' ){
if (isset($SelectedSupplier)){
- echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $SelectedSupplier . '">' . _('Add Purchase Order') . '</a>';
+ echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $SelectedSupplier . '">' . _('Add Purchase Order') . '</a>';
} else {
echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
}
@@ -193,13 +194,12 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
-echo '<br /><font size="1"><div class="page_help_text">' ._('To search for purchase orders for a specific part use the part selection facilities below')
- .'</div> </font>';
+echo '<br /><div class="page_help_text">' ._('To search for purchase orders for a specific part use the part selection facilities below') . '</div>';
echo '<br />
<table class="selection">
<tr>';
-echo '<td><font size="1">' . _('Select a stock category') . ':</font>
+echo '<td>' . _('Select a stock category') . ':
<select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
@@ -210,11 +210,11 @@
}
}
echo '</select></td>';
-echo '<td><font size="1">' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</font></td>';
+echo '<td>' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</td>';
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
</tr>
<tr><td></td>';
-echo '<td><font size="4"><b>' . _('OR') . '</b></font><font size="1">' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
+echo '<td><b>' . _('OR') . '</b>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</td>';
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
</table>
@@ -230,7 +230,7 @@
if (isset($StockItemsResult)) {
- echo '<table cellpadding="2" colspan="7" class="selection">';
+ echo '<table cellpadding="2" class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('On Hand') . '</th>
@@ -477,7 +477,7 @@
/*show a table of the orders returned by the SQL */
- echo '<table cellpadding="2" colspan="7 width="97%" class="selection">';
+ echo '<table cellpadding="2" width="97%" class="selection">';
echo '<tr>
@@ -518,7 +518,7 @@
} elseif ($myrow['status'] == 'Authorisied' AND $myrow['allowprint'] == 0) {
$PrintPurchOrder = _('Printed');
} elseif ($myrow['status'] == 'Printed'){
- $PrintPurchOrder = '<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
+ $PrintPurchOrder = '<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
' . _('Print Copy') . '</a>';
} else {
$PrintPurchOrder = _('N/A');
@@ -549,6 +549,7 @@
echo '</table>';
}
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PO_SelectPurchOrder.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -25,6 +25,7 @@
$SelectedSupplier = $_POST['SelectedSupplier'];
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
@@ -175,9 +176,9 @@
<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 _('To search for purchase orders for a specific part use the part selection facilities below') . '</td></tr>';
echo '<tr>
- <td><font size="1">' . _('Select a stock category') . ':</font><select name="StockCat">';
+ <td>' . _('Select a stock category') . ':<select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -186,12 +187,12 @@
}
}
echo '</select></td>
- <td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</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') . '<b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
<tr>
@@ -425,7 +426,7 @@
if (DB_num_rows($PurchOrdersResult) > 0) {
/*show a table of the orders returned by the SQL */
- echo '<table cellpadding="2" colspan="7" width="90%" class="selection">';
+ echo '<table cellpadding="2" width="90%" class="selection">';
$TableHeader = '<tr>
<th>' . _('View') . '</th>
<th>' . _('Supplier') . '</th>
@@ -476,6 +477,7 @@
echo '</table>';
} // end if purchase orders to show
}
-echo '</form>';
+echo '</div>
+ </form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PeriodsInquiry.php
===================================================================
--- trunk/PeriodsInquiry.php 2012-04-07 18:09:09 UTC (rev 5230)
+++ trunk/PeriodsInquiry.php 2012-04-07 18:10:09 UTC (rev 5231)
@@ -32,7 +32,7 @@
for ($i=0;$i<3;$i++) {
echo '<td valign="top">';
- echo '<table cellpadding="2" colspan="2" class="selection">';
+ echo '<table cellpadding="2" class="selection">';
echo $TableHeader;
$k=0;
$j=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
