|
From: <vv...@us...> - 2012-04-09 03:35:13
|
Revision: 5236
http://web-erp.svn.sourceforge.net/web-erp/?rev=5236&view=rev
Author: vvs2012
Date: 2012-04-09 03:35:07 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/GoodsReceived.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -169,7 +169,7 @@
if ($LnItm->Controlled == 1) {
- echo '<input type="hidden" name="RecvQty_' . $LnItm->LineNo . '" value="' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '" /><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
+ echo '<input type="hidden" name="RecvQty_' . $LnItm->LineNo . '" value="' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '" /><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
} else {
echo '<input type="text" class="number" name="RecvQty_' . $LnItm->LineNo . '" maxlength="10" size="10" value="' . locale_number_format(round($LnItm->ReceiveQty,$LnItm->DecimalPlaces),$LnItm->DecimalPlaces) . '" /></td>';
@@ -188,10 +188,10 @@
if ($LnItm->Controlled == 1) {
if ($LnItm->Serialised==1){
- echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
+ echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
_('Enter Serial Nos'). '</a></td>';
} else {
- echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
+ echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
_('Enter Batches'). '</a></td>';
}
}
@@ -270,6 +270,8 @@
if ($_SESSION['CompanyRecord']==0){
/*The company data and preferences could not be retrieved for some reason */
+ echo '</div>';
+ echo '</form>';
prnMsg(_('The company information and preferences could not be retrieved') . ' - ' . _('see your system administrator') , 'error');
include('includes/footer.inc');
exit;
@@ -354,6 +356,8 @@
unset($_SESSION['PO'.$identifier]->LineItems);
unset($_SESSION['PO'.$identifier]);
unset($_POST['ProcessGoodsReceived']);
+ echo '</div>';
+ echo '</form>';
include ('includes/footer.inc');
exit;
}
@@ -723,12 +727,14 @@
'. prnMsg(_('GRN number'). ' '. $GRN .' '. _('has been processed'),'success') . '
<br />
<br />
- <a href="PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'">'. _('Print this Goods Received Note (GRN)').'</a>
+ <a href="PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'">'. _('Print this Goods Received Note (GRN)').'</a>
<br />
<br />
<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Select a different purchase order for receiving goods against'). '</a>
</div>';
/*end of process goods received entry */
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/RecurringSalesOrders.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -309,9 +309,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') .
'" alt="" /><b>'.' '. _('Recurring Order for Customer') .' : ' . $_SESSION['Items'.$identifier]->CustomerName .'</b></p>';
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'] . '" />';
-
echo '<table cellpadding="2" class="selection">';
echo '<tr><th colspan="7"><b>'._('Order Line Details').'</b></th></tr>';
echo '<tr>
@@ -368,7 +368,7 @@
</table>';
echo '<br /><table class="selection">';
-echo '<tr><th colspan="7"><font size="2" color=navy><b>'._('Order Header Details').'</b></font></th></tr>';
+echo '<tr><th colspan="7"><h3>'._('Order Header Details').'</h3></th></tr>';
echo '<tr>
<td>'. _('Deliver To') .':</td>
@@ -419,8 +419,8 @@
} else {
echo '<tr>
<td>'. _('Last Recurrence') . ':</td>
- <td>' . $_POST['StartDate'] . '</td></tr>';
- echo '<input type="hidden" name="StartDate" value="' . $_POST['StartDate'] . '" />';
+ <td>' . $_POST['StartDate'];
+ echo '<input type="hidden" name="StartDate" value="' . $_POST['StartDate'] . '" /></td></tr>';
}
if (!isset($_POST['StopDate'])){
@@ -484,13 +484,12 @@
echo '<option value="0">' . _('No') . '</option>';
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
}
- echo '</select></td></tr>';
+ echo '</select></td></tr></table>';
} else {
+ echo '</table>';
echo '<input type="hidden" name="AutoInvoice" value="0" />';
}
-echo '</table>';
-
echo '<br /><div class="centre">';
if ($NewRecurringOrder=='Yes'){
echo '<input type="hidden" name="NewRecurringOrder" value="Yes" />';
@@ -504,6 +503,8 @@
echo '<br /><br /><input type="submit" name="DeleteRecurringOrder" value="' . _('Delete Recurring Order') . ' ' . $_POST['ExistingRecurrOrderNo'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this recurring order template?') . '\');" />';
}
-echo '</form></div>';
+echo '</div>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReorderLevel.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -194,7 +194,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Inventory Reorder Level Report') . '</p>';
echo '<div class="page_help_text">' . _('Use this report to display the reorder levels for Inventory items in different categories.') . '</div><br />';
- echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"><table>';
+ echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
@@ -224,7 +225,7 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>'A' ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
if (DB_num_rows($result1)==0){
- echo '</table></td></tr>
+ echo '</td></tr>
</table>
<br />';
prnMsg(_('There are no stock categories currently defined please use the link below to set them up'),'warn');
@@ -257,7 +258,8 @@
<div class="centre">
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>';
-
+ echo '</div>
+ </form>';
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReorderLevelLocation.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -55,29 +55,30 @@
$ResultLocation = DB_query($SqlLoc,$db);
$Location=DB_fetch_array($ResultLocation);
- echo'<p class="page_title_text" align="center"><strong>' . _('Location : ') . '' . $Location['locationname'] . ' </strong></p>';
- echo'<p class="page_title_text" align="center"><strong>' . _('Number Of Days Sales : ') . '' . locale_number_format($_POST['NumberOfDays'],0) . '' . _(' Days ') . ' </strong></p>';
- echo '<table>';
- echo '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Total Invoiced').'<br />'._('At Location') . '</th>
- <th>' . _('On Hand') .'<br />'._('At All Locations') . '</th>
- <th>' . _('On Hand') .'<br />' ._('At Location') . '</th>
- <th>' . _('Reorder Level') . '</th>
- <tr>';
-
+ echo'<p class="page_title_text"><strong>' . _('Location : ') . '' . $Location['locationname'] . ' </strong></p>';
+ echo'<p class="page_title_text"><strong>' . _('Number Of Days Sales : ') . '' . locale_number_format($_POST['NumberOfDays'],0) . '' . _(' Days ') . ' </strong></p>';
$k=0; //row colour counter
- echo'<form action="ReorderLevelLocation.php" method="post" name="Update">';
+ echo '<form action="ReorderLevelLocation.php" method="post" id="Update">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table>';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Total Invoiced').'<br />'._('At Location') . '</th>
+ <th>' . _('On Hand') .'<br />'._('At All Locations') . '</th>
+ <th>' . _('On Hand') .'<br />' ._('At Location') . '</th>
+ <th>' . _('Reorder Level') . '</th>
+ </tr>';
+
$i=1;
while ($myrow=DB_fetch_array($result)) {
if ($k==1){
- echo '<tr class="EvenTableRows">';
+ echo '<tr class="EvenTableRows"><td>';
$k=0;
} else {
- echo '<tr class="OddTableRows">';
+ echo '<tr class="OddTableRows"><td>';
$k=1;
}
@@ -116,7 +117,7 @@
$LocQtyResult = DB_query($SqlOHLoc,$db);
$LocQtyRow = DB_fetch_array($LocQtyResult);
- echo'<td>'.$myrow['stockid'].'</td>
+ echo $myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td class="number">'.locale_number_format($SalesRow['qtyinvoiced'],$myrow['decimalplaces']).'</td>
<td class="number">'.locale_number_format($TotQtyRow['qty'],$myrow['decimalplaces']).'</td>
@@ -131,6 +132,8 @@
<input type="submit" name="submit" value="' . _('Update') . '" />
</td>
</tr>
+ </table>
+ </div>
</form>';
@@ -142,7 +145,7 @@
echo '<br />
<br />
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table>';
+ <div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
@@ -173,9 +176,10 @@
}
echo '</select></td></tr>';
- echo'<tr>
+ echo '<tr>
<td>' . _('Number Of Days Sales') . ':</td>
- <td><input type="text" class="number" name="NumberOfDays" maxlength="3" size="4" value="0" /></td>';
+ <td><input type="text" class="number" name="NumberOfDays" maxlength="3" size="4" value="0" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Order By') . ':</td>
<td><select name="Sequence">
@@ -185,11 +189,11 @@
</tr>';
echo '</table>
<br />
- <p>
<div class="centre">
<input type="submit" name="submit" value="' . _('Submit') . '" />
- </div>
- </p>';
+ </div>';
+ echo '</div>
+ </form>';
} /*end of else not submit */
include('includes/footer.inc');
Modified: trunk/ReprintGRN.php
===================================================================
--- trunk/ReprintGRN.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReprintGRN.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -12,10 +12,11 @@
}
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>
- <th colspan="2"><font size="2" color="navy">' . _('Select a purchase order') . '</th>
+ <th colspan="2"><h3>' . _('Select a purchase order') . '</h3></th>
</tr>
<tr>
<td>' . _('Enter a Purchase Order Number') . '</td>
@@ -25,6 +26,8 @@
<td colspan="2" style="text-align: center"><input type="submit" name="Show" value="' . _('Show GRNs') . '" /></td>
</tr>
</table>
+ <br />
+ </div>
</form>';
if (isset($_POST['Show'])) {
@@ -72,7 +75,7 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="8"><font size="2" color="navy">' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</th>
+ <th colspan="8"><h3>' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</h3></th>
</tr>
<tr>
<th>' . _('Supplier') . '</th>
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReverseGRN.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -340,14 +340,15 @@
} else {
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['RecdAfterDate']) OR !Is_Date($_POST['RecdAfterDate'])) {
$_POST['RecdAfterDate'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date("m")-3,Date("d"),Date("Y")));
}
+ echo '<input type="hidden" name="SupplierID" value="' . $_POST['SupplierID'] . '" />';
+ echo '<input type="hidden" name="SuppName" value="' . $_POST['SuppName'] . '" />';
echo '<table class="selection"><tr>';
- echo '<input type="hidden" name="SupplierID" valuE="' . $_POST['SupplierID'] . '" />';
- echo '<input type="hidden" name="SuppName" value="' . $_POST['SuppName'] . '" />';
echo '<td>'._('Show all goods received after') . ': </td>
<td><input type="text" class="date" alt="'. $_SESSION['DefaultDateFormat'].'" name="RecdAfterDate" value="' . $_POST['RecdAfterDate'] . '" maxlength="10" size="10" /></td>
</tr>
@@ -356,6 +357,8 @@
<div class="centre">
<input type="submit" name="ShowGRNS" value="' . _('Show Outstanding Goods Received') . '" />
</div>';
+ echo '</div>
+ </form>';
if (isset($_POST['ShowGRNS'])){
@@ -435,6 +438,7 @@
}
echo '</table>';
+
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-09 03:35:13
|
Revision: 5236
http://web-erp.svn.sourceforge.net/web-erp/?rev=5236&view=rev
Author: vvs2012
Date: 2012-04-09 03:35:07 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/GoodsReceived.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -169,7 +169,7 @@
if ($LnItm->Controlled == 1) {
- echo '<input type="hidden" name="RecvQty_' . $LnItm->LineNo . '" value="' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '" /><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
+ echo '<input type="hidden" name="RecvQty_' . $LnItm->LineNo . '" value="' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '" /><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
} else {
echo '<input type="text" class="number" name="RecvQty_' . $LnItm->LineNo . '" maxlength="10" size="10" value="' . locale_number_format(round($LnItm->ReceiveQty,$LnItm->DecimalPlaces),$LnItm->DecimalPlaces) . '" /></td>';
@@ -188,10 +188,10 @@
if ($LnItm->Controlled == 1) {
if ($LnItm->Serialised==1){
- echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
+ echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
_('Enter Serial Nos'). '</a></td>';
} else {
- echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
+ echo '<td><a href="GoodsReceivedControlled.php?identifier=' . $identifier . '&LineNo=' . $LnItm->LineNo . '">'.
_('Enter Batches'). '</a></td>';
}
}
@@ -270,6 +270,8 @@
if ($_SESSION['CompanyRecord']==0){
/*The company data and preferences could not be retrieved for some reason */
+ echo '</div>';
+ echo '</form>';
prnMsg(_('The company information and preferences could not be retrieved') . ' - ' . _('see your system administrator') , 'error');
include('includes/footer.inc');
exit;
@@ -354,6 +356,8 @@
unset($_SESSION['PO'.$identifier]->LineItems);
unset($_SESSION['PO'.$identifier]);
unset($_POST['ProcessGoodsReceived']);
+ echo '</div>';
+ echo '</form>';
include ('includes/footer.inc');
exit;
}
@@ -723,12 +727,14 @@
'. prnMsg(_('GRN number'). ' '. $GRN .' '. _('has been processed'),'success') . '
<br />
<br />
- <a href="PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'">'. _('Print this Goods Received Note (GRN)').'</a>
+ <a href="PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'">'. _('Print this Goods Received Note (GRN)').'</a>
<br />
<br />
<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Select a different purchase order for receiving goods against'). '</a>
</div>';
/*end of process goods received entry */
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/RecurringSalesOrders.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -309,9 +309,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') .
'" alt="" /><b>'.' '. _('Recurring Order for Customer') .' : ' . $_SESSION['Items'.$identifier]->CustomerName .'</b></p>';
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'] . '" />';
-
echo '<table cellpadding="2" class="selection">';
echo '<tr><th colspan="7"><b>'._('Order Line Details').'</b></th></tr>';
echo '<tr>
@@ -368,7 +368,7 @@
</table>';
echo '<br /><table class="selection">';
-echo '<tr><th colspan="7"><font size="2" color=navy><b>'._('Order Header Details').'</b></font></th></tr>';
+echo '<tr><th colspan="7"><h3>'._('Order Header Details').'</h3></th></tr>';
echo '<tr>
<td>'. _('Deliver To') .':</td>
@@ -419,8 +419,8 @@
} else {
echo '<tr>
<td>'. _('Last Recurrence') . ':</td>
- <td>' . $_POST['StartDate'] . '</td></tr>';
- echo '<input type="hidden" name="StartDate" value="' . $_POST['StartDate'] . '" />';
+ <td>' . $_POST['StartDate'];
+ echo '<input type="hidden" name="StartDate" value="' . $_POST['StartDate'] . '" /></td></tr>';
}
if (!isset($_POST['StopDate'])){
@@ -484,13 +484,12 @@
echo '<option value="0">' . _('No') . '</option>';
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
}
- echo '</select></td></tr>';
+ echo '</select></td></tr></table>';
} else {
+ echo '</table>';
echo '<input type="hidden" name="AutoInvoice" value="0" />';
}
-echo '</table>';
-
echo '<br /><div class="centre">';
if ($NewRecurringOrder=='Yes'){
echo '<input type="hidden" name="NewRecurringOrder" value="Yes" />';
@@ -504,6 +503,8 @@
echo '<br /><br /><input type="submit" name="DeleteRecurringOrder" value="' . _('Delete Recurring Order') . ' ' . $_POST['ExistingRecurrOrderNo'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this recurring order template?') . '\');" />';
}
-echo '</form></div>';
+echo '</div>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReorderLevel.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -194,7 +194,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Inventory Reorder Level Report') . '</p>';
echo '<div class="page_help_text">' . _('Use this report to display the reorder levels for Inventory items in different categories.') . '</div><br />';
- echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"><table>';
+ echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
@@ -224,7 +225,7 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>'A' ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
if (DB_num_rows($result1)==0){
- echo '</table></td></tr>
+ echo '</td></tr>
</table>
<br />';
prnMsg(_('There are no stock categories currently defined please use the link below to set them up'),'warn');
@@ -257,7 +258,8 @@
<div class="centre">
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>';
-
+ echo '</div>
+ </form>';
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReorderLevelLocation.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -55,29 +55,30 @@
$ResultLocation = DB_query($SqlLoc,$db);
$Location=DB_fetch_array($ResultLocation);
- echo'<p class="page_title_text" align="center"><strong>' . _('Location : ') . '' . $Location['locationname'] . ' </strong></p>';
- echo'<p class="page_title_text" align="center"><strong>' . _('Number Of Days Sales : ') . '' . locale_number_format($_POST['NumberOfDays'],0) . '' . _(' Days ') . ' </strong></p>';
- echo '<table>';
- echo '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Total Invoiced').'<br />'._('At Location') . '</th>
- <th>' . _('On Hand') .'<br />'._('At All Locations') . '</th>
- <th>' . _('On Hand') .'<br />' ._('At Location') . '</th>
- <th>' . _('Reorder Level') . '</th>
- <tr>';
-
+ echo'<p class="page_title_text"><strong>' . _('Location : ') . '' . $Location['locationname'] . ' </strong></p>';
+ echo'<p class="page_title_text"><strong>' . _('Number Of Days Sales : ') . '' . locale_number_format($_POST['NumberOfDays'],0) . '' . _(' Days ') . ' </strong></p>';
$k=0; //row colour counter
- echo'<form action="ReorderLevelLocation.php" method="post" name="Update">';
+ echo '<form action="ReorderLevelLocation.php" method="post" id="Update">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table>';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Total Invoiced').'<br />'._('At Location') . '</th>
+ <th>' . _('On Hand') .'<br />'._('At All Locations') . '</th>
+ <th>' . _('On Hand') .'<br />' ._('At Location') . '</th>
+ <th>' . _('Reorder Level') . '</th>
+ </tr>';
+
$i=1;
while ($myrow=DB_fetch_array($result)) {
if ($k==1){
- echo '<tr class="EvenTableRows">';
+ echo '<tr class="EvenTableRows"><td>';
$k=0;
} else {
- echo '<tr class="OddTableRows">';
+ echo '<tr class="OddTableRows"><td>';
$k=1;
}
@@ -116,7 +117,7 @@
$LocQtyResult = DB_query($SqlOHLoc,$db);
$LocQtyRow = DB_fetch_array($LocQtyResult);
- echo'<td>'.$myrow['stockid'].'</td>
+ echo $myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td class="number">'.locale_number_format($SalesRow['qtyinvoiced'],$myrow['decimalplaces']).'</td>
<td class="number">'.locale_number_format($TotQtyRow['qty'],$myrow['decimalplaces']).'</td>
@@ -131,6 +132,8 @@
<input type="submit" name="submit" value="' . _('Update') . '" />
</td>
</tr>
+ </table>
+ </div>
</form>';
@@ -142,7 +145,7 @@
echo '<br />
<br />
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <table>';
+ <div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
@@ -173,9 +176,10 @@
}
echo '</select></td></tr>';
- echo'<tr>
+ echo '<tr>
<td>' . _('Number Of Days Sales') . ':</td>
- <td><input type="text" class="number" name="NumberOfDays" maxlength="3" size="4" value="0" /></td>';
+ <td><input type="text" class="number" name="NumberOfDays" maxlength="3" size="4" value="0" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Order By') . ':</td>
<td><select name="Sequence">
@@ -185,11 +189,11 @@
</tr>';
echo '</table>
<br />
- <p>
<div class="centre">
<input type="submit" name="submit" value="' . _('Submit') . '" />
- </div>
- </p>';
+ </div>';
+ echo '</div>
+ </form>';
} /*end of else not submit */
include('includes/footer.inc');
Modified: trunk/ReprintGRN.php
===================================================================
--- trunk/ReprintGRN.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReprintGRN.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -12,10 +12,11 @@
}
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>
- <th colspan="2"><font size="2" color="navy">' . _('Select a purchase order') . '</th>
+ <th colspan="2"><h3>' . _('Select a purchase order') . '</h3></th>
</tr>
<tr>
<td>' . _('Enter a Purchase Order Number') . '</td>
@@ -25,6 +26,8 @@
<td colspan="2" style="text-align: center"><input type="submit" name="Show" value="' . _('Show GRNs') . '" /></td>
</tr>
</table>
+ <br />
+ </div>
</form>';
if (isset($_POST['Show'])) {
@@ -72,7 +75,7 @@
echo '<br />
<table class="selection">
<tr>
- <th colspan="8"><font size="2" color="navy">' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</th>
+ <th colspan="8"><h3>' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</h3></th>
</tr>
<tr>
<th>' . _('Supplier') . '</th>
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2012-04-08 19:55:49 UTC (rev 5235)
+++ trunk/ReverseGRN.php 2012-04-09 03:35:07 UTC (rev 5236)
@@ -340,14 +340,15 @@
} else {
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['RecdAfterDate']) OR !Is_Date($_POST['RecdAfterDate'])) {
$_POST['RecdAfterDate'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date("m")-3,Date("d"),Date("Y")));
}
+ echo '<input type="hidden" name="SupplierID" value="' . $_POST['SupplierID'] . '" />';
+ echo '<input type="hidden" name="SuppName" value="' . $_POST['SuppName'] . '" />';
echo '<table class="selection"><tr>';
- echo '<input type="hidden" name="SupplierID" valuE="' . $_POST['SupplierID'] . '" />';
- echo '<input type="hidden" name="SuppName" value="' . $_POST['SuppName'] . '" />';
echo '<td>'._('Show all goods received after') . ': </td>
<td><input type="text" class="date" alt="'. $_SESSION['DefaultDateFormat'].'" name="RecdAfterDate" value="' . $_POST['RecdAfterDate'] . '" maxlength="10" size="10" /></td>
</tr>
@@ -356,6 +357,8 @@
<div class="centre">
<input type="submit" name="ShowGRNS" value="' . _('Show Outstanding Goods Received') . '" />
</div>';
+ echo '</div>
+ </form>';
if (isset($_POST['ShowGRNS'])){
@@ -435,6 +438,7 @@
}
echo '</table>';
+
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-10 22:06:06
|
Revision: 5238
http://web-erp.svn.sourceforge.net/web-erp/?rev=5238&view=rev
Author: vvs2012
Date: 2012-04-10 22:05:59 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
Modified: trunk/SalesAnalReptCols.php
===================================================================
--- trunk/SalesAnalReptCols.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalReptCols.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -258,8 +258,8 @@
<th>' . _('Prd From') . '</th>
<th>' . _('Prd To') . '</th>
<th>' . _('Data') . '</th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Numerator') . '</font></th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Denominator') . '</font></th>
+ <th>' . _('Col') . ' #<br />' . _('Numerator') . '</th>
+ <th>' . _('Col') . ' #<br />' . _('Denominator') . '</th>
<th>' . _('Operator') . '</th>
<th>' . _('Budget') . '<br />' . _('Or Actual') . '</th>
</tr>';
@@ -285,7 +285,7 @@
$BudOrAct = _('N/A');
}
- printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
+ printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -296,7 +296,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</td></tr>',
+ <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</a></td></tr>',
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$ReportID,
$myrow[1],
@@ -319,8 +319,7 @@
//END WHILE LIST LOOP
}
-echo '</table>
- <br />
+echo '</table><br />
<div class="centre">
<a href="' . $rootpath . '/SalesAnalRepts.php">' . _('Maintain Report Headers') . '</a>
</div>';
@@ -335,6 +334,7 @@
$myrow=DB_fetch_array($result);
$ReportHeading=$myrow['reportheading'];
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="ReportHeading" value="'.$ReportHeading.'" />';
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
@@ -386,13 +386,13 @@
echo '<table class="selection">';
} else {
- echo '<table class="selection">';
+ echo '<br /><table class="selection">';
if (!isset($_POST['ColID'])) {
$_POST['ColID']=1;
}
echo '<tr>
<td>' . _('Column Number') . ':</td>
- <td><input type="text" class="number" name=ColID size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> <font size="1" />(' . _('A number between 1 and 10 is expected') . ')</font></td>
+ <td><input type="text" class="number" name="ColID" size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> (' . _('A number between 1 and 10 is expected') . ')</td>
</tr>';
}
if (!isset($_POST['Heading1'])) {
@@ -429,7 +429,7 @@
echo '<tr>
<td>' . _('From Period') . ':</td>
- <td><select name="PeriodFrom"';
+ <td><select name="PeriodFrom">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -445,7 +445,7 @@
echo '<tr>
<td>' . _('ToPeriod') . ':</td>
- <td><select name="PeriodTo"';
+ <td><select name="PeriodTo">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -475,14 +475,14 @@
echo '<option value="0">' . _('Budget') . '</option>';
echo '<option selected="selected" value="1">' . _('Actual') . '</option>';
}
- echo '</select></td>
- </tr>';
+ echo '</select>';
echo '<input type="hidden" name="ValFormat" value="N" />
<input type="hidden" name="ColNumerator" value="0" />
<input type="hidden" name="ColDenominator" value="0" />
<input type="hidden" name="CalcOperator" value="" />
<input type="hidden" name="Constant" value="0" />';
-
+ echo '</td>
+ </tr>';
} else { /*it IS a calculated column */
echo '<tr>
@@ -551,6 +551,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/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalRepts.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -57,7 +57,7 @@
/* end of function */
-echo '<p>';
+echo '<br />';
if (isset($_GET['SelectedReport'])) {
$SelectedReport = $_GET['SelectedReport'];
@@ -280,7 +280,8 @@
echo '<table class="selection">';
echo '<tr>
<th>' . _('Report No') . '</th>
- <th>' . _('Report Title') . '</th>';
+ <th>' . _('Report Title') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -296,11 +297,11 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
+ <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
<td><a href="%s/SalesAnalReptCols.php?ReportID=%s">' . _('Define Columns') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
- <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\"' . _('Are you sure you wish to remove this report design?') . '\");">' . _('Delete') . '</td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
+ <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to remove this report design?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow[0],
$myrow[1],
@@ -317,7 +318,7 @@
}
//END WHILE LIST LOOP
- echo '</table><p>';
+ echo '</table><br />';
}
//end of ifs and buts!
@@ -328,11 +329,12 @@
echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Defined Reports') . '</a>';
}
-echo '<p />';
+echo '<br />';
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($SelectedReport)) {
@@ -385,12 +387,12 @@
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Edit The Selected Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Edit The Selected Report') . '</h3></th>
</tr>';
} else {
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Define A New Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Define A New Report') . '</h3></th>
</tr>';
}
@@ -513,6 +515,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/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesByTypePeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -19,11 +19,12 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="Form1" 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">
- <tr><td valign=top>
+ <tr><td valign="top">
<table>';
echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
@@ -32,7 +33,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)"/></td>
</tr>
@@ -40,7 +41,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -48,7 +49,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -56,7 +57,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -84,7 +85,7 @@
<td>' . _('Daily') . ':</td>
<td><input type="radio" name="DisplayData" value="Daily" ';
if ($_POST['DisplayData']=='Daily'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -92,7 +93,7 @@
<td>' . _('Weekly') . ':</td>
<td><input type="radio" name="DisplayData" value="Weekly" ';
if ($_POST['DisplayData']=='Weekly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -100,7 +101,7 @@
<td>' . _('Monthly') . ':</td>
<td><input type="radio" name="DisplayData" value="Monthly" ';
if ($_POST['DisplayData']=='Monthly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -108,7 +109,7 @@
<td>' . _('Quarterly') . ':</td>
<td><input type="radio" name="DisplayData" value="Quarterly" ';
if ($_POST['DisplayData']=='Quarterly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -121,6 +122,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />
</div>
+ </div>
</form>
<br />';
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategories.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -194,7 +194,7 @@
$CategoryPath = $CategoryPath.$TempPath;
-echo '<p><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </b></div></p>';
+echo '<br /><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </div>';
// END Calculate Path for navigation
// ----------------------------------------------------------------------------------------
@@ -216,7 +216,7 @@
$result = DB_query($sql,$db);
-echo '<p>';
+echo '<br />';
if (DB_num_rows($result) == 0) {
prnMsg(_('There are no categories defined at this level.'));
} else {
@@ -271,7 +271,6 @@
//END WHILE LIST LOOP
echo '</table>';
}
-echo '</p>';
// END display Categories
// ----------------------------------------------------------------------------------------
@@ -281,7 +280,8 @@
// ----------------------------------------------------------------------------------------
// Show New or Edit Category
-echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
// This array will contain the stockids in use for this category
@@ -328,7 +328,8 @@
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Submit Information') . '" /></div>';
-echo '</form></p>';
+echo '</div>
+ </form>';
// END Show New or Edit Category
// ----------------------------------------------------------------------------------------
@@ -366,7 +367,8 @@
$result = DB_query($sql,$db);
if($result && DB_num_rows($result)) {
// continue id stock id in the stockid array
- echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if( isset($SelectedCategory) ) { // If we selected a category we need to keep it selected
echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />';
@@ -391,8 +393,8 @@
echo '</select>';
echo '</td></tr></table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Add Inventory Item') . '" /></div>';
- echo '';
- echo '</form></p>';
+ echo '</div>
+ </form>';
} else {
echo '<p>';
echo prnMsg( _('No more Inventory items to add') );
@@ -407,7 +409,7 @@
// ----------------------------------------------------------------------------------------
// Always Show Stock In Category
-echo '<p>';
+echo '<br />';
$sql = "SELECT scp.stockid, sm.description FROM salescatprod scp
LEFT JOIN stockmaster sm ON sm.stockid = scp.stockid
WHERE scp.salescatid". (isset($ParentCategory)?('='.$ParentCategory):' is NULL') . "
@@ -442,7 +444,6 @@
}
DB_free_result($result);
}
-echo '</p>';
// ----------------------------------------------------------------------------------------
// END Always Show Stock In Category
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategoryPeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" 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">';
@@ -25,7 +26,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -33,7 +34,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -41,7 +42,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -49,7 +50,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>';
@@ -72,7 +73,9 @@
echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />';
-echo '</form></div>';
+echo '</div>';
+echo '</div>
+ </form>';
echo '<br />';
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -129,12 +129,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -242,12 +242,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -269,6 +269,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($SelectedSalesPostingID)) {
@@ -389,13 +390,13 @@
} 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
DB_data_seek($result,0);
- echo '</td></tr>
+ echo '</select></td></tr>
<tr><td>' . _('Post Discount to GL Account') . ':</td>
<td><select name="DiscountGLCode">';
@@ -405,7 +406,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
@@ -415,7 +416,8 @@
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGraph.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -29,13 +29,14 @@
OR $SelectADifferentPeriod==_('Select A Different Period')){
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 '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
echo '<table class="selection">
<tr><td>' . _('Select Period From:') . '</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
if (Date('m') > $_SESSION['YearEnd']){
/*Dates in SQL format */
@@ -114,7 +115,7 @@
}
echo '<tr>
<td>' . _('For Stock Category:') .'</td>
- <td><select Name="CategoryID">';
+ <td><select name="CategoryID">';
if($_POST['CategoryID']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
@@ -176,20 +177,22 @@
$_POST['ValueTo']='';
}
echo '<tr><td>' . _('Graph On:') . '</td><td>
- <input type="radio"" name="GraphOn" value="All" CHECKED />' . _('All') . '<br />
- <input type="radio"" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
- <input type="radio"" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
+ <input type="radio" name="GraphOn" value="All" checked="checked" />' . _('All') . '<br />
+ <input type="radio" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
+ <input type="radio" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
echo '<tr><td>' . _('From:') . ' <input type="text" name="ValueFrom" value="' . $_POST['ValueFrom'] . '" /></td>
<td>' . _('To:') . ' <input type="text" name="ValueTo" value="' . $_POST['ValueTo'] . '" /></td></tr>';
echo '<tr><td>' . _('Graph Value:') . '</td><td>
- <input type="radio"" name="GraphValue" value="Net" CHECKED />' . _('Net Sales Value') . '<br />
- <input type="radio"" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
- <input type="radio"" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
+ <input type="radio" name="GraphValue" value="Net" checked="checked" />' . _('Net Sales Value') . '<br />
+ <input type="radio" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
+ <input type="radio" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" Name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '</div>
+ </form>';
include('includes/footer.inc');
} else {
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -1038,6 +1038,7 @@
// the page is called.
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<br/>
<br/>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -1050,7 +1051,7 @@
<option selected="selected" value="Detail">' . _('Detail') . '</option>
<option value="Summary">' . _('Summary') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
@@ -1060,7 +1061,7 @@
<option selected="selected" value="0">' . _('Sales Order') . '</option>
<option value="1">' . _('Quotation') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1069,7 +1070,7 @@
<option selected="selected" value="Order">' . _('Order Date') . '</option>
<option value="Invoice">' . _('Invoice Date') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1079,7 +1080,7 @@
<option value="10">' . _('Sales Invoice') . '</option>
<option value="11">' . _('Credit Note') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Only Applies To Invoice Date Type') . '</td>
</tr>';
@@ -1098,7 +1099,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="PartNumber" size="20" maxlength="20" value="'. $_POST['PartNumber'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorNo'])){
@@ -1110,7 +1111,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorNo" size="10" maxlength="10" value="' . $_POST['DebtorNo'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorName'])){
@@ -1122,7 +1123,7 @@
<option selected="selected" value="LIKE">' . _('Begins With') . '</option>
<option value="Equals">' . _('Equals') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorName" size="30" maxlength="30" value="' . $_POST['DebtorName'] .'" /></td>
</tr>';
if (!isset($_POST['OrderNo'])){
@@ -1131,7 +1132,7 @@
echo '<tr>
<td>' . _('Order Number') . ':</td>
<td>' . _('Equals') . '</td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="OrderNo" size="10" maxlength="10" value="' . $_POST['OrderNo'] . '" /></td>
</tr>';
@@ -1142,7 +1143,7 @@
<option value="Completed">' . _('Completed') . '</option>
<option value="Open">' . _('Not Completed') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1178,7 +1179,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr>
<td>' . _('Sort By') . ':</td>
<td><select name="SortBy">
@@ -1188,15 +1189,15 @@
<option value="debtorsmaster.name,debtorsmaster.debtorno,salesorderdetails.orderno">' . _('Customer Name') . '</option>
<option value="tempstockmoves.transno,salesorderdetails.stkcode">' . _('Transaction Number') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number sort only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>
<td><select name="SummaryType">
<option selected="selected" value="orderno">' . _('Order Number') . '</option>
@@ -1210,20 +1211,21 @@
<option value="salesman">' . _('Salesman') . '</option>
<option value="area">' . _('Sales Area') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number summary only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
- <td> </td>
+ <td> </td>
<td><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></td>
</tr>
</table>
<br />';
- echo '</form>';
+ echo '</div>
+ </form>';
} // End of function display()
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesPeople.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -230,7 +230,7 @@
<td class="number">%s</td>
<td>%s</td>
<td><a href="%sSelectedSalesPerson=%s">'. _('Edit') . '</a></td>
- <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['salesmancode'],
$myrow['salesmanname'],
@@ -256,6 +256,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($SelectedSalesPerson)) {
@@ -368,6 +369,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/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesTopItemsInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" n...
[truncated message content] |
|
From: <vv...@us...> - 2012-04-10 22:06:06
|
Revision: 5238
http://web-erp.svn.sourceforge.net/web-erp/?rev=5238&view=rev
Author: vvs2012
Date: 2012-04-10 22:05:59 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
Modified: trunk/SalesAnalReptCols.php
===================================================================
--- trunk/SalesAnalReptCols.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalReptCols.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -258,8 +258,8 @@
<th>' . _('Prd From') . '</th>
<th>' . _('Prd To') . '</th>
<th>' . _('Data') . '</th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Numerator') . '</font></th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Denominator') . '</font></th>
+ <th>' . _('Col') . ' #<br />' . _('Numerator') . '</th>
+ <th>' . _('Col') . ' #<br />' . _('Denominator') . '</th>
<th>' . _('Operator') . '</th>
<th>' . _('Budget') . '<br />' . _('Or Actual') . '</th>
</tr>';
@@ -285,7 +285,7 @@
$BudOrAct = _('N/A');
}
- printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
+ printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -296,7 +296,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</td></tr>',
+ <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</a></td></tr>',
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$ReportID,
$myrow[1],
@@ -319,8 +319,7 @@
//END WHILE LIST LOOP
}
-echo '</table>
- <br />
+echo '</table><br />
<div class="centre">
<a href="' . $rootpath . '/SalesAnalRepts.php">' . _('Maintain Report Headers') . '</a>
</div>';
@@ -335,6 +334,7 @@
$myrow=DB_fetch_array($result);
$ReportHeading=$myrow['reportheading'];
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="ReportHeading" value="'.$ReportHeading.'" />';
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
@@ -386,13 +386,13 @@
echo '<table class="selection">';
} else {
- echo '<table class="selection">';
+ echo '<br /><table class="selection">';
if (!isset($_POST['ColID'])) {
$_POST['ColID']=1;
}
echo '<tr>
<td>' . _('Column Number') . ':</td>
- <td><input type="text" class="number" name=ColID size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> <font size="1" />(' . _('A number between 1 and 10 is expected') . ')</font></td>
+ <td><input type="text" class="number" name="ColID" size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> (' . _('A number between 1 and 10 is expected') . ')</td>
</tr>';
}
if (!isset($_POST['Heading1'])) {
@@ -429,7 +429,7 @@
echo '<tr>
<td>' . _('From Period') . ':</td>
- <td><select name="PeriodFrom"';
+ <td><select name="PeriodFrom">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -445,7 +445,7 @@
echo '<tr>
<td>' . _('ToPeriod') . ':</td>
- <td><select name="PeriodTo"';
+ <td><select name="PeriodTo">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -475,14 +475,14 @@
echo '<option value="0">' . _('Budget') . '</option>';
echo '<option selected="selected" value="1">' . _('Actual') . '</option>';
}
- echo '</select></td>
- </tr>';
+ echo '</select>';
echo '<input type="hidden" name="ValFormat" value="N" />
<input type="hidden" name="ColNumerator" value="0" />
<input type="hidden" name="ColDenominator" value="0" />
<input type="hidden" name="CalcOperator" value="" />
<input type="hidden" name="Constant" value="0" />';
-
+ echo '</td>
+ </tr>';
} else { /*it IS a calculated column */
echo '<tr>
@@ -551,6 +551,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/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalRepts.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -57,7 +57,7 @@
/* end of function */
-echo '<p>';
+echo '<br />';
if (isset($_GET['SelectedReport'])) {
$SelectedReport = $_GET['SelectedReport'];
@@ -280,7 +280,8 @@
echo '<table class="selection">';
echo '<tr>
<th>' . _('Report No') . '</th>
- <th>' . _('Report Title') . '</th>';
+ <th>' . _('Report Title') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -296,11 +297,11 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
+ <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
<td><a href="%s/SalesAnalReptCols.php?ReportID=%s">' . _('Define Columns') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
- <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\"' . _('Are you sure you wish to remove this report design?') . '\");">' . _('Delete') . '</td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
+ <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to remove this report design?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow[0],
$myrow[1],
@@ -317,7 +318,7 @@
}
//END WHILE LIST LOOP
- echo '</table><p>';
+ echo '</table><br />';
}
//end of ifs and buts!
@@ -328,11 +329,12 @@
echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Defined Reports') . '</a>';
}
-echo '<p />';
+echo '<br />';
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($SelectedReport)) {
@@ -385,12 +387,12 @@
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Edit The Selected Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Edit The Selected Report') . '</h3></th>
</tr>';
} else {
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Define A New Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Define A New Report') . '</h3></th>
</tr>';
}
@@ -513,6 +515,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/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesByTypePeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -19,11 +19,12 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="Form1" 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">
- <tr><td valign=top>
+ <tr><td valign="top">
<table>';
echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
@@ -32,7 +33,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)"/></td>
</tr>
@@ -40,7 +41,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -48,7 +49,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -56,7 +57,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -84,7 +85,7 @@
<td>' . _('Daily') . ':</td>
<td><input type="radio" name="DisplayData" value="Daily" ';
if ($_POST['DisplayData']=='Daily'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -92,7 +93,7 @@
<td>' . _('Weekly') . ':</td>
<td><input type="radio" name="DisplayData" value="Weekly" ';
if ($_POST['DisplayData']=='Weekly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -100,7 +101,7 @@
<td>' . _('Monthly') . ':</td>
<td><input type="radio" name="DisplayData" value="Monthly" ';
if ($_POST['DisplayData']=='Monthly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -108,7 +109,7 @@
<td>' . _('Quarterly') . ':</td>
<td><input type="radio" name="DisplayData" value="Quarterly" ';
if ($_POST['DisplayData']=='Quarterly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -121,6 +122,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />
</div>
+ </div>
</form>
<br />';
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategories.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -194,7 +194,7 @@
$CategoryPath = $CategoryPath.$TempPath;
-echo '<p><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </b></div></p>';
+echo '<br /><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </div>';
// END Calculate Path for navigation
// ----------------------------------------------------------------------------------------
@@ -216,7 +216,7 @@
$result = DB_query($sql,$db);
-echo '<p>';
+echo '<br />';
if (DB_num_rows($result) == 0) {
prnMsg(_('There are no categories defined at this level.'));
} else {
@@ -271,7 +271,6 @@
//END WHILE LIST LOOP
echo '</table>';
}
-echo '</p>';
// END display Categories
// ----------------------------------------------------------------------------------------
@@ -281,7 +280,8 @@
// ----------------------------------------------------------------------------------------
// Show New or Edit Category
-echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
// This array will contain the stockids in use for this category
@@ -328,7 +328,8 @@
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Submit Information') . '" /></div>';
-echo '</form></p>';
+echo '</div>
+ </form>';
// END Show New or Edit Category
// ----------------------------------------------------------------------------------------
@@ -366,7 +367,8 @@
$result = DB_query($sql,$db);
if($result && DB_num_rows($result)) {
// continue id stock id in the stockid array
- echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if( isset($SelectedCategory) ) { // If we selected a category we need to keep it selected
echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />';
@@ -391,8 +393,8 @@
echo '</select>';
echo '</td></tr></table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Add Inventory Item') . '" /></div>';
- echo '';
- echo '</form></p>';
+ echo '</div>
+ </form>';
} else {
echo '<p>';
echo prnMsg( _('No more Inventory items to add') );
@@ -407,7 +409,7 @@
// ----------------------------------------------------------------------------------------
// Always Show Stock In Category
-echo '<p>';
+echo '<br />';
$sql = "SELECT scp.stockid, sm.description FROM salescatprod scp
LEFT JOIN stockmaster sm ON sm.stockid = scp.stockid
WHERE scp.salescatid". (isset($ParentCategory)?('='.$ParentCategory):' is NULL') . "
@@ -442,7 +444,6 @@
}
DB_free_result($result);
}
-echo '</p>';
// ----------------------------------------------------------------------------------------
// END Always Show Stock In Category
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategoryPeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" 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">';
@@ -25,7 +26,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -33,7 +34,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -41,7 +42,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -49,7 +50,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>';
@@ -72,7 +73,9 @@
echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />';
-echo '</form></div>';
+echo '</div>';
+echo '</div>
+ </form>';
echo '<br />';
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -129,12 +129,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -242,12 +242,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -269,6 +269,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($SelectedSalesPostingID)) {
@@ -389,13 +390,13 @@
} 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
DB_data_seek($result,0);
- echo '</td></tr>
+ echo '</select></td></tr>
<tr><td>' . _('Post Discount to GL Account') . ':</td>
<td><select name="DiscountGLCode">';
@@ -405,7 +406,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
@@ -415,7 +416,8 @@
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGraph.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -29,13 +29,14 @@
OR $SelectADifferentPeriod==_('Select A Different Period')){
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 '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
echo '<table class="selection">
<tr><td>' . _('Select Period From:') . '</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
if (Date('m') > $_SESSION['YearEnd']){
/*Dates in SQL format */
@@ -114,7 +115,7 @@
}
echo '<tr>
<td>' . _('For Stock Category:') .'</td>
- <td><select Name="CategoryID">';
+ <td><select name="CategoryID">';
if($_POST['CategoryID']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
@@ -176,20 +177,22 @@
$_POST['ValueTo']='';
}
echo '<tr><td>' . _('Graph On:') . '</td><td>
- <input type="radio"" name="GraphOn" value="All" CHECKED />' . _('All') . '<br />
- <input type="radio"" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
- <input type="radio"" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
+ <input type="radio" name="GraphOn" value="All" checked="checked" />' . _('All') . '<br />
+ <input type="radio" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
+ <input type="radio" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
echo '<tr><td>' . _('From:') . ' <input type="text" name="ValueFrom" value="' . $_POST['ValueFrom'] . '" /></td>
<td>' . _('To:') . ' <input type="text" name="ValueTo" value="' . $_POST['ValueTo'] . '" /></td></tr>';
echo '<tr><td>' . _('Graph Value:') . '</td><td>
- <input type="radio"" name="GraphValue" value="Net" CHECKED />' . _('Net Sales Value') . '<br />
- <input type="radio"" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
- <input type="radio"" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
+ <input type="radio" name="GraphValue" value="Net" checked="checked" />' . _('Net Sales Value') . '<br />
+ <input type="radio" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
+ <input type="radio" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" Name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '</div>
+ </form>';
include('includes/footer.inc');
} else {
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -1038,6 +1038,7 @@
// the page is called.
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<br/>
<br/>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -1050,7 +1051,7 @@
<option selected="selected" value="Detail">' . _('Detail') . '</option>
<option value="Summary">' . _('Summary') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
@@ -1060,7 +1061,7 @@
<option selected="selected" value="0">' . _('Sales Order') . '</option>
<option value="1">' . _('Quotation') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1069,7 +1070,7 @@
<option selected="selected" value="Order">' . _('Order Date') . '</option>
<option value="Invoice">' . _('Invoice Date') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1079,7 +1080,7 @@
<option value="10">' . _('Sales Invoice') . '</option>
<option value="11">' . _('Credit Note') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Only Applies To Invoice Date Type') . '</td>
</tr>';
@@ -1098,7 +1099,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="PartNumber" size="20" maxlength="20" value="'. $_POST['PartNumber'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorNo'])){
@@ -1110,7 +1111,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorNo" size="10" maxlength="10" value="' . $_POST['DebtorNo'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorName'])){
@@ -1122,7 +1123,7 @@
<option selected="selected" value="LIKE">' . _('Begins With') . '</option>
<option value="Equals">' . _('Equals') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorName" size="30" maxlength="30" value="' . $_POST['DebtorName'] .'" /></td>
</tr>';
if (!isset($_POST['OrderNo'])){
@@ -1131,7 +1132,7 @@
echo '<tr>
<td>' . _('Order Number') . ':</td>
<td>' . _('Equals') . '</td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="OrderNo" size="10" maxlength="10" value="' . $_POST['OrderNo'] . '" /></td>
</tr>';
@@ -1142,7 +1143,7 @@
<option value="Completed">' . _('Completed') . '</option>
<option value="Open">' . _('Not Completed') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1178,7 +1179,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr>
<td>' . _('Sort By') . ':</td>
<td><select name="SortBy">
@@ -1188,15 +1189,15 @@
<option value="debtorsmaster.name,debtorsmaster.debtorno,salesorderdetails.orderno">' . _('Customer Name') . '</option>
<option value="tempstockmoves.transno,salesorderdetails.stkcode">' . _('Transaction Number') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number sort only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>
<td><select name="SummaryType">
<option selected="selected" value="orderno">' . _('Order Number') . '</option>
@@ -1210,20 +1211,21 @@
<option value="salesman">' . _('Salesman') . '</option>
<option value="area">' . _('Sales Area') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number summary only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
- <td> </td>
+ <td> </td>
<td><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></td>
</tr>
</table>
<br />';
- echo '</form>';
+ echo '</div>
+ </form>';
} // End of function display()
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesPeople.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -230,7 +230,7 @@
<td class="number">%s</td>
<td>%s</td>
<td><a href="%sSelectedSalesPerson=%s">'. _('Edit') . '</a></td>
- <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['salesmancode'],
$myrow['salesmanname'],
@@ -256,6 +256,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($SelectedSalesPerson)) {
@@ -368,6 +369,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/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesTopItemsInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" n...
[truncated message content] |
|
From: <vv...@us...> - 2012-04-12 07:43:32
|
Revision: 5239
http://web-erp.svn.sourceforge.net/web-erp/?rev=5239&view=rev
Author: vvs2012
Date: 2012-04-12 07:43:22 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/COGSGLPostings.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTrialBalance.php
trunk/Payments.php
trunk/PcExpenses.php
trunk/PcTabs.php
trunk/PrintCustTrans.php
trunk/SalesGLPostings.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/jelly/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/includes/OutputSerialItems.php
trunk/install/index.php
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/BankAccounts.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -299,9 +299,9 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
} //end while loop
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/COGSGLPostings.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -341,7 +341,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
} //end while loop
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLAccountCSV.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -35,10 +35,10 @@
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
if(isset($_POST['Account'][$i]) AND $myrow['accountcode'] == $_POST['Account'][$i]){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
$i++;
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
}
echo '</select></td>';
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLAccountInquiry.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -36,9 +36,9 @@
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
if($myrow['accountcode'] == $SelectedAccount){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
}
echo '</select></td></tr>';
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLBalanceSheet.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -579,7 +579,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false),
locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']));
$j++;
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLBudgets.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -49,7 +49,7 @@
prnMsg(_('No General ledger accounts have been set up yet') . ' - ' . _('budgets cannot be allocated until the GL accounts are set up'),'warn');
} else {
while ($myrow=DB_fetch_array($result)){
- $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8');
+ $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false);
if (isset($SelectedAccount) AND isset($LastCode) AND $SelectedAccount==$myrow['accountcode']){
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $Account . '</option>';
$PrevCode=$LastCode;
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLCodesInquiry.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -46,7 +46,7 @@
<td>%s</td>
</tr>',
$myrow['accountcode'],
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false));
} else {
$ActGrp = $myrow['group_'];
printf('<td><b>%s</b></td>
@@ -55,7 +55,7 @@
</tr>',
$myrow['group_'],
$myrow['accountcode'],
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false));
}
}
//end of while loop
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLJournal.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -331,9 +331,9 @@
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false) .'</option>';
}
}
echo '</select></td>';
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLProfit_Loss.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -926,7 +926,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
@@ -941,7 +941,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLTagProfit_Loss.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -769,7 +769,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
} else {
printf('<td>%s</td>
@@ -777,7 +777,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
}
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLTrialBalance.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -623,7 +623,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format($myrow['monthactual'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['monthbudget'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/Payments.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -1010,9 +1010,9 @@
echo '<option value=""></option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['GLCode']) AND $_POST['GLCode']==$myrow['accountcode']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
}
}
echo '</select></td></tr>';
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PcExpenses.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -311,7 +311,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PcTabs.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -434,7 +434,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
@@ -456,7 +456,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PrintCustTrans.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -924,7 +924,7 @@
$PageNumber++;
echo '</table>
<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
@@ -973,7 +973,7 @@
/* head up a new invoice/credit note page */
$PageNumber++;
echo '<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SalesGLPostings.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -390,7 +390,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
@@ -406,7 +406,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SelectCustomer.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -52,7 +52,7 @@
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -204,7 +204,7 @@
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $db, $ErrMsg);
if ($myrow = DB_fetch_array($result)) {
- $CustomerName = $myrow['name'];
+ $CustomerName = htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false);
$PhoneNo = $myrow['phoneno'];
}
unset($result);
@@ -214,22 +214,22 @@
echo '<table cellpadding="4" width="90%" class="selection">
<tr>
- <th width="33%">' . _('Customer Inquiries') . '</th>
- <th width="33%">' . _('Customer Transactions') . '</th>
- <th width="33%">' . _('Customer Maintenance') . '</th>
+ <th style="width:33%">' . _('Customer Inquiries') . '</th>
+ <th style="width:33%">' . _('Customer Transactions') . '</th>
+ <th style="width:33%">' . _('Customer Maintenance') . '</th>
</tr>';
- echo '<tr><td valign=top class="select">';
+ echo '<tr><td valign="top" class="select">';
/* Customer Inquiry Options */
echo '<a href="' . $rootpath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Transaction Inquiries') . '</a><br />';
- echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
- echo '<a href="' . $rootpath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
+ echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
wikiLink('Customer', $_SESSION['CustomerID']);
- echo '</td><td valign=top class="select">';
+ echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
- echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
- echo '</td><td valign=top class="select">';
+ echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerBranches.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Add/Modify/Delete Customer Branches') . '</a><br />';
@@ -241,9 +241,9 @@
} else {
echo '<table width="90%">
<tr>
- <th width="33%">' . _('Customer Inquiries') . '</th>
- <th width="33%">' . _('Customer Transactions') . '</th>
- <th width="33%">' . _('Customer Maintenance') . '</th>
+ <th style="width:33%">' . _('Customer Inquiries') . '</th>
+ <th style="width:33%">' . _('Customer Transactions') . '</th>
+ <th style="width:33%">' . _('Customer Maintenance') . '</th>
</tr>';
echo '<tr>
<td class="select"></td>
@@ -255,6 +255,7 @@
echo '</td></tr></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'] . '" />';
if (mb_strlen($msg)>1){
prnMsg($msg,'info');
@@ -268,7 +269,7 @@
echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
}
echo '</td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Code') . ':</td>
+ <td><b>' . _('OR') . '</b></td><td>' . _('Enter a partial Code') . ':</td>
<td>';
if (isset($_POST['CustCode'])) {
echo '<input type="text" name="CustCode" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
@@ -278,7 +279,7 @@
echo '</td>
</tr>
<tr>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Enter a partial Phone Number') . ':</td>
<td>';
if (isset($_POST['CustPhone'])) {
@@ -287,7 +288,7 @@
echo '<input type="text" name="CustPhone" size="15" maxlength="18" />';
}
echo '</td>';
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>
+echo '<td><b>' . _('OR') . '</b></td>
<td>' . _('Enter part of the Address') . ':</td>
<td>';
if (isset($_POST['CustAdd'])) {
@@ -297,7 +298,7 @@
}
echo '</td></tr>';
echo '<tr>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Choose a Type') . ':</td>
<td>';
if (isset($_POST['CustType'])) {
@@ -343,7 +344,7 @@
}
/* Option to select a sales area */
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>
+echo '<td><b>' . _('OR') . '</b></td>
<td>' . _('Choose an Area') . ':</td><td>';
$result2 = DB_query("SELECT areacode, areadescription FROM areas", $db);
// Error if no sales areas setup
@@ -366,7 +367,7 @@
echo '</select></td></tr>';
}
-echo '</td></tr></table><br />';
+echo '</table><br />';
echo '<div class="centre">
<input type="submit" name="Search" value="' . _('Search Now') . '" />
<input type="submit" name="CSV" value="' . _('CSV Format') . '" />
@@ -391,7 +392,7 @@
}
echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
if ($ListPageMax > 1) {
- echo '<p><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset1">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
@@ -433,7 +434,6 @@
while ($myrow2 = DB_fetch_array($result)) {
fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . ',' . $myrow2['email'] . "\n");
}
- echo '</div>';
}
if (!isset($_POST['CSV'])) {
DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
@@ -447,16 +447,16 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
+ echo '<td><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8',false) . '" />
<input type="hidden" name="SelectedCustomer' . $i . '" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" />
- <td><font size="1">' . $myrow['name'] . '</font></td>
- <td><font size="1">' . $myrow['brname'] . '</font></td>
- <td><font size="1">' . $myrow['contactname'] . '</font></td>
- <td><font size="1">' . $myrow['typename'] . '</font></td>
- <td><font size="1">' . $myrow['phoneno'] . '</font></td>
- <td><font size="1">' . $myrow['faxno'] . '</font></td>
- <td><font size="1">' . $myrow['email'] . '</font></td>
+ <input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" /></td>
+ <td>' . htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false) . '</td>
+ <td>' . htmlspecialchars($myrow['brname'],ENT_QUOTES,'UTF-8',false) . '</td>
+ <td>' . $myrow['contactname'] . '</td>
+ <td>' . $myrow['typename'] . '</td>
+ <td>' . $myrow['phoneno'] . '</td>
+ <td>' . $myrow['faxno'] . '</td>
+ <td>' . $myrow['email'] . '</td>
</tr>';
$i++;
$j++;//row counter
@@ -475,7 +475,7 @@
//end if results to show
if (!isset($_POST['CSV'])) {
if (isset($ListPageMax) and $ListPageMax > 1) {
- echo '<p><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset2">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
@@ -490,10 +490,12 @@
<input type="submit" name="Go2" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
<input type="submit" name="Next" value="' . _('Next') . '" />';
+ echo '</div>';
}
//end if results to show
- echo '</div></form>';
}
+echo '</div>
+ </form>';
// Only display the geocode map if the integration is turned on, and there is a latitude/longitude to display
if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
@@ -505,7 +507,7 @@
<td colspan="2">
<table width="45%" cellpadding="4">
<tr>
- <th width="33%">' . _('Customer Mapping') . '</th>
+ <th style="width:33%">' . _('Customer Mapping') . '</th>
</tr>
</td>
<th valign="top">
@@ -556,7 +558,7 @@
$row = DB_fetch_array($Total1Result);
echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
- echo '<tr><th width="33%" colspan="3">' . _('Customer Data') . '</th></tr>';
+ echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Customer Data */
if ($myrow['lastpaiddate'] == 0) {
echo _('No receipts from this customer.') . '</td>
@@ -632,8 +634,8 @@
<td>' . $myrow[4] . '</td>
<td><a href=mailto:' . $myrow[6] . '>' . $myrow[6] . '</a></td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -673,8 +675,8 @@
<td>' . $myrow[3] . '</td>
<td>' . $myrow[2] . '</td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -714,8 +716,8 @@
<td>' . $myrow[3] . '</td>
<td>' . $myrow[2] . '</td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
Modified: trunk/SelectGLAccount.php
===================================================================
--- trunk/SelectGLAccount.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SelectGLAccount.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -34,9 +34,16 @@
$msg=_('Account name keywords have been used in preference to the account code extract entered');
}
if ($_POST['Keywords']=='' AND $_POST['GLCode']=='') {
- $msg=_('At least one Account Name keyword OR an extract of an Account Code must ...
[truncated message content] |
|
From: <vv...@us...> - 2012-04-12 07:43:35
|
Revision: 5239
http://web-erp.svn.sourceforge.net/web-erp/?rev=5239&view=rev
Author: vvs2012
Date: 2012-04-12 07:43:22 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/COGSGLPostings.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTrialBalance.php
trunk/Payments.php
trunk/PcExpenses.php
trunk/PcTabs.php
trunk/PrintCustTrans.php
trunk/SalesGLPostings.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/jelly/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/includes/OutputSerialItems.php
trunk/install/index.php
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/BankAccounts.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -299,9 +299,9 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
} //end while loop
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/COGSGLPostings.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -341,7 +341,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
} //end while loop
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLAccountCSV.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -35,10 +35,10 @@
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
if(isset($_POST['Account'][$i]) AND $myrow['accountcode'] == $_POST['Account'][$i]){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
$i++;
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
}
echo '</select></td>';
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLAccountInquiry.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -36,9 +36,9 @@
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
if($myrow['accountcode'] == $SelectedAccount){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
}
echo '</select></td></tr>';
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLBalanceSheet.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -579,7 +579,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false),
locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']));
$j++;
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLBudgets.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -49,7 +49,7 @@
prnMsg(_('No General ledger accounts have been set up yet') . ' - ' . _('budgets cannot be allocated until the GL accounts are set up'),'warn');
} else {
while ($myrow=DB_fetch_array($result)){
- $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8');
+ $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false);
if (isset($SelectedAccount) AND isset($LastCode) AND $SelectedAccount==$myrow['accountcode']){
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $Account . '</option>';
$PrevCode=$LastCode;
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLCodesInquiry.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -46,7 +46,7 @@
<td>%s</td>
</tr>',
$myrow['accountcode'],
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false));
} else {
$ActGrp = $myrow['group_'];
printf('<td><b>%s</b></td>
@@ -55,7 +55,7 @@
</tr>',
$myrow['group_'],
$myrow['accountcode'],
- htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false));
}
}
//end of while loop
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLJournal.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -331,9 +331,9 @@
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8') .'</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false) .'</option>';
}
}
echo '</select></td>';
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLProfit_Loss.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -926,7 +926,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
@@ -941,7 +941,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLTagProfit_Loss.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -769,7 +769,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
} else {
printf('<td>%s</td>
@@ -777,7 +777,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
}
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/GLTrialBalance.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -623,7 +623,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8', false),
locale_number_format($myrow['monthactual'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['monthbudget'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/Payments.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -1010,9 +1010,9 @@
echo '<option value=""></option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['GLCode']) AND $_POST['GLCode']==$myrow['accountcode']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8') . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . '</option>';
}
}
echo '</select></td></tr>';
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PcExpenses.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -311,7 +311,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PcTabs.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -434,7 +434,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
@@ -456,7 +456,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/PrintCustTrans.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -924,7 +924,7 @@
$PageNumber++;
echo '</table>
<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
@@ -973,7 +973,7 @@
/* head up a new invoice/credit note page */
$PageNumber++;
echo '<table class="table1">
- <tr><td valign=top><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
+ <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#BBBBBB">';
if ($InvOrCredit=='Invoice') {
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SalesGLPostings.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -390,7 +390,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
@@ -406,7 +406,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} //end while loop
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SelectCustomer.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -52,7 +52,7 @@
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -204,7 +204,7 @@
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $db, $ErrMsg);
if ($myrow = DB_fetch_array($result)) {
- $CustomerName = $myrow['name'];
+ $CustomerName = htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false);
$PhoneNo = $myrow['phoneno'];
}
unset($result);
@@ -214,22 +214,22 @@
echo '<table cellpadding="4" width="90%" class="selection">
<tr>
- <th width="33%">' . _('Customer Inquiries') . '</th>
- <th width="33%">' . _('Customer Transactions') . '</th>
- <th width="33%">' . _('Customer Maintenance') . '</th>
+ <th style="width:33%">' . _('Customer Inquiries') . '</th>
+ <th style="width:33%">' . _('Customer Transactions') . '</th>
+ <th style="width:33%">' . _('Customer Maintenance') . '</th>
</tr>';
- echo '<tr><td valign=top class="select">';
+ echo '<tr><td valign="top" class="select">';
/* Customer Inquiry Options */
echo '<a href="' . $rootpath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Transaction Inquiries') . '</a><br />';
- echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
- echo '<a href="' . $rootpath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
+ echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
wikiLink('Customer', $_SESSION['CustomerID']);
- echo '</td><td valign=top class="select">';
+ echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
- echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
- echo '</td><td valign=top class="select">';
+ echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerBranches.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Add/Modify/Delete Customer Branches') . '</a><br />';
@@ -241,9 +241,9 @@
} else {
echo '<table width="90%">
<tr>
- <th width="33%">' . _('Customer Inquiries') . '</th>
- <th width="33%">' . _('Customer Transactions') . '</th>
- <th width="33%">' . _('Customer Maintenance') . '</th>
+ <th style="width:33%">' . _('Customer Inquiries') . '</th>
+ <th style="width:33%">' . _('Customer Transactions') . '</th>
+ <th style="width:33%">' . _('Customer Maintenance') . '</th>
</tr>';
echo '<tr>
<td class="select"></td>
@@ -255,6 +255,7 @@
echo '</td></tr></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'] . '" />';
if (mb_strlen($msg)>1){
prnMsg($msg,'info');
@@ -268,7 +269,7 @@
echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
}
echo '</td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Code') . ':</td>
+ <td><b>' . _('OR') . '</b></td><td>' . _('Enter a partial Code') . ':</td>
<td>';
if (isset($_POST['CustCode'])) {
echo '<input type="text" name="CustCode" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
@@ -278,7 +279,7 @@
echo '</td>
</tr>
<tr>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Enter a partial Phone Number') . ':</td>
<td>';
if (isset($_POST['CustPhone'])) {
@@ -287,7 +288,7 @@
echo '<input type="text" name="CustPhone" size="15" maxlength="18" />';
}
echo '</td>';
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>
+echo '<td><b>' . _('OR') . '</b></td>
<td>' . _('Enter part of the Address') . ':</td>
<td>';
if (isset($_POST['CustAdd'])) {
@@ -297,7 +298,7 @@
}
echo '</td></tr>';
echo '<tr>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><b>' . _('OR') . '</b></td>
<td>' . _('Choose a Type') . ':</td>
<td>';
if (isset($_POST['CustType'])) {
@@ -343,7 +344,7 @@
}
/* Option to select a sales area */
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>
+echo '<td><b>' . _('OR') . '</b></td>
<td>' . _('Choose an Area') . ':</td><td>';
$result2 = DB_query("SELECT areacode, areadescription FROM areas", $db);
// Error if no sales areas setup
@@ -366,7 +367,7 @@
echo '</select></td></tr>';
}
-echo '</td></tr></table><br />';
+echo '</table><br />';
echo '<div class="centre">
<input type="submit" name="Search" value="' . _('Search Now') . '" />
<input type="submit" name="CSV" value="' . _('CSV Format') . '" />
@@ -391,7 +392,7 @@
}
echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
if ($ListPageMax > 1) {
- echo '<p><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset1">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
@@ -433,7 +434,6 @@
while ($myrow2 = DB_fetch_array($result)) {
fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . ',' . $myrow2['email'] . "\n");
}
- echo '</div>';
}
if (!isset($_POST['CSV'])) {
DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
@@ -447,16 +447,16 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
+ echo '<td><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8',false) . '" />
<input type="hidden" name="SelectedCustomer' . $i . '" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" />
- <td><font size="1">' . $myrow['name'] . '</font></td>
- <td><font size="1">' . $myrow['brname'] . '</font></td>
- <td><font size="1">' . $myrow['contactname'] . '</font></td>
- <td><font size="1">' . $myrow['typename'] . '</font></td>
- <td><font size="1">' . $myrow['phoneno'] . '</font></td>
- <td><font size="1">' . $myrow['faxno'] . '</font></td>
- <td><font size="1">' . $myrow['email'] . '</font></td>
+ <input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" /></td>
+ <td>' . htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false) . '</td>
+ <td>' . htmlspecialchars($myrow['brname'],ENT_QUOTES,'UTF-8',false) . '</td>
+ <td>' . $myrow['contactname'] . '</td>
+ <td>' . $myrow['typename'] . '</td>
+ <td>' . $myrow['phoneno'] . '</td>
+ <td>' . $myrow['faxno'] . '</td>
+ <td>' . $myrow['email'] . '</td>
</tr>';
$i++;
$j++;//row counter
@@ -475,7 +475,7 @@
//end if results to show
if (!isset($_POST['CSV'])) {
if (isset($ListPageMax) and $ListPageMax > 1) {
- echo '<p><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset2">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
@@ -490,10 +490,12 @@
<input type="submit" name="Go2" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
<input type="submit" name="Next" value="' . _('Next') . '" />';
+ echo '</div>';
}
//end if results to show
- echo '</div></form>';
}
+echo '</div>
+ </form>';
// Only display the geocode map if the integration is turned on, and there is a latitude/longitude to display
if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
@@ -505,7 +507,7 @@
<td colspan="2">
<table width="45%" cellpadding="4">
<tr>
- <th width="33%">' . _('Customer Mapping') . '</th>
+ <th style="width:33%">' . _('Customer Mapping') . '</th>
</tr>
</td>
<th valign="top">
@@ -556,7 +558,7 @@
$row = DB_fetch_array($Total1Result);
echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
- echo '<tr><th width="33%" colspan="3">' . _('Customer Data') . '</th></tr>';
+ echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Customer Data */
if ($myrow['lastpaiddate'] == 0) {
echo _('No receipts from this customer.') . '</td>
@@ -632,8 +634,8 @@
<td>' . $myrow[4] . '</td>
<td><a href=mailto:' . $myrow[6] . '>' . $myrow[6] . '</a></td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -673,8 +675,8 @@
<td>' . $myrow[3] . '</td>
<td>' . $myrow[2] . '</td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -714,8 +716,8 @@
<td>' . $myrow[3] . '</td>
<td>' . $myrow[2] . '</td>
<td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerTypeNotes.php?Id=' . $myrow[0] . '&DebtorType=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
Modified: trunk/SelectGLAccount.php
===================================================================
--- trunk/SelectGLAccount.php 2012-04-10 22:05:59 UTC (rev 5238)
+++ trunk/SelectGLAccount.php 2012-04-12 07:43:22 UTC (rev 5239)
@@ -34,9 +34,16 @@
$msg=_('Account name keywords have been used in preference to the account code extract entered');
}
if ($_POST['Keywords']=='' AND $_POST['GLCode']=='') {
- $msg=_('At least one Account Name keyword OR an extract of an Account Code must ...
[truncated message content] |
|
From: <te...@us...> - 2012-04-12 07:51:56
|
Revision: 5240
http://web-erp.svn.sourceforge.net/web-erp/?rev=5240&view=rev
Author: tehonu
Date: 2012-04-12 07:51:50 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ricard: Code simplified on TopItems.php
Modified Paths:
--------------
trunk/TopItems.php
trunk/doc/Change.log
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/TopItems.php 2012-04-12 07:51:50 UTC (rev 5240)
@@ -80,91 +80,33 @@
} else {
// everything below here to view NumberOfTopItems items sale on selected location
$FromDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d', -filter_number_format($_POST['NumberOfDays'])));
- //the situation if the location and customer type selected "All"
- if (($_POST['Location'] == 'All') and ($_POST['Customers'] == 'All')) {
-
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else { //the situation if only location type selected "All"
- if ($_POST['Location'] == 'All') {
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else {
- //the situation if the customer type selected "All"
- if ($_POST['Customers'] == 'All') {
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorders.fromstkloc = '" . $_POST['Location'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else {
- //the situation if the location and customer type not selected "All"
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorders.fromstkloc = '" . $_POST['Location'] . "'
- AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- }
- }
+
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
+ stockmaster.description,
+ stockmaster.units,
+ currencies.rate,
+ debtorsmaster.currcode,
+ stockmaster.decimalplaces
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
+ AND salesorderdetails.stkcode = stockmaster.stockid
+ AND salesorders.debtorno = debtorsmaster.debtorno
+ AND debtorsmaster.currcode = currencies.currabrev
+ AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'";
+
+ if ($_POST['Location'] != 'All') {
+ $SQL = $SQL . " AND salesorders.fromstkloc = '" . $_POST['Location'] . "'";
}
+
+ if ($_POST['Customers'] != 'All') {
+ $SQL = $SQL . " AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'";
+ }
+
+ $SQL = $SQL . " GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
$result = DB_query($SQL, $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/doc/Change.log 2012-04-12 07:51:50 UTC (rev 5240)
@@ -1,4 +1,5 @@
webERP Change Log
+11/4/2012 Ricard: Code simplified on TopItems.php
7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
3/4/2012 Vitaly: Cleaned up Petty Cash module. Fixed several errors in SQL INSERT statements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-12 07:52:01
|
Revision: 5240
http://web-erp.svn.sourceforge.net/web-erp/?rev=5240&view=rev
Author: tehonu
Date: 2012-04-12 07:51:50 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ricard: Code simplified on TopItems.php
Modified Paths:
--------------
trunk/TopItems.php
trunk/doc/Change.log
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/TopItems.php 2012-04-12 07:51:50 UTC (rev 5240)
@@ -80,91 +80,33 @@
} else {
// everything below here to view NumberOfTopItems items sale on selected location
$FromDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d', -filter_number_format($_POST['NumberOfDays'])));
- //the situation if the location and customer type selected "All"
- if (($_POST['Location'] == 'All') and ($_POST['Customers'] == 'All')) {
-
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else { //the situation if only location type selected "All"
- if ($_POST['Location'] == 'All') {
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else {
- //the situation if the customer type selected "All"
- if ($_POST['Customers'] == 'All') {
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorders.fromstkloc = '" . $_POST['Location'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- } else {
- //the situation if the location and customer type not selected "All"
- $SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
- stockmaster.description,
- stockmaster.units,
- currencies.rate,
- debtorsmaster.currcode,
- stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.currcode = currencies.currabrev
- AND salesorders.fromstkloc = '" . $_POST['Location'] . "'
- AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
- AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
- GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
- }
- }
+
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
+ stockmaster.description,
+ stockmaster.units,
+ currencies.rate,
+ debtorsmaster.currcode,
+ stockmaster.decimalplaces
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
+ AND salesorderdetails.stkcode = stockmaster.stockid
+ AND salesorders.debtorno = debtorsmaster.debtorno
+ AND debtorsmaster.currcode = currencies.currabrev
+ AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'";
+
+ if ($_POST['Location'] != 'All') {
+ $SQL = $SQL . " AND salesorders.fromstkloc = '" . $_POST['Location'] . "'";
}
+
+ if ($_POST['Customers'] != 'All') {
+ $SQL = $SQL . " AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'";
+ }
+
+ $SQL = $SQL . " GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
$result = DB_query($SQL, $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/doc/Change.log 2012-04-12 07:51:50 UTC (rev 5240)
@@ -1,4 +1,5 @@
webERP Change Log
+11/4/2012 Ricard: Code simplified on TopItems.php
7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
3/4/2012 Vitaly: Cleaned up Petty Cash module. Fixed several errors in SQL INSERT statements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-14 07:55:13
|
Revision: 5244
http://web-erp.svn.sourceforge.net/web-erp/?rev=5244&view=rev
Author: tehonu
Date: 2012-04-14 07:55:06 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Ricard: Adding stock category as filter for selection in TopItems.php
Modified Paths:
--------------
trunk/TopItems.php
trunk/doc/Change.log
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-04-14 02:23:19 UTC (rev 5243)
+++ trunk/TopItems.php 2012-04-14 07:55:06 UTC (rev 5244)
@@ -47,6 +47,34 @@
}
echo '</select></td>
</tr>';
+
+ // stock category selection
+ $SQL="SELECT categoryid,
+ categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription";
+ $result1 = DB_query($SQL,$db);
+
+ echo '<tr>
+ <td width="150">' . _('In Stock Category') . ' </td>
+ <td>:</td>
+ <td><select name="StockCat">';
+ if (!isset($_POST['StockCat'])){
+ $_POST['StockCat']='All';
+ }
+ if ($_POST['StockCat']=='All'){
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
+ } else {
+ echo '<option value="All">' . _('All') . '</option>';
+ }
+ while ($myrow1 = DB_fetch_array($result1)) {
+ if ($myrow1['categoryid']==$_POST['StockCat']){
+ echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ }
+ }
+
//view order by list to display
echo '<tr>
<td width="150">' . _('Select Order By ') . ' </td>
@@ -60,12 +88,12 @@
echo '<tr>
<td>' . _('Number Of Days') . ' </td>
<td>:</td>
- <td><input class="number" tabindex="3" type="text" name="NumberOfDays" size="8" maxlength="8" value="0" /></td>
+ <td><input class="number" tabindex="3" type="text" name="NumberOfDays" size="8" maxlength="8" value="30" /></td>
</tr>';
//view number of NumberOfTopItems items
echo '<tr>
<td>' . _('Number Of Top Items') . ' </td><td>:</td>
- <td><input class="number" tabindex="4" type="text" name="NumberOfTopItems" size="8" maxlength="8" value="1" /></td>
+ <td><input class="number" tabindex="4" type="text" name="NumberOfTopItems" size="8" maxlength="8" value="100" /></td>
</tr>
<tr>
<td></td>
@@ -104,6 +132,10 @@
$SQL = $SQL . " AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'";
}
+ if ($_POST['StockCat'] != 'All') {
+ $SQL = $SQL . " AND stockmaster.categoryid = '" . $_POST['StockCat'] . "'";
+ }
+
$SQL = $SQL . " GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST['Sequence'] . " DESC
LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-14 02:23:19 UTC (rev 5243)
+++ trunk/doc/Change.log 2012-04-14 07:55:06 UTC (rev 5244)
@@ -1,4 +1,5 @@
webERP Change Log
+14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
11/4/2012 Ricard: Code simplified on TopItems.php
7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-14 07:55:13
|
Revision: 5244
http://web-erp.svn.sourceforge.net/web-erp/?rev=5244&view=rev
Author: tehonu
Date: 2012-04-14 07:55:06 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Ricard: Adding stock category as filter for selection in TopItems.php
Modified Paths:
--------------
trunk/TopItems.php
trunk/doc/Change.log
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-04-14 02:23:19 UTC (rev 5243)
+++ trunk/TopItems.php 2012-04-14 07:55:06 UTC (rev 5244)
@@ -47,6 +47,34 @@
}
echo '</select></td>
</tr>';
+
+ // stock category selection
+ $SQL="SELECT categoryid,
+ categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription";
+ $result1 = DB_query($SQL,$db);
+
+ echo '<tr>
+ <td width="150">' . _('In Stock Category') . ' </td>
+ <td>:</td>
+ <td><select name="StockCat">';
+ if (!isset($_POST['StockCat'])){
+ $_POST['StockCat']='All';
+ }
+ if ($_POST['StockCat']=='All'){
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
+ } else {
+ echo '<option value="All">' . _('All') . '</option>';
+ }
+ while ($myrow1 = DB_fetch_array($result1)) {
+ if ($myrow1['categoryid']==$_POST['StockCat']){
+ echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ }
+ }
+
//view order by list to display
echo '<tr>
<td width="150">' . _('Select Order By ') . ' </td>
@@ -60,12 +88,12 @@
echo '<tr>
<td>' . _('Number Of Days') . ' </td>
<td>:</td>
- <td><input class="number" tabindex="3" type="text" name="NumberOfDays" size="8" maxlength="8" value="0" /></td>
+ <td><input class="number" tabindex="3" type="text" name="NumberOfDays" size="8" maxlength="8" value="30" /></td>
</tr>';
//view number of NumberOfTopItems items
echo '<tr>
<td>' . _('Number Of Top Items') . ' </td><td>:</td>
- <td><input class="number" tabindex="4" type="text" name="NumberOfTopItems" size="8" maxlength="8" value="1" /></td>
+ <td><input class="number" tabindex="4" type="text" name="NumberOfTopItems" size="8" maxlength="8" value="100" /></td>
</tr>
<tr>
<td></td>
@@ -104,6 +132,10 @@
$SQL = $SQL . " AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'";
}
+ if ($_POST['StockCat'] != 'All') {
+ $SQL = $SQL . " AND stockmaster.categoryid = '" . $_POST['StockCat'] . "'";
+ }
+
$SQL = $SQL . " GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST['Sequence'] . " DESC
LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-14 02:23:19 UTC (rev 5243)
+++ trunk/doc/Change.log 2012-04-14 07:55:06 UTC (rev 5244)
@@ -1,4 +1,5 @@
webERP Change Log
+14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
11/4/2012 Ricard: Code simplified on TopItems.php
7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 @@
ec...
[truncated message content] |
|
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 @@
ec...
[truncated message content] |
|
From: <te...@us...> - 2012-04-16 01:59:10
|
Revision: 5246
http://web-erp.svn.sourceforge.net/web-erp/?rev=5246&view=rev
Author: tehonu
Date: 2012-04-16 01:59:04 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
Modified Paths:
--------------
trunk/ReorderLevelLocation.php
trunk/doc/Change.log
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-04-15 23:54:56 UTC (rev 5245)
+++ trunk/ReorderLevelLocation.php 2012-04-16 01:59:04 UTC (rev 5246)
@@ -44,6 +44,7 @@
ON locstock.stockid = stockmaster.stockid
WHERE stockmaster.categoryid = '" . $_POST['StockCat'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'
+ AND stockmaster.discontinued = 0
ORDER BY '" . $Sequence . "' ASC";
$result = DB_query($sql,$db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-15 23:54:56 UTC (rev 5245)
+++ trunk/doc/Change.log 2012-04-16 01:59:04 UTC (rev 5246)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
11/4/2012 Ricard: Code simplified on TopItems.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-16 01:59:10
|
Revision: 5246
http://web-erp.svn.sourceforge.net/web-erp/?rev=5246&view=rev
Author: tehonu
Date: 2012-04-16 01:59:04 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
Modified Paths:
--------------
trunk/ReorderLevelLocation.php
trunk/doc/Change.log
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-04-15 23:54:56 UTC (rev 5245)
+++ trunk/ReorderLevelLocation.php 2012-04-16 01:59:04 UTC (rev 5246)
@@ -44,6 +44,7 @@
ON locstock.stockid = stockmaster.stockid
WHERE stockmaster.categoryid = '" . $_POST['StockCat'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'
+ AND stockmaster.discontinued = 0
ORDER BY '" . $Sequence . "' ASC";
$result = DB_query($sql,$db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-15 23:54:56 UTC (rev 5245)
+++ trunk/doc/Change.log 2012-04-16 01:59:04 UTC (rev 5246)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
11/4/2012 Ricard: Code simplified on TopItems.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-16 18:03:30
|
Revision: 5249
http://web-erp.svn.sourceforge.net/web-erp/?rev=5249&view=rev
Author: vvs2012
Date: 2012-04-16 18:03:24 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Fixed Days textbox where it did not remember entered value.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-04-16 09:52:31 UTC (rev 5248)
+++ trunk/PcAuthorizeExpenses.php 2012-04-16 18:03:24 UTC (rev 5249)
@@ -261,8 +261,6 @@
}
echo '<input type="hidden" name="SelectedIndex" value="' . $myrow['counterindex']. '" />';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="Days" value="' .$Days. '" />';
echo '</td></tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-16 09:52:31 UTC (rev 5248)
+++ trunk/doc/Change.log 2012-04-16 18:03:24 UTC (rev 5249)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-16 18:03:35
|
Revision: 5249
http://web-erp.svn.sourceforge.net/web-erp/?rev=5249&view=rev
Author: vvs2012
Date: 2012-04-16 18:03:24 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Fixed Days textbox where it did not remember entered value.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-04-16 09:52:31 UTC (rev 5248)
+++ trunk/PcAuthorizeExpenses.php 2012-04-16 18:03:24 UTC (rev 5249)
@@ -261,8 +261,6 @@
}
echo '<input type="hidden" name="SelectedIndex" value="' . $myrow['counterindex']. '" />';
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
- echo '<input type="hidden" name="Days" value="' .$Days. '" />';
echo '</td></tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-16 09:52:31 UTC (rev 5248)
+++ trunk/doc/Change.log 2012-04-16 18:03:24 UTC (rev 5249)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-16 21:09:41
|
Revision: 5250
http://web-erp.svn.sourceforge.net/web-erp/?rev=5250&view=rev
Author: vvs2012
Date: 2012-04-16 21:09:34 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Added option to display only items that are currently on purchase order in StockLocStatus.php
Modified Paths:
--------------
trunk/StockLocStatus.php
trunk/doc/Change.log
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/StockLocStatus.php 2012-04-16 21:09:34 UTC (rev 5250)
@@ -86,16 +86,24 @@
}
if ($_POST['BelowReorderQuantity']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
} else if ($_POST['BelowReorderQuantity']=='Below') {
echo '<option value="All">' . _('All') . '</option>
- <option selected="selected" value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option selected="selected" value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else if ($_POST['BelowReorderQuantity']=='OnOrder') {
+ echo '<option value="All">' . _('All') . '</option>
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option selected="selected" value="OnOrder">' . _('Only items currently on order') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
}
echo '</td>
@@ -242,13 +250,14 @@
$QOORow = DB_fetch_row($QOOResult);
$QOO = $QOORow[0];
} else {
- $QOOQty = 0;
+ $QOO = 0;
}
if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<0)
- OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'){
+ OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'
+ OR ($_POST['BelowReorderQuantity']=='OnOrder' AND $QOO != 0)){
- if (($_POST['BelowReorderQuantity']=='NotZero') and (($myrow['quantity']-$DemandQty)!=0)) {
+ if (($_POST['BelowReorderQuantity']=='NotZero') AND (($myrow['quantity']-$DemandQty)>0)) {
if ($k==1){
echo '<tr class="OddTableRows">';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/doc/Change.log 2012-04-16 21:09:34 UTC (rev 5250)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-16 21:09:41
|
Revision: 5250
http://web-erp.svn.sourceforge.net/web-erp/?rev=5250&view=rev
Author: vvs2012
Date: 2012-04-16 21:09:34 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Added option to display only items that are currently on purchase order in StockLocStatus.php
Modified Paths:
--------------
trunk/StockLocStatus.php
trunk/doc/Change.log
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/StockLocStatus.php 2012-04-16 21:09:34 UTC (rev 5250)
@@ -86,16 +86,24 @@
}
if ($_POST['BelowReorderQuantity']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
} else if ($_POST['BelowReorderQuantity']=='Below') {
echo '<option value="All">' . _('All') . '</option>
- <option selected="selected" value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option selected="selected" value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else if ($_POST['BelowReorderQuantity']=='OnOrder') {
+ echo '<option value="All">' . _('All') . '</option>
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option selected="selected" value="OnOrder">' . _('Only items currently on order') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
- <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>';
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
}
echo '</td>
@@ -242,13 +250,14 @@
$QOORow = DB_fetch_row($QOOResult);
$QOO = $QOORow[0];
} else {
- $QOOQty = 0;
+ $QOO = 0;
}
if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<0)
- OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'){
+ OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'
+ OR ($_POST['BelowReorderQuantity']=='OnOrder' AND $QOO != 0)){
- if (($_POST['BelowReorderQuantity']=='NotZero') and (($myrow['quantity']-$DemandQty)!=0)) {
+ if (($_POST['BelowReorderQuantity']=='NotZero') AND (($myrow['quantity']-$DemandQty)>0)) {
if ($k==1){
echo '<tr class="OddTableRows">';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/doc/Change.log 2012-04-16 21:09:34 UTC (rev 5250)
@@ -1,4 +1,5 @@
webERP Change Log
+16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-16 21:38:11
|
Revision: 5251
http://web-erp.svn.sourceforge.net/web-erp/?rev=5251&view=rev
Author: vvs2012
Date: 2012-04-16 21:38:05 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockCounts.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -10,6 +10,7 @@
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'] . '" />';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
@@ -28,9 +29,9 @@
echo '<table class="selection"><tr>';
if ($_GET['Action']=='View'){
- echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
+ echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
} else {
- echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
+ echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
}
echo '</tr></table><br />';
@@ -87,9 +88,9 @@
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['Location']) and $myrow['loccode']==$_POST['Location']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
echo '</select></th></tr>';
@@ -112,7 +113,7 @@
//END OF action=ENTER
} elseif ($_GET['Action']=='View'){
- if (isset($_POST['DEL']) && is_array($_POST['DEL']) ){
+ if (isset($_POST['DEL']) AND is_array($_POST['DEL']) ){
foreach ($_POST['DEL'] as $id=>$val){
if ($val == 'on'){
$sql = "DELETE FROM stockcounts WHERE id='".$id."'";
@@ -126,7 +127,7 @@
//START OF action=VIEW
$SQL = "select * from stockcounts";
$result = DB_query($SQL, $db);
- echo '<input type="hidden" name=Action value="View" />';
+ echo '<input type="hidden" name="Action" value="View" />';
echo '<table cellpadding="2" class="selection">';
echo "<tr>
<th>" . _('Stock Code') . "</th>
@@ -149,7 +150,8 @@
//END OF action=VIEW
}
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockDispatch.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -228,10 +228,10 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
$DefaultLocation = $myrow['defaultlocation'];
- echo '<br/>
- <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>
+ <br />';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
FROM locations";
@@ -242,7 +242,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Dispatch Percent') . ':</td>
- <td><input type ="text" name="Percent" class="number" size="8" value="0" />
+ <td><input type ="text" name="Percent" class="number" size="8" value="0" /></td>
</tr>';
echo '<tr>
<td>' . _('From Stock Location') . ':</td>
@@ -276,11 +276,11 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
if (DB_num_rows($result1)==0){
- echo '</table></td></tr>
- </table>
- <p>';
+ echo '</table>';
prnMsg(_('There are no stock categories currently defined please use the link below to set them up'),'warn');
echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ echo '</div>
+ </form>';
include ('includes/footer.inc');
exit;
}
@@ -308,24 +308,26 @@
}
echo '</select></td></tr>';
- echo '<tr></tr><tr></tr><tr><td>' . _('Report Type') . ':</td>';
+ echo '<tr><td>' . _('Report Type') . ':</td>';
echo '<td><select name="ReportType">';
echo '<option selected="selected" value="Batch">' . _('Create Batch') . '</option>';
echo '<option value="Report">' . _('Report Only') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
echo '<tr><td>' . _('Template') . ':</td>';
echo '<td><select name="template">';
echo '<option selected="selected" value="standard">' . _('Standard') . '</option>';
echo '<option value="simple">' . _('Simple') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </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/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocMovements.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -8,6 +8,7 @@
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'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') .
@@ -113,7 +114,7 @@
$DisplayTranDate = ConvertSQLDate($myrow['trandate']);
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?StockID=%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?StockID=%s">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -146,7 +147,8 @@
//end of while loop
echo '</table>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocStatus.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -16,6 +16,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'] . '" />';
$sql = "SELECT loccode,
@@ -106,8 +107,7 @@
<option value="OnOrder">' . _('Only items currently on order') . '</option>';
}
-echo '</td>
- </tr>
+echo '</select></td></tr>
</table>';
echo '<br />
@@ -326,8 +326,9 @@
//end of while loop
echo '</table>';
- echo '</form>';
} /* Show status button hit */
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocTransfer.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -244,11 +244,12 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" 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>
- <th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><font size="3" color="blue">'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</font></th>
+ <th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><h3>'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</h3></th>
</tr>';
$sql = "SELECT loccode, locationname FROM locations";
@@ -362,8 +363,9 @@
echo '<script type="text/javascript">defaultControl(document.forms[0].StockID0);</script>';
- echo '</form>
- </div>';
+ echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
}
?>
\ No newline at end of file
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocTransferReceive.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -372,7 +372,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if(DB_num_rows($result) == 0){
- echo '</table></form><H3>' . _('Transfer') . ' #' . $_GET['Trf_ID'] . ' '. _('Does Not Exist') . '</H3><hr />';
+ echo '<h3>' . _('Transfer') . ' #' . $_GET['Trf_ID'] . ' '. _('Does Not Exist') . '</h3><br />';
include('includes/footer.inc');
exit;
}
@@ -411,6 +411,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
'" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?'. SID . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
prnMsg(_('Please Verify Shipment Quantities Received'),'info');
@@ -420,7 +421,7 @@
echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="7"><font size="3" color="blue">' . _('Location Transfer Reference'). ' #' . $_SESSION['Transfer']->TrfID . ' '. _('from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . '</font></th>
+ <th colspan="7"><h3>' . _('Location Transfer Reference'). ' #' . $_SESSION['Transfer']->TrfID . ' '. _('from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . '</h3></th>
</tr>';
$tableheader = '<tr>
@@ -468,7 +469,7 @@
if ($TrfLine->Controlled==1){
echo '<td class="number"><input type="hidden" name="Qty' . $i . '" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /><a href="' . $rootpath .'/StockTransferControlled.php?TransferItem=' . $i . '" />' . $Qty . '</a></td>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . $i . '" maxlength="10" class="number" size="auto" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /></td>';
+ echo '<td><input type="text" class="number" name="Qty' . $i . '" maxlength="10" size="auto" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /></td>';
}
echo '<td>' . $TrfLine->PartUnit . '</td>';
@@ -495,6 +496,7 @@
<input type="submit" name="ProcessTransfer" value="'. _('Process Inventory Transfer'). '" />
<br />
</div>
+ </div>
</form>';
echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?NewTransfer=true">'. _('Select A Different Transfer').'</a>';
@@ -502,7 +504,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
- 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'] . '" />';
$LocResult = DB_query("SELECT locationname, loccode FROM locations",$db);
@@ -526,7 +529,7 @@
<input type="submit" name="RefreshTransferList" value="' . _('Refresh Transfer List') . '" /></td>
</tr>
</table>
- <p />';
+ <br />';
$sql = "SELECT DISTINCT reference,
locations.locationname as trffromloc,
@@ -542,7 +545,7 @@
$LocResult = DB_query($LocSql,$db);
$LocRow = DB_fetch_array($LocResult);
echo '<table class="selection">';
- echo '<tr><th colspan="4"><font size="3" color="blue">'._('Pending Transfers Into').' '.$LocRow['locationname'].'</font></th></tr>';
+ echo '<tr><th colspan="4"><h3>'._('Pending Transfers Into').' '.$LocRow['locationname'].'</h3></th></tr>';
echo '<tr>
<th>'. _('Transfer Ref'). '</th>
<th>'. _('Transfer From'). '</th>
@@ -567,7 +570,8 @@
} else if (!isset($_POST['ProcessTransfer'])) {
prnMsg(_('There are no incoming transfers to this location'), 'info');
}
- 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.
|
|
From: <vv...@us...> - 2012-04-16 21:38:11
|
Revision: 5251
http://web-erp.svn.sourceforge.net/web-erp/?rev=5251&view=rev
Author: vvs2012
Date: 2012-04-16 21:38:05 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockCounts.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -10,6 +10,7 @@
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'] . '" />';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
@@ -28,9 +29,9 @@
echo '<table class="selection"><tr>';
if ($_GET['Action']=='View'){
- echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
+ echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
} else {
- echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
+ echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
}
echo '</tr></table><br />';
@@ -87,9 +88,9 @@
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['Location']) and $myrow['loccode']==$_POST['Location']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
echo '</select></th></tr>';
@@ -112,7 +113,7 @@
//END OF action=ENTER
} elseif ($_GET['Action']=='View'){
- if (isset($_POST['DEL']) && is_array($_POST['DEL']) ){
+ if (isset($_POST['DEL']) AND is_array($_POST['DEL']) ){
foreach ($_POST['DEL'] as $id=>$val){
if ($val == 'on'){
$sql = "DELETE FROM stockcounts WHERE id='".$id."'";
@@ -126,7 +127,7 @@
//START OF action=VIEW
$SQL = "select * from stockcounts";
$result = DB_query($SQL, $db);
- echo '<input type="hidden" name=Action value="View" />';
+ echo '<input type="hidden" name="Action" value="View" />';
echo '<table cellpadding="2" class="selection">';
echo "<tr>
<th>" . _('Stock Code') . "</th>
@@ -149,7 +150,8 @@
//END OF action=VIEW
}
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockDispatch.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -228,10 +228,10 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
$DefaultLocation = $myrow['defaultlocation'];
- echo '<br/>
- <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>
+ <br />';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT loccode,
locationname
FROM locations";
@@ -242,7 +242,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Dispatch Percent') . ':</td>
- <td><input type ="text" name="Percent" class="number" size="8" value="0" />
+ <td><input type ="text" name="Percent" class="number" size="8" value="0" /></td>
</tr>';
echo '<tr>
<td>' . _('From Stock Location') . ':</td>
@@ -276,11 +276,11 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
if (DB_num_rows($result1)==0){
- echo '</table></td></tr>
- </table>
- <p>';
+ echo '</table>';
prnMsg(_('There are no stock categories currently defined please use the link below to set them up'),'warn');
echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ echo '</div>
+ </form>';
include ('includes/footer.inc');
exit;
}
@@ -308,24 +308,26 @@
}
echo '</select></td></tr>';
- echo '<tr></tr><tr></tr><tr><td>' . _('Report Type') . ':</td>';
+ echo '<tr><td>' . _('Report Type') . ':</td>';
echo '<td><select name="ReportType">';
echo '<option selected="selected" value="Batch">' . _('Create Batch') . '</option>';
echo '<option value="Report">' . _('Report Only') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </td></tr>';
echo '<tr><td>' . _('Template') . ':</td>';
echo '<td><select name="template">';
echo '<option selected="selected" value="standard">' . _('Standard') . '</option>';
echo '<option value="simple">' . _('Simple') . '</option>';
- echo '</select></td><td> </td></tr>';
+ echo '</select></td><td> </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/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocMovements.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -8,6 +8,7 @@
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'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') .
@@ -113,7 +114,7 @@
$DisplayTranDate = ConvertSQLDate($myrow['trandate']);
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?StockID=%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?StockID=%s">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -146,7 +147,8 @@
//end of while loop
echo '</table>';
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocStatus.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -16,6 +16,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'] . '" />';
$sql = "SELECT loccode,
@@ -106,8 +107,7 @@
<option value="OnOrder">' . _('Only items currently on order') . '</option>';
}
-echo '</td>
- </tr>
+echo '</select></td></tr>
</table>';
echo '<br />
@@ -326,8 +326,9 @@
//end of while loop
echo '</table>';
- echo '</form>';
} /* Show status button hit */
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocTransfer.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -244,11 +244,12 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" 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>
- <th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><font size="3" color="blue">'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</font></th>
+ <th colspan="4"><input type="hidden" name="Trf_ID" value="' . $Trf_ID . '" /><h3>'. _('Inventory Location Transfer Shipment Reference').' # '. $Trf_ID. '</h3></th>
</tr>';
$sql = "SELECT loccode, locationname FROM locations";
@@ -362,8 +363,9 @@
echo '<script type="text/javascript">defaultControl(document.forms[0].StockID0);</script>';
- echo '</form>
- </div>';
+ echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
}
?>
\ No newline at end of file
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2012-04-16 21:09:34 UTC (rev 5250)
+++ trunk/StockLocTransferReceive.php 2012-04-16 21:38:05 UTC (rev 5251)
@@ -372,7 +372,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if(DB_num_rows($result) == 0){
- echo '</table></form><H3>' . _('Transfer') . ' #' . $_GET['Trf_ID'] . ' '. _('Does Not Exist') . '</H3><hr />';
+ echo '<h3>' . _('Transfer') . ' #' . $_GET['Trf_ID'] . ' '. _('Does Not Exist') . '</h3><br />';
include('includes/footer.inc');
exit;
}
@@ -411,6 +411,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
'" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?'. SID . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
prnMsg(_('Please Verify Shipment Quantities Received'),'info');
@@ -420,7 +421,7 @@
echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="7"><font size="3" color="blue">' . _('Location Transfer Reference'). ' #' . $_SESSION['Transfer']->TrfID . ' '. _('from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . '</font></th>
+ <th colspan="7"><h3>' . _('Location Transfer Reference'). ' #' . $_SESSION['Transfer']->TrfID . ' '. _('from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . '</h3></th>
</tr>';
$tableheader = '<tr>
@@ -468,7 +469,7 @@
if ($TrfLine->Controlled==1){
echo '<td class="number"><input type="hidden" name="Qty' . $i . '" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /><a href="' . $rootpath .'/StockTransferControlled.php?TransferItem=' . $i . '" />' . $Qty . '</a></td>';
} else {
- echo '<td><input type="text" class="number" name="Qty' . $i . '" maxlength="10" class="number" size="auto" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /></td>';
+ echo '<td><input type="text" class="number" name="Qty' . $i . '" maxlength="10" size="auto" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /></td>';
}
echo '<td>' . $TrfLine->PartUnit . '</td>';
@@ -495,6 +496,7 @@
<input type="submit" name="ProcessTransfer" value="'. _('Process Inventory Transfer'). '" />
<br />
</div>
+ </div>
</form>';
echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?NewTransfer=true">'. _('Select A Different Transfer').'</a>';
@@ -502,7 +504,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
- 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'] . '" />';
$LocResult = DB_query("SELECT locationname, loccode FROM locations",$db);
@@ -526,7 +529,7 @@
<input type="submit" name="RefreshTransferList" value="' . _('Refresh Transfer List') . '" /></td>
</tr>
</table>
- <p />';
+ <br />';
$sql = "SELECT DISTINCT reference,
locations.locationname as trffromloc,
@@ -542,7 +545,7 @@
$LocResult = DB_query($LocSql,$db);
$LocRow = DB_fetch_array($LocResult);
echo '<table class="selection">';
- echo '<tr><th colspan="4"><font size="3" color="blue">'._('Pending Transfers Into').' '.$LocRow['locationname'].'</font></th></tr>';
+ echo '<tr><th colspan="4"><h3>'._('Pending Transfers Into').' '.$LocRow['locationname'].'</h3></th></tr>';
echo '<tr>
<th>'. _('Transfer Ref'). '</th>
<th>'. _('Transfer From'). '</th>
@@ -567,7 +570,8 @@
} else if (!isset($_POST['ProcessTransfer'])) {
prnMsg(_('There are no incoming transfers to this location'), 'info');
}
- 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.
|
|
From: <vv...@us...> - 2012-04-17 21:56:51
|
Revision: 5259
http://web-erp.svn.sourceforge.net/web-erp/?rev=5259&view=rev
Author: vvs2012
Date: 2012-04-17 21:56:45 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectSupplier.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-17 12:27:33 UTC (rev 5258)
+++ trunk/SelectCustomer.php 2012-04-17 21:56:45 UTC (rev 5259)
@@ -556,7 +556,6 @@
AND type !=12";
$Total1Result = DB_query($SQL, $db);
$row = DB_fetch_array($Total1Result);
- echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Customer Data */
@@ -597,19 +596,16 @@
<td class="select"><b>' . $CustomerTypeName . '</b></td>
<td class="select"></td>
</tr>';
- echo '</th>
- </tr>
- </table>';
+ echo '</table>';
}
// Customer Contacts
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM custcontacts
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY contid";
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
- echo '<table width="45%">';
- echo '<br /><th colspan="7"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</th>';
+ echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
+ echo '<br /><table width="45%">';
echo '<tr>
<th>' . _('Name') . '</th>
<th>' . _('Role') . '</th>
@@ -632,7 +628,7 @@
echo '<td>' . $myrow[2] . '</td>
<td>' . $myrow[3] . '</td>
<td>' . $myrow[4] . '</td>
- <td><a href=mailto:' . $myrow[6] . '>' . $myrow[6] . '</a></td>
+ <td><a href="mailto:' . $myrow[6] . '">' . $myrow[6] . '</a></td>
<td>' . $myrow[5] . '</td>
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
@@ -645,7 +641,6 @@
}
}
// Customer Notes
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM custnotes
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY date DESC";
@@ -686,7 +681,6 @@
}
}
// Custome Type Notes
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM debtortypenotes
WHERE typeid='" . $CustomerType . "'
ORDER BY date DESC";
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-04-17 12:27:33 UTC (rev 5258)
+++ trunk/SelectSupplier.php 2012-04-17 21:56:45 UTC (rev 5259)
@@ -350,7 +350,6 @@
$Total1Result = DB_query($SQL, $db);
$row = DB_fetch_array($Total1Result);
echo '<br />';
- echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
echo '<tr><th style="width:33%" colspan="2">' . _('Supplier Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Supplier Data */
@@ -375,9 +374,7 @@
<td valign="top" class="select">'._('Total Spend with this Supplier:') . '</td>
<td valign="top" class="select"> <b>' . locale_number_format($row['total'], $myrow['currdecimalplaces']) . '</b></td>
</tr>';
- echo '</th>
- </tr>
- </table>';
+ echo '</table>';
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-17 21:56:51
|
Revision: 5259
http://web-erp.svn.sourceforge.net/web-erp/?rev=5259&view=rev
Author: vvs2012
Date: 2012-04-17 21:56:45 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectSupplier.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-17 12:27:33 UTC (rev 5258)
+++ trunk/SelectCustomer.php 2012-04-17 21:56:45 UTC (rev 5259)
@@ -556,7 +556,6 @@
AND type !=12";
$Total1Result = DB_query($SQL, $db);
$row = DB_fetch_array($Total1Result);
- echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Customer Data */
@@ -597,19 +596,16 @@
<td class="select"><b>' . $CustomerTypeName . '</b></td>
<td class="select"></td>
</tr>';
- echo '</th>
- </tr>
- </table>';
+ echo '</table>';
}
// Customer Contacts
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM custcontacts
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY contid";
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
- echo '<table width="45%">';
- echo '<br /><th colspan="7"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</th>';
+ echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
+ echo '<br /><table width="45%">';
echo '<tr>
<th>' . _('Name') . '</th>
<th>' . _('Role') . '</th>
@@ -632,7 +628,7 @@
echo '<td>' . $myrow[2] . '</td>
<td>' . $myrow[3] . '</td>
<td>' . $myrow[4] . '</td>
- <td><a href=mailto:' . $myrow[6] . '>' . $myrow[6] . '</a></td>
+ <td><a href="mailto:' . $myrow[6] . '">' . $myrow[6] . '</a></td>
<td>' . $myrow[5] . '</td>
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
@@ -645,7 +641,6 @@
}
}
// Customer Notes
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM custnotes
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY date DESC";
@@ -686,7 +681,6 @@
}
}
// Custome Type Notes
- echo '<tr><td colspan="2">';
$sql = "SELECT * FROM debtortypenotes
WHERE typeid='" . $CustomerType . "'
ORDER BY date DESC";
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-04-17 12:27:33 UTC (rev 5258)
+++ trunk/SelectSupplier.php 2012-04-17 21:56:45 UTC (rev 5259)
@@ -350,7 +350,6 @@
$Total1Result = DB_query($SQL, $db);
$row = DB_fetch_array($Total1Result);
echo '<br />';
- echo '<tr><td colspan="2">';
echo '<table width="45%" cellpadding="4">';
echo '<tr><th style="width:33%" colspan="2">' . _('Supplier Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Supplier Data */
@@ -375,9 +374,7 @@
<td valign="top" class="select">'._('Total Spend with this Supplier:') . '</td>
<td valign="top" class="select"> <b>' . locale_number_format($row['total'], $myrow['currdecimalplaces']) . '</b></td>
</tr>';
- echo '</th>
- </tr>
- </table>';
+ echo '</table>';
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-18 22:10:03
|
Revision: 5263
http://web-erp.svn.sourceforge.net/web-erp/?rev=5263&view=rev
Author: vvs2012
Date: 2012-04-18 22:09:56 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/Stocks.php
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockMovements.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -19,6 +19,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['0'] . ' : ' . _('in units of') . ' : ' . $myrow[1] . '</b></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($_POST['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
@@ -120,7 +121,7 @@
if ($myrow['type']==10){ /*its a sales invoice allow link to show invoice it was sold on*/
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -146,7 +147,7 @@
} elseif ($myrow['type']==11){
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -199,11 +200,13 @@
echo '</table>';
echo '<div class="centre"><br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
-echo '<br /><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>';
+echo '<br /><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>';
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
-echo '</form></div>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/StockQties_csv.php
===================================================================
--- trunk/StockQties_csv.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQties_csv.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -11,7 +11,7 @@
return str_replace(',', '', $str);
}
-echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities');
+echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities') . '</div>';
$ErrMsg = _('The SQL to get the stock quantities failed with the message');
Modified: trunk/StockQuantityByDate.php
===================================================================
--- trunk/StockQuantityByDate.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQuantityByDate.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -12,6 +12,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'] . '" />';
$sql = "SELECT categoryid, categorydescription FROM stockcategory";
@@ -71,6 +72,7 @@
</div></td>
</tr>
</table>
+ </div>
</form>';
$TotalQuantity = 0;
@@ -138,17 +140,17 @@
}
if($NumRows == 0){
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
0);
} else {
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockReorderLevel.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -22,6 +22,7 @@
$myrow = DB_fetch_row($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'] . '" />';
$sql = "SELECT locstock.loccode,
@@ -46,7 +47,7 @@
<th colspan="3">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" /><input type="submit" name="Show" value="' . _('Show Re-Order Levels') . '" /></th>
</tr>';
echo '<tr>
- <th colspan="3"><font color="blue" size="3"><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</font></th>
+ <th colspan="3"><h3><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -84,8 +85,8 @@
printf('<td>%s</td>
<td class="number">%s</td>
- <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>
- <input type="hidden" name="Old_%s" value="%s" />',
+ <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" />
+ <input type="hidden" name="Old_%s" value="%s" /></td></tr>',
$myrow['locationname'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
$myrow['loccode'],
@@ -114,6 +115,7 @@
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockSerialItemResearch.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -23,12 +23,13 @@
echo '<div class="centre">
<br />
-<form name="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+<form id="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo _('Serial Number') .': <input ID="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+echo _('Serial Number') .': <input id="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+<br />
</div>
-<br />
</form>';
echo '<script type="text/javascript">
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/Stocks.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -110,7 +110,7 @@
}
if (ContainsIllegalCharacters($StockID) OR mb_strpos($StockID,' ')) {
$InputError = 1;
- prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
+ prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
$Errors[$i] = 'StockID';
$i++;
$StockID='';
@@ -714,12 +714,12 @@
}
-echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
- <table class="selection">
- <tr><td>'; // Nested table
+echo '<form id="ItemForm" enctype="multipart/form-data" 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="New" value="'.$New.'" />';
+echo '<table class="selection">';
if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
@@ -732,9 +732,8 @@
value="'.$StockID.'" name="StockID" size="21" maxlength="20" /></td></tr>';
} else {
echo '<tr><td>'. _('Item Code'). ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name ="StockID" value="'.$StockID.'" /></td>
</tr>';
- echo '<input type="hidden" name ="StockID" value="'.$StockID.'" />';
}
} elseif (!isset($_POST['UpdateCategories']) AND $InputError!=1) { // Must be modifying an existing item and no changes made yet
@@ -787,16 +786,14 @@
echo '<tr><td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
} else { // some changes were made to the data so don't re-set form variables to DB ie the code above
echo '<tr>
<td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
}
if (isset($_POST['Description'])) {
@@ -823,25 +820,24 @@
<td><input type="file" id="ItemPicture" name="ItemPicture" /></td>';
if (function_exists('imagecreatefromjpg')){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=64'.
- '&height=64'.
- '" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
} else {
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" alt="" />';
} else {
$StockImgLink = _('No Image');
}
}
if ($StockImgLink!=_('No Image')) {
- echo '</td>
- <td>' . _('Image') . '<br />'.$StockImgLink . '</td>
- </tr>';
+ echo '<td>' . _('Image') . '<br />'.$StockImgLink . '</td>';
}
+echo '</tr>';
echo '<tr>
<td>' . _('Category') . ':</td>
@@ -1026,7 +1022,7 @@
<td>' . _('Next Serial No (>0 for auto numbering)') . ':</td>
<td><input ' . (in_array('NextSerialNo',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="NextSerialNo" size="15" maxlength="15" value="' . $_POST['NextSerialNo'] . '" /></td></tr>';
} else {
- echo '<input type="hidden" name="NextSerialNo" value="0" />';
+ echo '<tr><td><input type="hidden" name="NextSerialNo" value="0" /></td></tr>';
}
echo '<tr>
@@ -1047,7 +1043,7 @@
echo '<tr>
<td>' . _('Decimal Places for display Quantity') . ':</td>
- <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /><td>
+ <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /></td>
</tr>';
if (isset($_POST['BarCode'])) {
@@ -1123,13 +1119,12 @@
$PropertyCounter = 0;
$PropertyWidth = array();
-echo '<br />
- <table class="selection">';
if (DB_num_rows($PropertiesResult)>0) {
+echo '<br />
+ <table class="selection">';
echo '<tr>
<th colspan="2">' . _('Item Category Properties') . '</th>
</tr>';
-}
while ($PropertyRow=DB_fetch_array($PropertiesResult)){
@@ -1144,19 +1139,20 @@
} else {
$PropertyValue = '';
}
- echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
- echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
-
- echo '<tr>
- <td>' . $PropertyRow['label'] . '</td>
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
+ echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
+ echo $PropertyRow['label'] . '</td>
+
<td>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
if ($PropertyRow['numericvalue']==1) {
- echo '<input type="textbox" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
+ echo '<input type="text" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
echo _('A number between') . ' ' . locale_number_format($PropertyRow['minimumvalue'],'Variable') . ' ' . _('and') . ' ' . locale_number_format($PropertyRow['maximumvalue'],'Variable') . ' ' . _('is expected');
} else {
- echo '<input type="textbox" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
+ echo '<input type="text" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
}
break;
case 1; //select box
@@ -1185,9 +1181,10 @@
} //end loop round properties for the item category
unset($StockID);
-echo '</table>
- <br />';
+echo '</table>';
+}
echo '<input type="hidden" name="PropertyCounter" value="' . $PropertyCounter . '" />';
+echo '<br />';
if ($New==1) {
echo '<input type="submit" name="submit" value="' . _('Insert New Item') . '" />';
@@ -1199,7 +1196,7 @@
echo '<input type="submit" name="submit" value="' . _('Update') . '" />';
echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '" />';
- echo '<p>';
+ echo '<br />';
prnMsg( _('Only click the Delete button if you are sure you wish to delete the item!') . _('Checks will be made to ensure that there are no stock movements, sales analysis records, sales order items or purchase order items for the item') . '. ' . _('No deletions will be allowed if they exist'), 'warn', _('WARNING'));
echo '<br />
<br />
@@ -1207,6 +1204,7 @@
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-18 22:10:03
|
Revision: 5263
http://web-erp.svn.sourceforge.net/web-erp/?rev=5263&view=rev
Author: vvs2012
Date: 2012-04-18 22:09:56 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/Stocks.php
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockMovements.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -19,6 +19,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['0'] . ' : ' . _('in units of') . ' : ' . $myrow[1] . '</b></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($_POST['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
@@ -120,7 +121,7 @@
if ($myrow['type']==10){ /*its a sales invoice allow link to show invoice it was sold on*/
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -146,7 +147,7 @@
} elseif ($myrow['type']==11){
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -199,11 +200,13 @@
echo '</table>';
echo '<div class="centre"><br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
-echo '<br /><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>';
+echo '<br /><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>';
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
-echo '</form></div>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/StockQties_csv.php
===================================================================
--- trunk/StockQties_csv.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQties_csv.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -11,7 +11,7 @@
return str_replace(',', '', $str);
}
-echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities');
+echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities') . '</div>';
$ErrMsg = _('The SQL to get the stock quantities failed with the message');
Modified: trunk/StockQuantityByDate.php
===================================================================
--- trunk/StockQuantityByDate.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQuantityByDate.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -12,6 +12,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'] . '" />';
$sql = "SELECT categoryid, categorydescription FROM stockcategory";
@@ -71,6 +72,7 @@
</div></td>
</tr>
</table>
+ </div>
</form>';
$TotalQuantity = 0;
@@ -138,17 +140,17 @@
}
if($NumRows == 0){
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
0);
} else {
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockReorderLevel.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -22,6 +22,7 @@
$myrow = DB_fetch_row($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'] . '" />';
$sql = "SELECT locstock.loccode,
@@ -46,7 +47,7 @@
<th colspan="3">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" /><input type="submit" name="Show" value="' . _('Show Re-Order Levels') . '" /></th>
</tr>';
echo '<tr>
- <th colspan="3"><font color="blue" size="3"><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</font></th>
+ <th colspan="3"><h3><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -84,8 +85,8 @@
printf('<td>%s</td>
<td class="number">%s</td>
- <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>
- <input type="hidden" name="Old_%s" value="%s" />',
+ <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" />
+ <input type="hidden" name="Old_%s" value="%s" /></td></tr>',
$myrow['locationname'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
$myrow['loccode'],
@@ -114,6 +115,7 @@
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockSerialItemResearch.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -23,12 +23,13 @@
echo '<div class="centre">
<br />
-<form name="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+<form id="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo _('Serial Number') .': <input ID="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+echo _('Serial Number') .': <input id="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+<br />
</div>
-<br />
</form>';
echo '<script type="text/javascript">
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/Stocks.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -110,7 +110,7 @@
}
if (ContainsIllegalCharacters($StockID) OR mb_strpos($StockID,' ')) {
$InputError = 1;
- prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
+ prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
$Errors[$i] = 'StockID';
$i++;
$StockID='';
@@ -714,12 +714,12 @@
}
-echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
- <table class="selection">
- <tr><td>'; // Nested table
+echo '<form id="ItemForm" enctype="multipart/form-data" 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="New" value="'.$New.'" />';
+echo '<table class="selection">';
if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
@@ -732,9 +732,8 @@
value="'.$StockID.'" name="StockID" size="21" maxlength="20" /></td></tr>';
} else {
echo '<tr><td>'. _('Item Code'). ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name ="StockID" value="'.$StockID.'" /></td>
</tr>';
- echo '<input type="hidden" name ="StockID" value="'.$StockID.'" />';
}
} elseif (!isset($_POST['UpdateCategories']) AND $InputError!=1) { // Must be modifying an existing item and no changes made yet
@@ -787,16 +786,14 @@
echo '<tr><td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
} else { // some changes were made to the data so don't re-set form variables to DB ie the code above
echo '<tr>
<td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
}
if (isset($_POST['Description'])) {
@@ -823,25 +820,24 @@
<td><input type="file" id="ItemPicture" name="ItemPicture" /></td>';
if (function_exists('imagecreatefromjpg')){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=64'.
- '&height=64'.
- '" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
} else {
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" alt="" />';
} else {
$StockImgLink = _('No Image');
}
}
if ($StockImgLink!=_('No Image')) {
- echo '</td>
- <td>' . _('Image') . '<br />'.$StockImgLink . '</td>
- </tr>';
+ echo '<td>' . _('Image') . '<br />'.$StockImgLink . '</td>';
}
+echo '</tr>';
echo '<tr>
<td>' . _('Category') . ':</td>
@@ -1026,7 +1022,7 @@
<td>' . _('Next Serial No (>0 for auto numbering)') . ':</td>
<td><input ' . (in_array('NextSerialNo',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="NextSerialNo" size="15" maxlength="15" value="' . $_POST['NextSerialNo'] . '" /></td></tr>';
} else {
- echo '<input type="hidden" name="NextSerialNo" value="0" />';
+ echo '<tr><td><input type="hidden" name="NextSerialNo" value="0" /></td></tr>';
}
echo '<tr>
@@ -1047,7 +1043,7 @@
echo '<tr>
<td>' . _('Decimal Places for display Quantity') . ':</td>
- <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /><td>
+ <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /></td>
</tr>';
if (isset($_POST['BarCode'])) {
@@ -1123,13 +1119,12 @@
$PropertyCounter = 0;
$PropertyWidth = array();
-echo '<br />
- <table class="selection">';
if (DB_num_rows($PropertiesResult)>0) {
+echo '<br />
+ <table class="selection">';
echo '<tr>
<th colspan="2">' . _('Item Category Properties') . '</th>
</tr>';
-}
while ($PropertyRow=DB_fetch_array($PropertiesResult)){
@@ -1144,19 +1139,20 @@
} else {
$PropertyValue = '';
}
- echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
- echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
-
- echo '<tr>
- <td>' . $PropertyRow['label'] . '</td>
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
+ echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
+ echo $PropertyRow['label'] . '</td>
+
<td>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
if ($PropertyRow['numericvalue']==1) {
- echo '<input type="textbox" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
+ echo '<input type="text" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
echo _('A number between') . ' ' . locale_number_format($PropertyRow['minimumvalue'],'Variable') . ' ' . _('and') . ' ' . locale_number_format($PropertyRow['maximumvalue'],'Variable') . ' ' . _('is expected');
} else {
- echo '<input type="textbox" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
+ echo '<input type="text" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
}
break;
case 1; //select box
@@ -1185,9 +1181,10 @@
} //end loop round properties for the item category
unset($StockID);
-echo '</table>
- <br />';
+echo '</table>';
+}
echo '<input type="hidden" name="PropertyCounter" value="' . $PropertyCounter . '" />';
+echo '<br />';
if ($New==1) {
echo '<input type="submit" name="submit" value="' . _('Insert New Item') . '" />';
@@ -1199,7 +1196,7 @@
echo '<input type="submit" name="submit" value="' . _('Update') . '" />';
echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '" />';
- echo '<p>';
+ echo '<br />';
prnMsg( _('Only click the Delete button if you are sure you wish to delete the item!') . _('Checks will be made to ensure that there are no stock movements, sales analysis records, sales order items or purchase order items for the item') . '. ' . _('No deletions will be allowed if they exist'), 'warn', _('WARNING'));
echo '<br />
<br />
@@ -1207,6 +1204,7 @@
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-04-21 20:21:39
|
Revision: 5268
http://web-erp.svn.sourceforge.net/web-erp/?rev=5268&view=rev
Author: vvs2012
Date: 2012-04-21 20:21:33 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Editable item description in PO
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-04-20 08:49:59 UTC (rev 5267)
+++ trunk/PO_Items.php 2012-04-21 20:21:33 UTC (rev 5268)
@@ -48,6 +48,7 @@
$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Price=filter_number_format($_POST['SuppPrice'.$POLine->LineNo])/$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor;
}
$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ReqDelDate=$_POST['ReqDelDate'.$POLine->LineNo];
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ItemDescription =$_POST['ItemDescription'.$POLine->LineNo];
}
}
}
@@ -371,7 +372,7 @@
AND ($_SESSION['PO'.$identifier]->Status=='Authorised'
OR $_SESSION['PO'.$identifier]->Status=='Printed')){
- echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>';
+ echo '<br /><div class="centre"><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a></div>';
}
} /*end of if its a new order or an existing one */
@@ -695,7 +696,7 @@
}
echo '<td>' . $POLine->StockID . '</td>
- <td>' . $POLine->ItemDescription . '</td>
+ <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="80" value="' .$POLine->ItemDescription .'" /></td>
<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-20 08:49:59 UTC (rev 5267)
+++ trunk/doc/Change.log 2012-04-21 20:21:33 UTC (rev 5268)
@@ -1,4 +1,5 @@
webERP Change Log
+21/04/2012 Vitaly: Editable item description in PO.
16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|