Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5245] trunk
|
From: <vv...@us...> - 2012-04-15 23:55:03
|
Revision: 5245
http://web-erp.svn.sourceforge.net/web-erp/?rev=5245&view=rev
Author: vvs2012
Date: 2012-04-15 23:54:56 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SMTPServer.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
Modified: trunk/SMTPServer.php
===================================================================
--- trunk/SMTPServer.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/SMTPServer.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -80,6 +80,7 @@
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 '<input type="hidden" name="MailServerSetting" value="' . $MailServerSetting . '" />';
echo '<table class="selection">';
@@ -92,11 +93,11 @@
echo '<tr><td>'._('Authorisation Required').'</td><td>';
echo '<select name="Auth">';
if ($myrow['auth']==1) {
- echo '<option selected value=1>'._('True').'</option>';
- echo '<option value=0>'._('False').'</option>';
+ echo '<option selected="selected" value="1">'._('True').'</option>';
+ echo '<option value="0">'._('False').'</option>';
} else {
- echo '<option value=1>'._('True').'</option>';
- echo '<option selected value=0>'._('False').'</option>';
+ echo '<option value="1">'._('True').'</option>';
+ echo '<option selected="selected" value="0">'._('False').'</option>';
}
echo '</select></td></tr>';
echo '<tr><td>'._('User Name').'</td>
@@ -106,7 +107,9 @@
echo '<tr><td>'._('Timeout (seconds)').'</td>
<td><input type="text" size="5" name="Timeout" class="number" value="'.$myrow['timeout'].'" /></td></tr>';
echo '<tr><td colspan="2"><div class="centre"><input type="submit" name="submit" value="' . _('Update') . '" /></div></td></tr>';
-echo '</table></form>';
+echo '</table>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/ShipmentCosting.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -48,10 +48,10 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th>
+ <th colspan="4"><h3>'._('Shipment Details').'</h3></th>
</tr>
<tr>
- <td><b>'. _('Shipment') .': </td>
+ <td><b>'. _('Shipment') .': </b></td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
<td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td>
</tr>
@@ -142,7 +142,7 @@
echo '<br /><table cellpadding="2" class="selection">';
echo '<tr>
- <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>';
+ <th colspan="9"><h3>' . _('Items on shipment'). '</h3></th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
@@ -528,7 +528,7 @@
echo '<table cellpadding="2" class="selection">';
echo '<tr>
- <th colspan="6"><font color="navy" size="3">' . _('Shipment Charges Against Products'). '</font></th>
+ <th colspan="6"><h3>' . _('Shipment Charges Against Products'). '</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -571,7 +571,7 @@
}
echo '<tr>
- <td colspan="5" class="number"><font color="blue"><b>'. _('Total Charges Against Shipment Items'). ':</b></font></td>
+ <td colspan="5" class="number"><b>'. _('Total Charges Against Shipment Items'). ':</b></td>
<td class="number">' . locale_number_format($TotalItemShipmentChgs,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
@@ -605,7 +605,7 @@
echo '<table cellpadding="2" class="selection">';
echo '<tr>
- <th colspan="6"><font color="navy" size="3">'._('General Shipment Charges').'</font></th>
+ <th colspan="6"><h3>'._('General Shipment Charges').'</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -645,7 +645,7 @@
}
echo '<tr>
- <td class="number" colspan="4"><font color="blue"><b>'. _('Total General Shipment Charges'). ':</b></font></td>
+ <td class="number" colspan="4"><b>'. _('Total General Shipment Charges'). ':</b></td>
<td class="number">' . locale_number_format($TotalGeneralShipmentChgs,$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>';
echo '</table>';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/Shipments.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -298,11 +298,12 @@
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">
<tr>
- <td><b>'. _('Shipment').': </td>
+ <td><b>'. _('Shipment').': </b></td>
<td><b>' . $_SESSION['Shipment']->ShiptRef . '</b></td>
<td><b>'. _('From'). ' ' . $_SESSION['Shipment']->SupplierName . '</b></td>
</tr>';
@@ -322,9 +323,9 @@
echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>';
if (isset($_SESSION['Shipment']->ETA)) {
- echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>';
+ echo '<td><input type="text" name="ETA" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="10" value="' . $ETA . '" /></td>';
} else {
- echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
+ echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
}
echo '<td>'. _('Into').' ';
@@ -392,7 +393,7 @@
/* Always display all shipment lines */
echo '<br /><table class="selection">';
- echo '<tr><th colspan="9"><font color="navy" size="3">'. _('Order Lines On This Shipment'). '</font></th></tr>';
+ echo '<tr><th colspan="9"><h3>'. _('Order Lines On This Shipment'). '</h3></th></tr>';
$TableHeader = '<tr>
<th>'. _('Order'). '</th>
@@ -478,7 +479,7 @@
echo '<table cellpadding="2" class="selection">';
echo '<tr>
- <th colspan="7"><font color="navy" size="3">'. _('Possible Order Lines To Add To This Shipment').'</font></th>
+ <th colspan="7"><h3>'. _('Possible Order Lines To Add To This Shipment').'</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -526,7 +527,8 @@
echo '</table>';
}
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Shippers.php
===================================================================
--- trunk/Shippers.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/Shippers.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -142,7 +142,7 @@
printf('<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedShipper=%s">'. _('Edit').'</a></td>
- <td><a href="%sSelectedShipper=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this shipper?') . '\');">'. _('Delete'). '</a></td></tr>',
+ <td><a href="%sSelectedShipper=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this shipper?') . '\');">'. _('Delete'). '</a></td></tr>',
$myrow[0],
$myrow[1],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' ,
@@ -165,6 +165,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedShipper)) {
@@ -201,7 +202,7 @@
<div class="centre">
<input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
-
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/Shipt_Select.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -27,6 +27,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'] . '" />';
@@ -151,10 +152,10 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="5"><font size="3" color="navy">'._('To search for shipments for a specific part use the part selection facilities below') . '</font></th>
+ <th colspan="5"><h3>'._('To search for shipments for a specific part use the part selection facilities below') . '</h3></th>
</tr>
<tr>
- <td><font size="1">' . _('Select a stock category') . ':</font>
+ <td>' . _('Select a stock category') . ':
<select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
@@ -164,13 +165,13 @@
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
}
-echo '</select>
- <td><font size="1">' . _('Enter text extracts in the') . '<b> ' . _('description') . '</b>:</font></td>
+echo '</select></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>
</table>
@@ -319,7 +320,7 @@
if ($myrow['closed']==0){
- $URL_Close_Shipment = $URL_View_Shipment . '&Close=Yes';
+ $URL_Close_Shipment = $URL_View_Shipment . '&Close=Yes';
printf('<td>%s</td>
<td>%s</td>
@@ -367,6 +368,7 @@
} // end if shipments to show
}
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ShiptsList.php
===================================================================
--- trunk/ShiptsList.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/ShiptsList.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -34,7 +34,7 @@
echo '<table cellpadding="2" class="selection">';
echo '<tr>
- <th>'. _('Reference'). '</a></th>
+ <th>'. _('Reference'). '</th>
<th>'. _('Vessel'). '</th>
<th>'. _('ETA'). '</th></tr>';
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/SpecialOrder.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -19,6 +19,7 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['NewSpecial']) and $_GET['NewSpecial']=='yes'){
@@ -119,12 +120,12 @@
echo '<div class="centre">';
if (!isset($_SESSION['SPL'.$identifier]->BranchCode)){
echo '<br />
- <font size="4" color="blue">' . _('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ')';
+ <h2>' . htmlspecialchars(_('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ')', ENT_QUOTES, 'UTF-8', false);
} else {
echo '<br />
- <font size="4" color="blue">' . _('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ') - ' . _('delivered to') . ' ' . $_SESSION['SPL'.$identifier]->BranchName . ' ' . _('branch');
+ <h2>' . htmlspecialchars(_('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ') - ' . _('delivered to') . ' ' . $_SESSION['SPL'.$identifier]->BranchName . ' ' . _('branch'), ENT_QUOTES, 'UTF-8', false);
}
-echo '</font></div>';
+echo '</h2></div>';
/*if the branch details and delivery details have not been entered then select them from the list */
if (!isset($_SESSION['SPL'.$identifier]->BranchCode)){
@@ -167,14 +168,15 @@
<td>%s</td>
</tr>',
$myrow['branchcode'],
- $myrow['brname']);
+ htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false));
//end of page full new headings if
}
//end of while loop
echo '</table>';
- echo '</form>';
+ echo '</div>
+ </form>';
include('includes/footer.inc');
exit;
@@ -431,7 +433,7 @@
'" . $SPLLine->Cost . "')";
- $ErrMsg = _('The item record for line') . ' ' . $SPLLine->LineNo . ' ' . _('could not be create because');
+ $ErrMsg = _('The item record for line') . ' ' . $SPLLine->LineNo . ' ' . _('could not be created because');
$DbgMsg = _('The SQL statement used to insert the item and failed was');
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
@@ -596,7 +598,7 @@
while ($LocnRow=DB_fetch_array($LocnResult)){
if ($_SESSION['SPL'.$identifier]->StkLocation == $LocnRow['loccode']){
- echo '<option selected="True" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
}
@@ -679,13 +681,13 @@
/*Set up the form to enter new special items into */
-echo '<table>';
-
echo '<input type="hidden" name="LineNo" value="' . ($_SESSION['SPL'.$identifier]->LinesOnOrder + 1) .'" />';
if (!isset($_POST['ItemDescription'])) {
$_POST['ItemDescription']='';
}
+
+echo '<table>';
echo '<tr>
<td>' . _('Ordered item Description') . ':</td>
<td><input type="text" name="ItemDescription" size="40" maxlength="40" value="' . $_POST['ItemDescription'] . '" /></td>
@@ -702,7 +704,7 @@
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['StkCat']) and $myrow['categoryid']==$_POST['StkCat']){
- echo '<option selected="True" value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} else {
echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
@@ -753,6 +755,7 @@
<br />
<input type="submit" name="Commit" value="' . _('Process This Order') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/StockAdjustments.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -115,7 +115,7 @@
echo '<tr>
<td>'.$myrow[0].'</td>
<td>'.$myrow[1].'</td>
- <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
+ <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
</tr>';
}
echo '</table>';
@@ -353,6 +353,7 @@
echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_SESSION['Adjustment' . $identifier])) {
@@ -381,7 +382,7 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="4"><font color=blue size="3">'._('Adjustment Details').'</font></th>
+ <th colspan="4"><h3>'._('Adjustment Details').'</h3></th>
</tr>';
if (!isset($_GET['Description'])) {
$_GET['Description']='';
@@ -406,7 +407,7 @@
</tr>';
if (isset($_SESSION['Adjustment' . $identifier]) AND mb_strlen($_SESSION['Adjustment' . $identifier]->ItemDescription)>1){
echo '<tr>
- <td colspan="3"><font color="blue" size="3">' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Adjustment' . $identifier]->PartUnit . ' ) - ' . _('Unit Cost').' = ' . locale_number_format($_SESSION['Adjustment' . $identifier]->StandardCost,4) . '</font></td>
+ <td colspan="3"><h3>' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Adjustment' . $identifier]->PartUnit . ' ) - ' . _('Unit Cost').' = ' . locale_number_format($_SESSION['Adjustment' . $identifier]->StandardCost,4) . '</h3></td>
</tr>';
}
@@ -477,7 +478,7 @@
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']. '</option>';
}
}
-echo '</select></td>';
+echo '</select></td></tr>';
// End select tag
echo '</table>
@@ -495,12 +496,14 @@
echo '<br />
<a href="'.$rootpath.'/StockMovements.php?StockID=' . $StockID . '">'._('Show Movements').'</a>';
echo '<br />
- <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">'._('Show Stock Usage').'</a>';
+ <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">'._('Show Stock Usage').'</a>';
echo '<br />
- <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem='. $StockID .'&StockLocation=' . $_POST['StockLocation'] . '">'. _('Search Outstanding Sales Orders').'</a>';
+ <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem='. $StockID .'&StockLocation=' . $_POST['StockLocation'] . '">'. _('Search Outstanding Sales Orders').'</a>';
echo '<br />
<a href="'.$rootpath.'/SelectCompletedOrder.php?SelectedStockItem=' . $StockID .'">'._('Search Completed Sales Orders').'</a>';
-echo '</div></form>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/StockAdjustmentsControlled.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -47,7 +47,7 @@
echo '<br /><a href="'.$rootpath.'/StockAdjustments.php?identifier='.$identifier.'">' . _('Back to Adjustment Screen') . '</a>';
-echo '<br /><font size="2"><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ;
+echo '<br /><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ;
/** vars needed by InputSerialItem : **/
$LocationOut = $_SESSION['Adjustment'.$identifier]->StockLocation;
@@ -67,7 +67,7 @@
include('includes/footer.inc');
exit;
}
-echo '</b></font></div>';
+echo '</b></div>';
include ('includes/InputSerialItems.php');
/*TotalQuantity set inside this include file from the sum of the bundles
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/StockCategories.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -260,8 +260,8 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this stock category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '");">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this stock category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['categoryid'],
$myrow['categorydescription'],
@@ -286,12 +286,13 @@
echo '<br />';
if (isset($SelectedCategory)) {
- echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" >' . _('Show All Stock Categories') . '</a></div>';
+ echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" >' . _('Show All Stock Categories') . '</a>';
}
+echo '<form id="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+echo '<div>';
echo '<br />';
-echo '<form name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCategory)) {
@@ -399,22 +400,22 @@
echo '</select></td>
</tr>';
-echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />';
+echo '<tr><td><input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />';
if (isset($_POST['StockType']) and $_POST['StockType']=='L') {
$Result = $PnLAccountsResult;
- echo '<tr><td>' . _('Recovery GL Code');
+ echo _('Recovery GL Code');
} else {
$Result = $BSAccountsResult;
- echo '<tr><td>' . _('Stock GL Code');
+ echo _('Stock GL Code');
}
echo ':</td><td><select name="StockAct">';
while ($myrow = DB_fetch_array($Result)){
if (isset($_POST['StockAct']) and $myrow['accountcode']==$_POST['StockAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
DB_data_seek($PnLAccountsResult,0);
@@ -426,9 +427,9 @@
while ($myrow = DB_fetch_array($BSAccountsResult)) {
if (isset($_POST['WIPAct']) and $myrow['accountcode']==$_POST['WIPAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -441,9 +442,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['AdjGLAct']) and $myrow['accountcode']==$_POST['AdjGLAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -456,9 +457,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['IssueGLAct']) and $myrow['accountcode']==$_POST['IssueGLAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -471,9 +472,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['PurchPriceVarAct']) and $myrow['accountcode']==$_POST['PurchPriceVarAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -493,9 +494,9 @@
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['MaterialUseageVarAc']) and $myrow['accountcode']==$_POST['MaterialUseageVarAc']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
}
} //end while loop
@@ -540,9 +541,9 @@
</tr>';
$PropertyCounter =0;
while ($myrow = DB_fetch_array($result)) {
- echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />';
echo '<tr>
- <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td>
+ <td><input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />';
+ echo '<input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td>
<td><select name="PropControlType' . $PropertyCounter . '">';
if ($myrow['controltype']==0){
echo '<option selected="selected" value="0">' . _('Text Box') . '</option>';
@@ -582,14 +583,14 @@
echo '<td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'" /></td>';
}
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td>
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '\');">' . _('Delete') . '</a></td>
</tr>';
$PropertyCounter++;
} //end loop around defined properties for this category
- echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="NewProperty" />';
echo '<tr>
- <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td>
+ <td><input type="hidden" name="PropID' . $PropertyCounter .'" value="NewProperty" />';
+ echo '<input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td>
<td><select name="PropControlType' . $PropertyCounter . '">
<option selected="selected" value="0">' . _('Text Box') . '</option>
<option value="1">' . _('Select Box') . '</option>
@@ -611,6 +612,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
include('includes/footer.inc');
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/StockCheck.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -262,11 +262,12 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="'
. _('print') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ 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">';
- echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td>
+ echo '<tr><td>' . _('From Inventory Category Code') . ':</td>
<td><select name="FromCriteria">';
$sql="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid";
@@ -351,8 +352,9 @@
</table>
<br />
<div class="centre">
- <input type="submit" Name="PrintPDF" value="' . _('Print and Process') . '" />
+ <input type="submit" name="PrintPDF" value="' . _('Print and Process') . '" />
</div>
+ </div>
</form>';
}
include('includes/footer.inc');
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2012-04-14 07:55:06 UTC (rev 5244)
+++ trunk/StockCostUpdate.php 2012-04-15 23:54:56 UTC (rev 5245)
@@ -118,19 +118,21 @@
$myrow = DB_fetch_array($result);
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 cellpadding="2" class="selection">';
echo '<tr><th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" />';
echo '<input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th></tr>';
-echo '<tr><th colspan="2"><font color="navy" size="2">' . $StockID . ' - ' . $myrow['description'] . '</font></th></tr>';
-echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</font></th></tr>';
-echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</font></th></tr>';
+echo '<tr><th colspan="2">' . $StockID . ' - ' . $myrow['description'] . '</th></tr>';
+echo '<tr><th colspan="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</th></tr>';
+echo '<tr><th colspan="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</th></tr>';
if (($myrow['mbflag']=='D' AND $myrow['stocktype'] != 'L')
OR $myrow['mbflag']=='A'
OR $myrow['mbflag']=='K'){
- echo '</form>'; // Close the form
+ echo '</div>
+ </form>'; // Close the form
if ($myrow['mbflag']=='D'){
echo '<br />' . $StockID .' ' . _('is a service item');
} else if ($myrow['mbflag']=='A'){
@@ -143,12 +145,13 @@
exit;
}
+echo '<tr><td>';
echo '<input type="hidden" name="OldMaterialCost" value="' . $myrow['materialcost'] .'" />';
echo '<input type="hidden" name="OldLabourCost" value="' . $myrow['labourcost'] .'" />';
echo '<input type="hidden" name="OldOverheadCost" value="' . $myrow['overheadcost'] .'" />';
echo '<input type="hidden" name="QOH" value="' . $myrow['totalqoh'] .'" />';
-echo '<tr><td>' . _('Last Cost') .':</td>
+echo _('Last Cost') .':</td>
<td class="number">' . locale_number_format($myrow['lastcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td></tr>';
if (! in_array($UpdateSecurity,$_SESSION['AllowedPageSecurityTokens'])){
echo '<tr><td>' . _('Cost') . ':</td>
@@ -158,8 +161,8 @@
} else {
if ($myrow['mbflag']=='M'){
- echo '<input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />';
- echo '<tr><td>' . _('Standard Material Cost Per Unit') .':</td>
+ echo '<tr><td><input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />';
+ echo _('Standard Material Cost Per Unit') .':</td>
<td class="number">' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td>
</tr>';
echo '<tr>
@@ -176,13 +179,14 @@
<td class="number"><input type="text" class="number" name="MaterialCost" value="' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td>
</tr>';
} else {
- echo '<input type="hidden" name="LabourCost" value="0" />';
- echo '<input type="hidden" name="OverheadCost" value="0" />';
+ echo '<tr><td><input type="hidden" name="LabourCost" value="0" />';
+ echo '<input type="hidden" name="OverheadCost" value="0" /></td></tr>';
}
echo '</table>
<br />
<div class="centre">
<input type="submit" name="UpdateData" value="' . _('Update') . '" />
+ </div>
<br />
<br />';
}
@@ -193,7 +197,7 @@
echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a></div>';
}
-echo '</form>
- </div>';
+echo '</div>
+ </form>';
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.
|
