|
From: <vv...@us...> - 2012-03-06 23:02:33
|
Revision: 5045
http://web-erp.svn.sourceforge.net/web-erp/?rev=5045&view=rev
Author: vvs2012
Date: 2012-03-06 23:02:27 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/COGSGLPostings.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -105,8 +105,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow['area'],
$myrow['stkcat'],
$myrow['salestype'],
@@ -203,8 +203,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
@@ -341,7 +341,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
} //end while loop
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ConfirmDispatch_Invoice.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -273,7 +273,7 @@
/***************************************************************
Line Item Display
***************************************************************/
-echo '<table width="90%" cellpadding="2" colspan="7" class="selection">
+echo '<table width="90%" cellpadding="2" class="selection">
<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description' ) . '</th>
@@ -317,6 +317,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td>'.$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -545,10 +546,10 @@
echo '<tr>
<td colspan="10" class="number">' . _('Invoice Totals'). '</td>
- <td class="number:><hr><b>'.$DisplaySubTotal.'</b><hr></td>
+ <td class="number"><hr /><b>'.$DisplaySubTotal.'</b><hr /></td>
<td colspan="2"></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
- <td class="number"><hr><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
+ <td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td>
</tr>';
if (! isset($_POST['DispatchDate']) OR ! Is_Date($_POST['DispatchDate'])){
@@ -629,7 +630,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/ContractBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -215,7 +215,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
-echo '<form name="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
+echo '<form id="ContractBOMForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -341,7 +341,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1" colspan="7">';
+ echo '<table cellpadding="1">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/Contracts.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -746,11 +746,11 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' .
_('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier .'" id="CustomerSelection" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="3" colspan="4" class="selection">
+ echo '<table cellpadding="3" class="selection">
<tr>
<td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td>
<td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td>
@@ -763,13 +763,13 @@
</tr>
</table>
<br /><div class="centre"><input tabindex="4" type="submit" name="SearchCustomers" value="' . _('Search Now') . '" />
- <input tabindex="5" type="submit" action="reset" value="' . _('Reset') .'" /></div>';
+ <input tabindex="5" type="submit" name="reset" value="' . _('Reset') .'" /></div>';
if (isset($result_CustSelect)) {
- echo '<table cellpadding="2" class="selection">';
+ echo '<br /><table cellpadding="2" class="selection">';
- $TableHeader = '<br /><tr>
+ $TableHeader = '<tr>
<th>' . _('Customer') . '</th>
<th>' . _('Branch') . '</th>
<th>' . _('Contact') . '</th>
@@ -791,12 +791,12 @@
$k=1;
}
if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
+ echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></td>
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" />
+ echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="'.htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8').'" />
+ <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'" /></td>
<td>'.htmlspecialchars($myrow['contactname'], ENT_QUOTES,'UTF-8') .'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
@@ -806,18 +806,17 @@
//end of page full new headings if
}
//end of while loop
- echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
+ echo '<tr><td><input type="hidden" name="JustSelectedACustomer" value="Yes" /></td></tr>';
- echo '</table>
- </div>
- </form>';
-
+ echo '</table>';
}//end if results to show
+ echo '</div>
+ </form>';
//end if RequireCustomerSelection
} else { /*A customer is already selected so get into the contract setup proper */
- echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<form id="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -883,7 +882,7 @@
</tr>
<tr>
<td>' . _('Contract Description') . ':</td>
- <td><textarea name="ContractDescription" style="width:100%" rows="5">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
+ <td><textarea name="ContractDescription" style="width:100%" rows="5" cols="40">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
</tr><tr>
<td>'. _('Drawing File') . ' .jpg' . ' ' . _('format only') .':</td>
<td><input type="file" id="Drawing" name="Drawing" /></td>
@@ -1047,11 +1046,10 @@
echo '</div>';
}
if ($_SESSION['Contract'.$identifier]->Status!=2) {
- echo '<p>
- <div class="centre">
- <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
- </div>
- </p>';
+ echo '<div class="centre">
+ <br />
+ <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
+ </div>';
}
echo '</div>
</form>';
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/CopyBOM.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -6,10 +6,10 @@
*/
/* $Id$*/
+include('includes/session.inc');
+
$title = _('Copy a BOM to New Item Code');
-include('includes/session.inc');
-
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -122,6 +122,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT stockid,
@@ -141,8 +142,8 @@
echo '</select></td>
</tr>';
echo '<tr>
- <td><input type="radio" name="type" value="N" checked="" />' . _(' To New Stock ID') . '</td></td><td>';
- echo '<input type="text" maxlength="20" name="tostkid" /></td></tr>';
+ <td><input type="radio" name="type" value="N" />' . _(' To New Stock ID') . '</td>';
+ echo '<td><input type="text" maxlength="20" name="tostkid" /></td></tr>';
$sql = "SELECT stockid,
description
@@ -153,15 +154,18 @@
if (DB_num_rows($result) > 0) {
echo '<tr>
- <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td><td>';
- echo '<select name="exstkid">';
+ <td><input type="radio" name="type" value="E" />'._('To Existing Stock ID') . '</td>';
+ echo '<td><select name="exstkid">';
while($row = DB_fetch_row($result)) {
echo '<option value="'.$row[0].'">'.$row[0].' -- '.$row[1].'</option>';
}
- echo '</select>';
+ echo '</select></td>';
+ echo '</tr>';
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div></form>';
+ echo '<br /><div class="centre"><input type="submit" name="Submit" value="Submit" /></div>
+ </div>
+ </form>';
include('includes/footer.inc');
}
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItems.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -49,45 +49,47 @@
$valid = true;
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?identifier='.$identifier.'" enctype="multipart/form-data" >';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="hidden" name="LineNo" value="' . $LineNo . '">';
-echo '<input type="hidden" name="StockID" value="'. $StockID. '">';
-echo '<table class=selection><tr><td>';
-echo '<input type="radio" name=EntryType onClick="submit();" ';
+echo '<input type="hidden" name="LineNo" value="' . $LineNo . '" />';
+echo '<input type="hidden" name="StockID" value="'. $StockID. '" />';
+echo '<table class="selection"><tr><td>';
+echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='KEYED') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo 'value="KEYED">'. _('Keyed Entry');
-echo '</TD>';
+echo 'value="KEYED" />'. _('Keyed Entry');
+echo '</td>';
if ($LineItem->Serialised==1){
echo '<td>';
- echo '<input type="radio" name=EntryType onClick="submit();" ';
+ echo '<input type="radio" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='SEQUENCE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
- echo ' value="SEQUENCE">'. _('Sequential');
+ echo ' value="SEQUENCE" />'. _('Sequential');
echo '</td>';
}
-echo '<td valign=bottom>';
-echo '<input type="radio" id="FileEntry" name="EntryType" onClick="submit();" ';
+echo '<td valign="bottom">';
+echo '<input type="radio" id="FileEntry" name="EntryType" onclick="submit();" ';
if ($_POST['EntryType']=='FILE') {
- echo ' checked ';
+ echo ' checked="checked" ';
}
-echo ' value="FILE">'. _('File Upload');
-echo ' <input type="file" name="ImportFile" onClick="document.getElementById(\'FileEntry\').checked=true;" >';
-echo '</td></tr><tr><td colspan=3>';
-echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':"></div>';
+echo ' value="FILE" />'. _('File Upload');
+echo ' <input type="file" name="ImportFile" onclick="document.getElementById(\'FileEntry\').checked=true;" />';
+echo '</td></tr><tr><td colspan="3">';
+echo '<div class="centre"><input type="submit" value="'. _('Set Entry Type'). ':" /></div>';
echo '</td></tr></table>';
+echo '</div>';
echo '</form>';
global $tableheader;
/* Link to clear the list and start from scratch */
-$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
-$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
- '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
+$EditLink = '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&EditControlled=true&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
+$RemoveLink = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'&DELETEALL=YES&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br /></div>';
$sql="SELECT perishable
FROM stockmaster
WHERE stockid='".$StockID."'";
Modified: trunk/includes/InputSerialItemsFile.php
===================================================================
--- trunk/includes/InputSerialItemsFile.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsFile.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -44,7 +44,7 @@
echo '<td>' . $Bundle->BundleRef . '</td>';
if ($LineItem->Serialised==0){
- echo '<td align=right>' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ echo '<td align="right">' . locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
}
}
@@ -54,14 +54,14 @@
/*Display the totals and rule off before allowing new entries */
if ($LineItem->Serialised==1){
- echo '<tr><td align=right><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ': ' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td><hr /></td></tr>';
} else {
- echo '<tr><td align=right><b>'. _('Total Quantity'). ':</b></td><td align=right><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
- echo '<tr><td colspan=2><hr></td></tr>';
+ echo '<tr><td align="right"><b>'. _('Total Quantity'). ':</b></td><td align="right"><b>' . locale_number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td colspan="2"><hr /></td></tr>';
}
-echo '</table><hr>';
+echo '</table><hr />';
//DISPLAY FILE INFO
@@ -75,7 +75,7 @@
$msg = _('Please Choose a file and then click Set Entry Type to upload a file for import');
prnMsg($msg);
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
}
@@ -86,7 +86,7 @@
_('Type').':'.$_FILES['ImportFile']['type'].'<br />';
echo '<br />'._('Error was').' '.$_FILES['ImportFile']['error'].'<br />';
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit();
} elseif ($_FILES['ImportFile']['name']!=''){
@@ -100,7 +100,7 @@
if (!move_uploaded_file($_FILES['ImportFile']['tmp_name'],$_SESSION['CurImportFile']['tmp_name'])){
prnMsg(_('Error moving temporary file') . '. ' . _('Please check your configuration'),'error' );
$LineItem->SerialItemsValid=false;
- echo '</td></tr></table>';
+ echo '</div>';
include('includes/footer.inc');
exit;
}
@@ -150,7 +150,7 @@
<input type="hidden" name="EntryType" value="FILE">
</form>
<p>'. _('1st 10 Lines of File'). '....
- <hr width=15%>
+ <hr width=15% />
<pre>';
echo $contents;
@@ -160,7 +160,7 @@
} else {
//Otherwise we have all valid records. show the first (100) for visual verification.
echo _('Below are the 1st 100 records as parsed');
- echo '<hr width=20%>';
+ echo '<hr width=20% />';
foreach($LineItem->SerialItems as $SItem){
echo $SItem->BundleRef.'<br />';
$i++;
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2012-03-06 21:05:52 UTC (rev 5044)
+++ trunk/includes/InputSerialItemsKeyed.php 2012-03-06 23:02:27 UTC (rev 5045)
@@ -75,6 +75,14 @@
/*Close off old table */
echo '</table></td><td valign="top">';
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" id="Ga6uF5Wa" method="post">
+ <div>
+ <input type="hidden" name="LineNo" value="' . $LineNo . '" />
+ <input type="hidden" name="StockID" value="' . $StockID . '" />
+ <input type="hidden" name="EntryType" value="KEYED" />';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
/*Start a new table for the Serial/Batch ref input in one column (as a sub table
then the multi select box for selection of existing bundle/serial nos for dispatch if applicable*/
//echo '<TABLE><TR><TD valign=TOP>';
@@ -83,12 +91,6 @@
echo '<table class="selection">';
echo $tableheader;
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" name="Ga6uF5Wa" method="post">
- <input type="hidden" name="LineNo" value="' . $LineNo . '">
- <input type="hidden" name="StockID" value="' . $StockID . '">
- <input type="hidden" name="EntryType" value="KEYED">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
} elseif ( isset($_POST['EditControlled']) ){
@@ -102,19 +104,19 @@
foreach ($LineItem->SerialItems as $Bundle){
echo '<tr>
- <td valign=top><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
+ <td valign="top"><input type="text" name="SerialNo'. $StartAddingAt .'" value="' .$Bundle->BundleRef.'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
if ($LineItem->Serialised==1){
- echo '<input type="hidden" name="Qty' . $StartAddingAt .'" Value=1></TR>';
+ echo '<input type="hidden" name="Qty' . $StartAddingAt .'" value="1" /></TR>';
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size=11
- value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10"></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . $StartAddingAt .'" size="11"
+ value="'. locale_number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength="10" /></tr>';
}
$StartAddingAt++;
@@ -123,7 +125,7 @@
for ($i=0;$i < 10;$i++){
- echo '<tr><td valign=top><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
+ echo '<tr><td valign="top"><input type="text" name="SerialNo'. ($StartAddingAt+$i) .'" size="21" maxlength="20" /></td>';
/*if the item is controlled not serialised - batch quantity required so just enter bundle refs
into the form for entry of quantities manually */
@@ -136,11 +138,11 @@
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
}
} else if ($LineItem->Serialised==0 and $Perishable==1) {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10" /></td>';
- echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size=11
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td>';
+ echo '<td><input type="text" class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size="11"
value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" /></td></tr>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength="10"></td></tr>';
+ echo '<td><input type="text" class="number" name="Qty' . ($StartAddingAt+$i) .'" size="11" maxlength="10" /></td></tr>';
}
}
@@ -149,7 +151,7 @@
<div class="centre">
<input type="submit" name="AddBatches" value="'. _('Enter'). '" />
</div>
-
+ </div>
</form>
</td>
<td valign="top">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|