Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5270] trunk
|
From: <vv...@us...> - 2012-04-21 21:11:02
|
Revision: 5270
http://web-erp.svn.sourceforge.net/web-erp/?rev=5270&view=rev
Author: vvs2012
Date: 2012-04-21 21:10:56 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/StockStatus.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -56,7 +56,7 @@
echo '<div class="centre"><input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" />';
-echo ' <input type="submit" name="ShowStatus" value="' . _('Show Stock Status') . '" /></div>';
+echo ' <input type="submit" name="ShowStatus" value="' . _('Show Stock Status') . '" />';
$sql = "SELECT locstock.loccode,
locations.locationname,
@@ -379,7 +379,6 @@
}
}//end of displaying price history for a debtor
-echo '<div class="centre">';
echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Movements') . '</a>';
echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Usage') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>';
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/StockTransfers.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -51,7 +51,7 @@
echo '<tr>
<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
- <td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='. filter_number_format($_POST['Quantity']).'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
+ <td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='. filter_number_format($_POST['Quantity']).'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
._('Transfer').'</a></td>
</tr>';
@@ -457,6 +457,7 @@
</p>';
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($_GET['Description'])) {
@@ -504,7 +505,7 @@
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- $_SESSION['Transfer']->StockLocationFrom=$myrow['loccode'] . '</option>';
+ $_SESSION['Transfer']->StockLocationFrom=$myrow['loccode'];
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
@@ -528,7 +529,7 @@
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation'] AND isset($_SESSION['Transfer'])){
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- $_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>';
+ $_SESSION['Transfer']->StockLocationTo=$myrow['loccode'];
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
@@ -569,13 +570,14 @@
echo '<br />
<a href="'.$rootpath.'/StockMovements.php?StockID=' . $StockID . '">'._('Show Movements').'</a>';
echo '<br />
- <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_SESSION['Transfer']->StockLocationFrom . '">' . _('Show Stock Usage') . '</a>';
+ <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_SESSION['Transfer']->StockLocationFrom . '">' . _('Show Stock Usage') . '</a>';
echo '<br />
- <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $_SESSION['Transfer']->StockLocationFrom . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $_SESSION['Transfer']->StockLocationFrom . '">' . _('Search Outstanding Sales Orders') . '</a>';
echo '<br />
<a href="'.$rootpath.'/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">'._('Search Completed Sales Orders').'</a>';
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
Modified: trunk/StockUsage.php
===================================================================
--- trunk/StockUsage.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/StockUsage.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -15,10 +15,10 @@
}
if (isset($_POST['ShowGraphUsage'])) {
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/StockUsageGraph.php?StockLocation=' . $_POST['StockLocation'] . '&StockID=' . $StockID . '">';
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/StockUsageGraph.php?StockLocation=' . $_POST['StockLocation'] . '&StockID=' . $StockID . '">';
prnMsg(_('You should automatically be forwarded to the usage graph') .
'. ' . _('If this does not happen') .' (' . _('if the browser does not support META Refresh') . ') ' .
- '<a href="' . $rootpath . '/StockUsageGraph.php?StockLocation=' . $_POST['StockLocation'] .'&StockID=' . $StockID . '">' . _('click here') . '</a> ' . _('to continue'),'info');
+ '<a href="' . $rootpath . '/StockUsageGraph.php?StockLocation=' . $_POST['StockLocation'] .'&StockID=' . $StockID . '">' . _('click here') . '</a> ' . _('to continue'),'info');
exit;
}
@@ -39,6 +39,9 @@
$DecimalPlaces = $myrow[3];
+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">';
$Its_A_KitSet_Assembly_Or_Dummy =False;
@@ -47,20 +50,17 @@
OR $myrow[2]=='D') {
$Its_A_KitSet_Assembly_Or_Dummy =True;
- echo '<font color="navy" size="3"><b>' . $StockID . ' - ' . $myrow[0] . '</b></font>';
+ echo '<h3>' . $StockID . ' - ' . $myrow[0] . '</h3>';
prnMsg( _('The selected item is a dummy or assembly or kit-set item and cannot have a stock holding') . '. ' . _('Please select a different item'),'warn');
$StockID = '';
} else {
echo '<tr>
- <th><font size="3" color="navy">' . _('Item') . ' :<b> ' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('in units of') . ' :<b> ' . $myrow[1] . ')</b></font></th>
+ <th><h3>' . _('Item') . ' : ' . $StockID . ' - ' . $myrow[0] . ' (' . _('in units of') . ' : ' . $myrow[1] . ')</h3></th>
</tr>';
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><td>' . _('Stock Code') . ':<input type="text" name="StockID" size="21" maxlength="20" value="' . $StockID . '" />';
echo _('From Stock Location') . ':<select name="StockLocation">';
@@ -141,8 +141,7 @@
exit;
}
- echo '</div>
- <table class="selection">';
+ echo '<table class="selection">';
$tableheader = '<tr>
<th>' . _('Month') . '</th>
<th>' . _('Usage') . '</th>
@@ -179,7 +178,7 @@
}
//end of while loop
- if ($TotalUsage>0 && $PeriodsCounter>0){
+ if ($TotalUsage>0 AND $PeriodsCounter>0){
echo '<tr>
<th colspan="2">' . _('Average Usage per month is') . ' ' . locale_number_format($TotalUsage/$PeriodsCounter) . '</th>
</tr>';
@@ -187,19 +186,21 @@
echo '</table>';
} /* end if Show Usage is clicked */
+echo '<div class="centre">';
echo '<br />
- <div class="centre">';
-echo '<a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') .'</a>';
+ <a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') .'</a>';
echo '<br />
- <a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Show Stock Movements') . '</a>';
+ <a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Show Stock Movements') . '</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 '<br />
<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a>';
-echo '</form></div>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SuppContractChgs.php
===================================================================
--- trunk/SuppContractChgs.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/SuppContractChgs.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -104,7 +104,7 @@
}
echo '<tr>
- <td class="number">' . _('Total') . ':</font></td>
+ <td class="number">' . _('Total') . ':</td>
<td class="number">' . locale_number_format($TotalContractsValue,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>
</table>';
@@ -121,6 +121,7 @@
/*Set up a form to allow input of new Contract charges */
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['ContractRef'])) {
@@ -132,7 +133,7 @@
<td><input type="text" name="ContractRef" size="22" maxlength="20" value="' . $_POST['ContractRef'] . '" /></td>
</tr>';
echo '<tr>
- <td>' . _('Contract Selection') . ':<br /><font size="1">' . _('If you know the code enter it above') . '<br />' . _('otherwise select the contract from the list') . '</font></td>
+ <td>' . _('Contract Selection') . ':<br />' . _('If you know the code enter it above') . '<br />' . _('otherwise select the contract from the list') . '</td>
<td><select name="ContractSelection">';
$sql = "SELECT contractref, name
@@ -180,8 +181,9 @@
</tr>
</table>';
-echo '<input type="submit" name="AddContractChgToInvoice" value="' . _('Enter Contract Charge') . '" />';
+echo '<div class="centre"><input type="submit" name="AddContractChgToInvoice" value="' . _('Enter Contract Charge') . '" /></div>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/SuppCreditGRNs.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -84,7 +84,7 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="6"><font size="3" color="navy">' . _('Credits Against Goods Received Selected') . '</font></th>
+ <th colspan="6"><h3>' . _('Credits Against Goods Received Selected') . '</h3></th>
</tr>';
$TableHeader = '<tr>
<th>' . _('GRN') . '</th>
@@ -122,8 +122,8 @@
}
echo '<tr>
- <td colspan="5 class="number"><font size="2" color="navy">' . _('Total Value Credited Against Goods') . ':</font></td>
- <td class="number"><font size="2" color="navy"><U>' . locale_number_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</U></font></td>
+ <td colspan="5" class="number"><h4>' . _('Total Value Credited Against Goods') . ':</h4></td>
+ <td class="number"><h4>' . locale_number_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</h4></td>
</tr>';
echo '</table>
<br />
@@ -167,15 +167,16 @@
/*Set up a table to show the GRNs outstanding for 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 '<br />
<table class="selection">
<tr>
- <th colspan="10"><font size="3" color="navy">' . _('Show Goods Received Since') . ': </font>';
-echo '<input type="text" name="Show_Since" maxlength="11" size="12" class="date" alt='.$_SESSION['DefaultDateFormat'].' value="' . $_POST['Show_Since'] . '" />
+ <th colspan="10"><h3>' . _('Show Goods Received Since') . ': </h3>';
+echo '<input type="text" name="Show_Since" maxlength="11" size="12" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" value="' . $_POST['Show_Since'] . '" />
<input type="submit" name="FindGRNs" value="' . _('Display GRNs') . '" />
- <font size="3" color="navy"> ' . _('From') . ' ' . $_SESSION['SuppTrans']->SupplierName . '</font></th>
+ <h3> ' . _('From') . ' ' . $_SESSION['SuppTrans']->SupplierName . '</h3></th>
</tr>';
if (DB_num_rows($GRNResults)>0){
@@ -270,7 +271,7 @@
echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="6"><font size="3" color="navy">' . _('GRN Selected For Adding To A Suppliers Credit Note') . '</font></th>
+ <th colspan="6"><h3>' . _('GRN Selected For Adding To A Suppliers Credit Note') . '</h3></th>
</tr>';
echo '<tr>
<th>' . _('GRN') . '</th>
@@ -327,6 +328,10 @@
echo '<input type="hidden" name="GRNBatchNo" value="' . $myrow['grnbatch'] . '" />';
}
} //end if there were GRNs to select
-echo '</form>';
+else {
+ echo '</table>';
+}
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
Modified: trunk/SuppFixedAssetChgs.php
===================================================================
--- trunk/SuppFixedAssetChgs.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/SuppFixedAssetChgs.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -91,8 +91,8 @@
}
echo '<tr>
- <td class="number"><font size="2" color="navy">' . _('Total') . ':</font></td>
- <td class="number"><font size="2" color="navy"><U>' . locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</U></font></td>
+ <td class="number"><h4>' . _('Total') . ':</h4></td>
+ <td class="number"><h4>' . locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</h4></td>
</tr>
</table><br />';
@@ -103,7 +103,8 @@
}
/*Set up a form to allow input of new Shipment charges */
-echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" />';
+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['AssetID'])) {
@@ -116,7 +117,7 @@
echo '<tr>
<td>' . _('Enter Asset ID') . ':</td>
- <td><input type="text" name="AssetID" size="5" maxlength="6" value="' . $_POST['AssetID'] . '" /> <a href="FixedAssetItems.php" target=_blank>'. _('New Fixed Asset') . '</a></td>
+ <td><input type="text" name="AssetID" size="5" maxlength="6" value="' . $_POST['AssetID'] . '" /> <a href="FixedAssetItems.php" target="_blank">'. _('New Fixed Asset') . '</a></td>
</tr>';
echo '<tr>
<td><b>' . _('OR') .' </b>'. _('Select from list') . ':</td>
@@ -156,6 +157,7 @@
<input type="submit" name="AddAssetToInvoice" value="' . _('Enter Fixed Asset') . '" />
</div>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-04-21 20:22:57 UTC (rev 5269)
+++ trunk/SuppInvGRNs.php 2012-04-21 21:10:56 UTC (rev 5270)
@@ -117,7 +117,7 @@
echo '<table class="selection">
<tr>
- <th colspan="6"><font size="3" color="navy">' . _('Invoiced Goods Received Selected') . '</font></th>
+ <th colspan="6"><h3>' . _('Invoiced Goods Received Selected') . '</h3></th>
</tr>';
$tableheader = '<tr>
@@ -158,7 +158,7 @@
echo '<tr>
<td colspan="5" align="right">' . _('Total Value of Goods Charged') . ':</td>
- <td class="number"><font size="2" color="navy">' . locale_number_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
+ <td class="number"><h4>' . locale_number_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</h4></td>
</tr>
</table>
<br />
@@ -196,13 +196,14 @@
if (DB_num_rows($GRNResults)==0){
prnMsg(_('There are no outstanding goods received from') . ' ' . $_SESSION['SuppTrans']->SupplierName . ' ' . _('that have not been invoiced by them') . '<br />' . _('The goods must first be received using the link below to select purchase orders to receive'),'warn');
- echo '<div class="centre"><p><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SupplierID=' . $_SESSION['SuppTrans']->SupplierID .'">' . _('Select Purchase Orders to Receive') .'</a></div>';
+ echo '<div class="centre"><p><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SupplierID=' . $_SESSION['SuppTrans']->SupplierID .'">' . _('Select Purchase Orders to Receive') .'</a></p></div>';
include('includes/footer.inc');
exit;
}
/*Set up a table to show the GRNs outstanding for 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'] . '" />';
if (!isset( $_SESSION['SuppTransTmp'])){
@@ -249,7 +250,7 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="10"><font size="3" color="navy">' . _('GRN Selected For Adding To A Purchase Invoice') . '</font></th>
+ <th colspan="10"><h3>' . _('GRN Selected For Adding To A Purchase Invoice') . '</h3></th>
</tr>';
echo '<tr>
<th>' . _('Sequence') . ' #</th>
@@ -295,7 +296,7 @@
if (count( $_SESSION['SuppTransTmp']->GRNs)>0){ /*if there are any outstanding GRNs then */
echo '<table class="selection">
<tr>
- <th colspan="10"><font size="3" color="navy">' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</font></th>
+ <th colspan="10"><h3>' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</h3></th>
</tr>';
$tableheader = '<tr>
@@ -360,6 +361,7 @@
}
}
-echo '</form>';
+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.
|
