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" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="2" class="selection"> @@ -28,7 +29,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> @@ -36,7 +37,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> @@ -44,7 +45,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> @@ -52,7 +53,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,7 @@ </tr>'; } echo '</table></td> - <td valign=top> + <td valign="top"> <table>'; //new sub table to set parameters for order of display @@ -85,7 +86,7 @@ <td>' . _('Order By Net Sales') . ':</td> <td><input type="radio" name="OrderBy" value="NetSales" '; if ($_POST['OrderBy']=='NetSales'){ - echo 'checked'; + echo 'checked="checked"'; } echo ' /></td> </tr> @@ -93,7 +94,7 @@ <td>' . _('Order By Quantity') . ':</td> <td><input type="radio" name="OrderBy" value="Quantity" '; if ($_POST['OrderBy']=='Quantity'){ - echo 'checked'; + echo 'checked="checked"'; } if (!isset($_POST['NoToDisplay'])){ $_POST['NoToDisplay']=20; @@ -102,7 +103,7 @@ </tr> <tr> <td>' . _('Number to Display') . ':</td> - <td><input type="text class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td> + <td><input type="text" class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td> </tr> </table> </td></tr> @@ -110,8 +111,10 @@ echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />'; -echo '</form></div>'; +echo '</div>'; echo '<br />'; +echo '</div> + </form>'; if (isset($_POST['ShowSales'])){ $InputError=0; //assume no input errors now test for errors Modified: trunk/SalesTypes.php =================================================================== --- trunk/SalesTypes.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SalesTypes.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -203,8 +203,8 @@ printf('<td>%s</td> <td>%s</td> - <td><a href="%sSelectedType=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</td> + <td><a href="%sSelectedType=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow[0], $myrow[1], @@ -218,13 +218,14 @@ //end of ifs and buts! if (isset($SelectedType)) { - echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div></p>'; + echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div>'; } 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'] . '" />'; - echo '<p><table class="selection">'; //Main table + echo '<br />'; // The user wish to EDIT an existing type @@ -268,11 +269,12 @@ echo '<tr><td>' . _('Sales Type Name') . ':</td> <td><input type="text" name="Sales_Type" value="' . $_POST['Sales_Type'] . '" /></td></tr>'; - echo '</td></tr></table>'; // close main table + echo '</table>'; // close main table - echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>'; + echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>'; - echo '</form>'; + echo '</div> + </form>'; } // end if user wish to delete Modified: trunk/SecurityTokens.php =================================================================== --- trunk/SecurityTokens.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SecurityTokens.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -84,7 +84,8 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Print') . '" alt="" />' . ' ' . $title . '</p>'; -echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" name="form">'; +echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" id="form">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<br /> <table> @@ -108,9 +109,10 @@ echo '</td> </tr> </table> - <p></p>'; + <br />'; -echo '</form>'; +echo '</div> + </form>'; echo '<table class="selection">'; echo '<tr> @@ -124,13 +126,13 @@ while ($myrow = DB_fetch_array($Result,$db)){ echo '<tr> <td>'.$myrow['tokenid'].'</td> - <td>'.$myrow['tokenname'].'</td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td> + <td>'.htmlspecialchars($myrow['tokenname'],ENT_QUOTES,'UTF-8').'</td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td> </tr>'; } -echo '</table><p></p>'; +echo '</table><br />'; echo '<script type="text/javascript">defaultControl(document.form.TokenDescription);</script>'; Modified: trunk/SelectAsset.php =================================================================== --- trunk/SelectAsset.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectAsset.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -41,6 +41,7 @@ // end of showing search facilities echo '<form action="SelectAsset.php?' . SID . '" 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') . '" alt="" />' . ' ' . $title.'</p>'; echo '<table class="selection"><tr>'; @@ -63,13 +64,13 @@ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>'; } } -echo '</select>'; +echo '</select></td>'; -echo '<td>' . _('Enter partial description') . '</b>:</td><td>'; +echo '<td>' . _('Enter partial description') . ':</td><td>'; if (isset($_POST['Keywords'])) { echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />'; } else { - echo '<input type="text" name="Keywords" size="20" maxlength="25" /> /'; + echo '<input type="text" name="Keywords" size="20" maxlength="25" />'; } echo '</td> </tr> @@ -96,7 +97,7 @@ } echo '</select>'; -echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . '</b>:</td>'; +echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . ':</td>'; echo '<td>'; if (isset($_POST['AssetCode'])) { echo '<input type="text" class="number" name="AssetCode" value="' . $_POST['AssetCode'] . '" size="15" maxlength="13" />'; @@ -108,6 +109,7 @@ <input type="submit" name="Search" value="' . _('Search Now') . '" /> </div> <br /> + </div> </form>'; echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>'; @@ -209,6 +211,7 @@ /* display list if there is more than one record */ if (isset($searchresult) AND !isset($_POST['Select'])) { echo '<form action="FixedAssetItems.php" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $ListCount = DB_num_rows($searchresult); if ($ListCount > 0) { @@ -244,7 +247,7 @@ <input type="submit" name="Previous" value="' . _('Previous') . '" /> <input type="submit" name="Next" value="' . _('Next') . '" />'; - echo '<p></div>'; + echo '<br /></div>'; } echo '<table class="selection">'; $tableheader = '<tr> @@ -282,8 +285,10 @@ //end of page full new headings if } //end of while loop - echo '</table></form>'; + echo '</table>'; } // there were records to list + echo '</div> + </form>'; } /* end display list if there is more than one record */ include ('includes/footer.inc'); Modified: trunk/SelectCompletedOrder.php =================================================================== --- trunk/SelectCompletedOrder.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectCompletedOrder.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -12,6 +12,7 @@ ' . ' ' . _('Search Sales Orders') . '</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['completed'])) { @@ -520,7 +521,7 @@ } } - echo '</select> + echo '</select></td> <td>' . _('Enter text extracts in the description') . ':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> </tr> @@ -653,7 +654,8 @@ echo '</table>'; } -echo '</form>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/SelectContract.php =================================================================== --- trunk/SelectContract.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectContract.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -9,6 +9,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contracts') . '" alt="" />' . ' ' . _('Select A Contract') . '</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'] . '" />'; echo '<br /><div class="centre">'; @@ -62,7 +63,7 @@ echo '</select> '; } echo '<input type="submit" name="SearchContracts" value="' . _('Search') . '" />'; -echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div></p>'; +echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div><br />'; //figure out the SQL required from the inputs available @@ -194,6 +195,9 @@ } //end of while loop -echo '</table></form><br />'; +echo '</table> + </div> + </form> + <br />'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectCreditItems.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -210,17 +210,18 @@ OR $_SESSION['CreditItems'.$identifier]->DebtorNo=='' ) { 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 '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Select Customer For Credit Note').'</p>'; echo '<table cellpadding="3" class="selection">'; - echo '<tr><th colspan="5"><font size="3" color="navy"><b> ' . _('Customer Selection') .'</b></font></th></tr>'; + echo '<tr><th colspan="5"><h3> ' . _('Customer Selection') .'</h3></th></tr>'; echo '<tr> - <td><font size="1">' . _('Enter text in the customer name') . ':</font></td> + <td>' . _('Enter text in the customer name') . ':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><font size="1">' . _('Enter text extract in the customer code') . ':</font></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Enter text extract in the customer code') . ':</td> <td><input type="text" name="CustCode" size="15" maxlength="18" /></td> </tr>'; echo '</table> @@ -231,10 +232,9 @@ if (isset($result_CustSelect)) { - echo '<table cellpadding="2">'; + echo '<br /><table cellpadding="2">'; - $TableHeader = '<br /> - <tr> + $TableHeader = '<tr> <th>' . _('Customer') . '</th> <th>' . _('Branch') . '</th> <th>' . _('Contact') . '</th> @@ -261,9 +261,9 @@ } else { echo '<td></td>'; } - echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td> + echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /> <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" /> - <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /> + <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td> <td>'.$myrow['contactname'].'</td> <td>'.$myrow['phoneno'].'</td> <td>'.$myrow['faxno'].'</td> @@ -272,10 +272,11 @@ $j++; //end of page full new headings if } //end of while loop - echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />'; - echo '</table></form>'; + echo '</table><input type="hidden" name="JustSelectedACustomer" value="Yes" />'; + }//end if results to show + echo '</div> + </form>'; - }//end if results to show //end if RequireCustomerSelection } else { @@ -398,8 +399,9 @@ /*Always do the stuff below if not looking for a customerid Set up the form for the credit note display and entry*/ - echo '<form name="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form id="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; /*Process Quick Entry */ @@ -712,7 +714,7 @@ echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; } else { echo '<td class="number"><a href="' . $rootpath . '/CreditItemsControlled.php?LineNo=' . $LineItem->LineNumber . '">' . locale_number_format($LineItem->Quantity,$LineItem->DecimalPlaces) . '</a> - <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; + <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; } echo '<td>' . $LineItem->Units . '</td> @@ -969,7 +971,7 @@ echo '<td>' . _('Enter text extracts in the description') . ': </td>'; echo '<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>'; echo '<tr><td></td>'; - echo '<td><font size="3"><b>' ._('OR') . '</b></font> ' . _('Enter extract of the Stock Code') . ': </td>'; + echo '<td><b>' ._('OR') . '</b> ' . _('Enter extract of the Stock Code') . ': </td>'; echo '<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>'; echo '</tr>'; echo '</table> @@ -1003,18 +1005,18 @@ $k++; } if(file_exists($_SESSION['part_pics_dir'] . '/' .mb_strtoupper($myrow['stockid']).'.jpg') ) { - printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + printf('<td><input type="submit" name="NewItem" value="%s" /></td> + <td>%s</td> + <td>%s</td> <td><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=%s&text=&width=120&height=120" /></td></tr>', $myrow['stockid'], $myrow['description'], $myrow['units'], $myrow['stockid']); } else { //don't try to show the image - printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + printf('<td><input type="submit" name="NewItem" value="%s" /></td> + <td>%s</td> + <td>%s</td> <td>' . _('No Image') . '</td></tr>', $myrow['stockid'], $myrow['description'], @@ -1029,7 +1031,7 @@ /*FORM VARIABLES TO POST TO THE CREDIT NOTE 10 AT A TIME WITH PART CODE AND QUANTITY */ echo '<table class="selection">'; - echo '<tr><th colspan="2"><font size="3" color="navy"><b>' . _('Quick Entry') . '</th></tr>'; + echo '<tr><th colspan="2"><h3>' . _('Quick Entry') . '</h3></th></tr>'; echo '<tr> <th>' . _('Part Code') . '</th> <th>' . _('Quantity') . '</th> @@ -1052,6 +1054,8 @@ } + echo '</div> + </form>'; } //end of else not selecting a customer if (isset($_POST['ProcessCredit']) AND $OKToProcess==true){ @@ -1968,6 +1972,5 @@ } /*end of process credit note */ -echo '</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-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" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="2" class="selection"> @@ -28,7 +29,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> @@ -36,7 +37,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> @@ -44,7 +45,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> @@ -52,7 +53,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,7 @@ </tr>'; } echo '</table></td> - <td valign=top> + <td valign="top"> <table>'; //new sub table to set parameters for order of display @@ -85,7 +86,7 @@ <td>' . _('Order By Net Sales') . ':</td> <td><input type="radio" name="OrderBy" value="NetSales" '; if ($_POST['OrderBy']=='NetSales'){ - echo 'checked'; + echo 'checked="checked"'; } echo ' /></td> </tr> @@ -93,7 +94,7 @@ <td>' . _('Order By Quantity') . ':</td> <td><input type="radio" name="OrderBy" value="Quantity" '; if ($_POST['OrderBy']=='Quantity'){ - echo 'checked'; + echo 'checked="checked"'; } if (!isset($_POST['NoToDisplay'])){ $_POST['NoToDisplay']=20; @@ -102,7 +103,7 @@ </tr> <tr> <td>' . _('Number to Display') . ':</td> - <td><input type="text class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td> + <td><input type="text" class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td> </tr> </table> </td></tr> @@ -110,8 +111,10 @@ echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />'; -echo '</form></div>'; +echo '</div>'; echo '<br />'; +echo '</div> + </form>'; if (isset($_POST['ShowSales'])){ $InputError=0; //assume no input errors now test for errors Modified: trunk/SalesTypes.php =================================================================== --- trunk/SalesTypes.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SalesTypes.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -203,8 +203,8 @@ printf('<td>%s</td> <td>%s</td> - <td><a href="%sSelectedType=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</td> + <td><a href="%sSelectedType=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow[0], $myrow[1], @@ -218,13 +218,14 @@ //end of ifs and buts! if (isset($SelectedType)) { - echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div></p>'; + echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div>'; } 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'] . '" />'; - echo '<p><table class="selection">'; //Main table + echo '<br />'; // The user wish to EDIT an existing type @@ -268,11 +269,12 @@ echo '<tr><td>' . _('Sales Type Name') . ':</td> <td><input type="text" name="Sales_Type" value="' . $_POST['Sales_Type'] . '" /></td></tr>'; - echo '</td></tr></table>'; // close main table + echo '</table>'; // close main table - echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>'; + echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>'; - echo '</form>'; + echo '</div> + </form>'; } // end if user wish to delete Modified: trunk/SecurityTokens.php =================================================================== --- trunk/SecurityTokens.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SecurityTokens.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -84,7 +84,8 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Print') . '" alt="" />' . ' ' . $title . '</p>'; -echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" name="form">'; +echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" id="form">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<br /> <table> @@ -108,9 +109,10 @@ echo '</td> </tr> </table> - <p></p>'; + <br />'; -echo '</form>'; +echo '</div> + </form>'; echo '<table class="selection">'; echo '<tr> @@ -124,13 +126,13 @@ while ($myrow = DB_fetch_array($Result,$db)){ echo '<tr> <td>'.$myrow['tokenid'].'</td> - <td>'.$myrow['tokenname'].'</td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td> + <td>'.htmlspecialchars($myrow['tokenname'],ENT_QUOTES,'UTF-8').'</td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td> </tr>'; } -echo '</table><p></p>'; +echo '</table><br />'; echo '<script type="text/javascript">defaultControl(document.form.TokenDescription);</script>'; Modified: trunk/SelectAsset.php =================================================================== --- trunk/SelectAsset.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectAsset.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -41,6 +41,7 @@ // end of showing search facilities echo '<form action="SelectAsset.php?' . SID . '" 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') . '" alt="" />' . ' ' . $title.'</p>'; echo '<table class="selection"><tr>'; @@ -63,13 +64,13 @@ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>'; } } -echo '</select>'; +echo '</select></td>'; -echo '<td>' . _('Enter partial description') . '</b>:</td><td>'; +echo '<td>' . _('Enter partial description') . ':</td><td>'; if (isset($_POST['Keywords'])) { echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />'; } else { - echo '<input type="text" name="Keywords" size="20" maxlength="25" /> /'; + echo '<input type="text" name="Keywords" size="20" maxlength="25" />'; } echo '</td> </tr> @@ -96,7 +97,7 @@ } echo '</select>'; -echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . '</b>:</td>'; +echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . ':</td>'; echo '<td>'; if (isset($_POST['AssetCode'])) { echo '<input type="text" class="number" name="AssetCode" value="' . $_POST['AssetCode'] . '" size="15" maxlength="13" />'; @@ -108,6 +109,7 @@ <input type="submit" name="Search" value="' . _('Search Now') . '" /> </div> <br /> + </div> </form>'; echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>'; @@ -209,6 +211,7 @@ /* display list if there is more than one record */ if (isset($searchresult) AND !isset($_POST['Select'])) { echo '<form action="FixedAssetItems.php" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $ListCount = DB_num_rows($searchresult); if ($ListCount > 0) { @@ -244,7 +247,7 @@ <input type="submit" name="Previous" value="' . _('Previous') . '" /> <input type="submit" name="Next" value="' . _('Next') . '" />'; - echo '<p></div>'; + echo '<br /></div>'; } echo '<table class="selection">'; $tableheader = '<tr> @@ -282,8 +285,10 @@ //end of page full new headings if } //end of while loop - echo '</table></form>'; + echo '</table>'; } // there were records to list + echo '</div> + </form>'; } /* end display list if there is more than one record */ include ('includes/footer.inc'); Modified: trunk/SelectCompletedOrder.php =================================================================== --- trunk/SelectCompletedOrder.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectCompletedOrder.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -12,6 +12,7 @@ ' . ' ' . _('Search Sales Orders') . '</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['completed'])) { @@ -520,7 +521,7 @@ } } - echo '</select> + echo '</select></td> <td>' . _('Enter text extracts in the description') . ':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> </tr> @@ -653,7 +654,8 @@ echo '</table>'; } -echo '</form>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/SelectContract.php =================================================================== --- trunk/SelectContract.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectContract.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -9,6 +9,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contracts') . '" alt="" />' . ' ' . _('Select A Contract') . '</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'] . '" />'; echo '<br /><div class="centre">'; @@ -62,7 +63,7 @@ echo '</select> '; } echo '<input type="submit" name="SearchContracts" value="' . _('Search') . '" />'; -echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div></p>'; +echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div><br />'; //figure out the SQL required from the inputs available @@ -194,6 +195,9 @@ } //end of while loop -echo '</table></form><br />'; +echo '</table> + </div> + </form> + <br />'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2012-04-09 11:36:02 UTC (rev 5237) +++ trunk/SelectCreditItems.php 2012-04-10 22:05:59 UTC (rev 5238) @@ -210,17 +210,18 @@ OR $_SESSION['CreditItems'.$identifier]->DebtorNo=='' ) { 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 '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Select Customer For Credit Note').'</p>'; echo '<table cellpadding="3" class="selection">'; - echo '<tr><th colspan="5"><font size="3" color="navy"><b> ' . _('Customer Selection') .'</b></font></th></tr>'; + echo '<tr><th colspan="5"><h3> ' . _('Customer Selection') .'</h3></th></tr>'; echo '<tr> - <td><font size="1">' . _('Enter text in the customer name') . ':</font></td> + <td>' . _('Enter text in the customer name') . ':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><font size="1">' . _('Enter text extract in the customer code') . ':</font></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Enter text extract in the customer code') . ':</td> <td><input type="text" name="CustCode" size="15" maxlength="18" /></td> </tr>'; echo '</table> @@ -231,10 +232,9 @@ if (isset($result_CustSelect)) { - echo '<table cellpadding="2">'; + echo '<br /><table cellpadding="2">'; - $TableHeader = '<br /> - <tr> + $TableHeader = '<tr> <th>' . _('Customer') . '</th> <th>' . _('Branch') . '</th> <th>' . _('Contact') . '</th> @@ -261,9 +261,9 @@ } else { echo '<td></td>'; } - echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td> + echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /> <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" /> - <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /> + <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td> <td>'.$myrow['contactname'].'</td> <td>'.$myrow['phoneno'].'</td> <td>'.$myrow['faxno'].'</td> @@ -272,10 +272,11 @@ $j++; //end of page full new headings if } //end of while loop - echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />'; - echo '</table></form>'; + echo '</table><input type="hidden" name="JustSelectedACustomer" value="Yes" />'; + }//end if results to show + echo '</div> + </form>'; - }//end if results to show //end if RequireCustomerSelection } else { @@ -398,8 +399,9 @@ /*Always do the stuff below if not looking for a customerid Set up the form for the credit note display and entry*/ - echo '<form name="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form id="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; /*Process Quick Entry */ @@ -712,7 +714,7 @@ echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; } else { echo '<td class="number"><a href="' . $rootpath . '/CreditItemsControlled.php?LineNo=' . $LineItem->LineNumber . '">' . locale_number_format($LineItem->Quantity,$LineItem->DecimalPlaces) . '</a> - <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; + <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>'; } echo '<td>' . $LineItem->Units . '</td> @@ -969,7 +971,7 @@ echo '<td>' . _('Enter text extracts in the description') . ': </td>'; echo '<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>'; echo '<tr><td></td>'; - echo '<td><font size="3"><b>' ._('OR') . '</b></font> ' . _('Enter extract of the Stock Code') . ': </td>'; + echo '<td><b>' ._('OR') . '</b> ' . _('Enter extract of the Stock Code') . ': </td>'; echo '<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>'; echo '</tr>'; echo '</table> @@ -1003,18 +1005,18 @@ $k++; } if(file_exists($_SESSION['part_pics_dir'] . '/' .mb_strtoupper($myrow['stockid']).'.jpg') ) { - printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + printf('<td><input type="submit" name="NewItem" value="%s" /></td> + <td>%s</td> + <td>%s</td> <td><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=%s&text=&width=120&height=120" /></td></tr>', $myrow['stockid'], $myrow['description'], $myrow['units'], $myrow['stockid']); } else { //don't try to show the image - printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + printf('<td><input type="submit" name="NewItem" value="%s" /></td> + <td>%s</td> + <td>%s</td> <td>' . _('No Image') . '</td></tr>', $myrow['stockid'], $myrow['description'], @@ -1029,7 +1031,7 @@ /*FORM VARIABLES TO POST TO THE CREDIT NOTE 10 AT A TIME WITH PART CODE AND QUANTITY */ echo '<table class="selection">'; - echo '<tr><th colspan="2"><font size="3" color="navy"><b>' . _('Quick Entry') . '</th></tr>'; + echo '<tr><th colspan="2"><h3>' . _('Quick Entry') . '</h3></th></tr>'; echo '<tr> <th>' . _('Part Code') . '</th> <th>' . _('Quantity') . '</th> @@ -1052,6 +1054,8 @@ } + echo '</div> + </form>'; } //end of else not selecting a customer if (isset($_POST['ProcessCredit']) AND $OKToProcess==true){ @@ -1968,6 +1972,5 @@ } /*end of process credit note */ -echo '</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-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 be entered for the search'); - } else { - If (mb_strlen($_POST['Keywords'])>0) { + $SQL = "SELECT chartmaster.accountcode, + chartmaster.accountname, + chartmaster.group_, + CASE WHEN accountgroups.pandl!=0 THEN '" . _('Profit and Loss') . "' ELSE '" . _('Balance Sheet') ."' END AS pl + FROM chartmaster, + accountgroups + WHERE chartmaster.group_=accountgroups.groupname + ORDER BY chartmaster.accountcode"; + } + elseif (mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%'; @@ -72,7 +79,6 @@ if (isset($SQL) and $SQL!=''){ $result = DB_query($SQL, $db); } - } //one of keywords or GLCode was more than a zero length string } //end of if search if (!isset($AccountID)) { @@ -82,6 +88,7 @@ '" alt="" />' . ' ' . _('Search for General Ledger Accounts') . '</p>'; 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'] . '" />'; if(mb_strlen($msg)>1){ @@ -90,10 +97,10 @@ echo '<table class="selection"> <tr> - <td><font size="1">' . _('Enter extract of text in the Account name') .':</font></td> + <td>' . _('Enter extract of text in the Account name') .':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><font size="1">' . _('Enter Account No. to search from') . ':</font></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Enter Account No. to search from') . ':</td> <td><input type="text" name="GLCode" size="15" maxlength="18" class="number" /></td> </tr> </table> @@ -101,7 +108,7 @@ echo '<div class="centre"> <input type="submit" name="Search" value="' . _('Search Now') . '" /> - <input type="submit" action=reset value="' . _('Reset') .'" /> + <input type="submit" name="reset" value="' . _('Reset') .'" /> </div>'; if (isset($result) and DB_num_rows($result)>0) { @@ -122,13 +129,13 @@ while ($myrow=DB_fetch_array($result)) { printf('<tr> - <td><font size="1"><input type="submit" name="Select" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + <td><input type="submit" name="Select" value="%s" /></td> + <td>%s</td> + <td>%s</td> + <td>%s</td> </tr>', $myrow['accountcode'], - $myrow['accountname'], + htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), $myrow['group_'], $myrow['pl']); @@ -147,7 +154,8 @@ } //end if results to show - echo '</form>'; + echo '</div> + </form>'; } //end AccountID already selected Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2012-04-10 22:05:59 UTC (rev 5238) +++ trunk/SelectOrderItems.php 2012-04-12 07:43:22 UTC (rev 5239) @@ -300,7 +300,16 @@ AND in_array(2,$_SESSION['AllowedPageSecurityTokens'])){ if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) { - prnMsg(_('At least one Customer Branch Name keyword OR an extract of a Customer Branch Code or Branch Phone Number must be entered for the search'), 'warn'); + $SQL = "SELECT custbranch.brname, + custbranch.contactname, + custbranch.phoneno, + custbranch.faxno, + custbranch.branchcode, + custbranch.debtorno, + debtorsmaster.name + FROM custbranch + LEFT JOIN debtorsmaster + ON custbranch.debtorno=debtorsmaster.debtorno"; } else { //insert wildcard characters in spaces $_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords'])); @@ -325,6 +334,7 @@ } $SQL .= " AND custbranch.disabletrans=0 ORDER BY custbranch.debtorno, custbranch.branchcode"; + } /*one of keywords or custcode was more than a zero length string */ $ErrMsg = _('The searched customer records requested cannot be retrieved because'); $result_CustSelect = DB_query($SQL,$db,$ErrMsg); @@ -336,7 +346,6 @@ } elseif (DB_num_rows($result_CustSelect)==0){ prnMsg(_('No Customer Branch records contain the search criteria') . ' - ' . _('please try again') . ' - ' . _('Note a Customer Branch Name may be different to the Customer Name'),'info'); } - } /*one of keywords or custcode was more than a zero length string */ } /*end of if search for customer codes/names */ if (isset($_POST['JustSelectedACustomer'])){ @@ -386,7 +395,7 @@ $myrow = DB_fetch_array($result); if ($myrow[1] != 1){ if ($myrow[1]==2){ - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently flagged as an account that needs to be watched. Please contact the credit control personnel to discuss'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently flagged as an account that needs to be watched. Please contact the credit control personnel to discuss'),'warn'); } $_SESSION['RequireCustomerSelection']=0; @@ -473,16 +482,16 @@ $_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db); if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){ - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently at or over their credit limit'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently at or over their credit limit'),'warn'); } elseif ($_SESSION['CheckCreditLimits']==2 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){ - prnMsg(_('No more orders can be placed by') . ' ' . $myrow[0] . ' ' . _(' their account is currently at or over their credit limit'),'warn'); + prnMsg(_('No more orders can be placed by') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _(' their account is currently at or over their credit limit'),'warn'); include('includes/footer.inc'); exit; } } } else { - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn'); } } elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType @@ -577,29 +586,35 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Enter an Order or Quotation') . ' : ' . _('Search for the Customer Branch.') . '</p>'; echo '<div class="page_help_text">' . _('Orders/Quotations are placed against the Customer Branch. A Customer may have several Branches.') . '</div>'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectCustomer" method="post"> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectCustomer" method="post"> + <div> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="3" class="selection"> <tr> - <td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td> + <td>' . _('Part of the Customer Branch Name') . ':</td> <td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td> - <td><h2><b>' . _('OR') . '</b></h2></td> - <td><h5>' . _('Part of the Customer Branch Code') . ':</h5></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Part of the Customer Branch Code') . ':</td> <td><input tabindex="2" type="text" name="CustCode" size="15" maxlength="18" /></td> - <td><h2><b>' . _('OR') . '</b></h2></td> - <td><h5>' . _('Part of the Branch Phone Number') . ':</h5></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Part of the Branch Phone Number') . ':</td> <td><input tabindex="3" type="text" name="CustPhone" size="15" maxlength="18" /></td> </tr> </table> <br /><div class="centre"><input tabindex="4" type="submit" name="SearchCust" value="' . _('Search Now') . '" /> - <input tabindex="5" type="submit" action="reset" value="' . _('Reset') . '" /></div>'; + <input tabindex="5" type="submit" name="reset" value="' . _('Reset') . '" /></div>'; + echo '</div> + </form>'; if (isset($result_CustSelect)) { - echo '<table class="selection">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<br /><table class="selection">'; - $TableHeader = '<br /><tr> + $TableHeader = '<tr> <th>' . _('Customer') . '</th> <th>' . _('Branch') . '</th> <th>' . _('Contact') . '</th> @@ -620,16 +635,14 @@ echo '<tr class="OddTableRows">'; $k=1; } - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if ($LastCustomer != $myrow['name']) { - echo '<td>'.$myrow['name'].'</td>'; + echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>'; } else { echo '<td></td>'; } - echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td> + echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" /> <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" /> - <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /> + <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td> <td>'.$myrow['contactname'].'</td> <td>'.$myrow['phoneno'].'</td> <td>'.$myrow['faxno'].'</td> @@ -639,8 +652,10 @@ //end of page full new headings if } //end of while loop + echo '</table>'; echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />'; - echo '</table></form>'; + echo '</div> + </form>'; }//end if results to show @@ -707,8 +722,8 @@ echo _('Order for customer') . ' '; } - echo ':<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('Customer Name') . ': ' . $_SESSION['Items'.$identifier]->CustomerName; - echo '</b></p><div class="page_help_text">' . '<b>' . _('Default Options (can be modified during order):') . '</b><br />' . _('Deliver To') . ':<b> ' . $_SESSION['Items'.$identifier]->DeliverTo; + echo ':<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('Customer Name') . ': ' . htmlspecialchars($_SESSION['Items'.$identifier]->CustomerName, ENT_QUOTES, 'UTF-8', false); + echo '</b></p><div class="page_help_text">' . '<b>' . _('Default Options (can be modified during order):') . '</b><br />' . _('Deliver To') . ':<b> ' . htmlspecialchars($_SESSION['Items'.$identifier]->DeliverTo, ENT_QUOTES, 'UTF-8', false); echo '</b> ' . _('From Location') . ':<b> ' . $_SESSION['Items'.$identifier]->LocationName; echo '</b><br />' . _('Sales Type') . '/' . _('Price List') . ':<b> ' . $_SESSION['Items'.$identifier]->SalesTypeName; echo '</b><br />' . _('Terms') . ':<b> ' . $_SESSION['Items'.$identifier]->PaymentTerms; @@ -718,11 +733,11 @@ if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){ if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') { - $msg='</b><div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>'; } elseif ($_POST['StockCode']!='' AND $_POST['Keywords']=='') { - $msg='</b><div class="page_help_text">' . _('Stock Code has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Stock Code has been used in search') . '.</div>'; } elseif ($_POST['Keywords']=='' AND $_POST['StockCode']=='') { - $msg='</b><div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; } if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces @@ -840,7 +855,8 @@ #Always do the stuff below if not looking for a customerid - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; //Get The exchange rate used for GPPercent calculations on adding or amending items @@ -1322,13 +1338,13 @@ /* This is where the order as selected should be displayed reflecting any deletions or insertions*/ + echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />'; echo '<br /> <table width="90%" cellpadding="2"> <tr style="background-color:#800000">'; if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){ echo '<th>' . _('PO Line') . '</th>'; } - echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />'; echo '<th>' . _('Item Code') . '</th> <th>' . _('Item Description') . '</th> <th>' . _('Quantity') . '</th> @@ -1367,13 +1383,14 @@ } echo $RowStarter; + echo '<td>'; if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required - echo '<td><input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" /></td>'; + echo '<input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" /></td><td>'; } else { echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />'; } - echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td> + echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td> <td>' . $OrderLine->ItemDescription . '</td>'; echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />'; @@ -1390,9 +1407,9 @@ <td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td> <td><input class="number" type="text" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" /></td>'; } else { - echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>'; + echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); echo '<input class="number" type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />'; - echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" />'; + echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>'; } if ($_SESSION['Items'.$identifier]->Some_Already_Delivered($OrderLine->LineNumber)){ $RemTxt = _('Clear Remaining'); @@ -1408,13 +1425,13 @@ echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" maxlength="10" value="' . $LineDueDate . '" /></td>'; - echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>'; + echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>'; if ($_SESSION['AllowOrderLineItemNarrative'] == 1){ echo $RowStarter; echo '<td colspan="10">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1">' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td></tr>'; } else { - echo '<input type="hidden" name="Narrative" value="" />'; + echo '<tr><td><input type="hidden" name="Narrative" value="" /></td></tr>'; } $_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal; @@ -1450,7 +1467,7 @@ <input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" /> <input type="submit" name="DeliveryDetails" value="' . _('Enter Delivery Details and Confirm Order') . '" /> </div> - <hr />'; + <br />'; } # end of if lines /* Now show the stock item selection search stuff below */ @@ -1570,14 +1587,14 @@ $Available = $QOH - $DemandQty + $OnOrder; - printf('<td>%s</font></td> + printf('<td>%s</td> <td>%s</td> <td>%s</td> <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><font size="1"><input class="number" tabindex="'. strval($j+7).'" type="textbox" size="6" name="OrderQty' . $i . '" value="0" /> + <td><input class="number" tabindex="'. strval($j+7).'" type="text" size="6" name="OrderQty' . $i . '" value="0" /> <input type="hidden" name="StockID' . $i . '" value="' . $myrow['stockid'] . '" /> </td> </tr>', @@ -1596,20 +1613,20 @@ #end of page full new headings if } #end of while loop for Frequently Ordered Items - echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>'; + echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>'; echo '</table>'; } //end of if Frequently Ordered Items > 0 - echo '<p><div class="centre"><b><p>' . $msg . '</b></p>'; + echo '<br /><div class="centre">' . $msg; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; - echo _('Search for Order Items') . '</p>'; + echo _('Search for Order Items') . '</p></div>'; echo '<div class="page_help_text">' . _('Search for Order Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />'; echo '<table class="selection"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex="1" name="StockCat">'; if (!isset($_POST['StockCat'])){ - echo '<option selected="selected" value="All">' . _('All'); + echo '<option selected="selected" value="All">' . _('All') . '</option>'; $_POST['StockCat'] ='All'; } else { - echo '<option value="All">' . _('All'); + echo '<option value="All">' . _('All') . '</option>'; } $SQL="SELECT categoryid, categorydescription @@ -1644,21 +1661,24 @@ <td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="' . _('Search Now') . '" /></td> <td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="' . _('Use Quick Entry') . '" /></td>'; - if (!isset($_POST['PartSearch'])) { - echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>'; - } if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){ //not a customer entry of own order echo '<td style="text-align:center" colspan="1"><input tabindex="6" type="submit" name="ChangeCustomer" value="' . _('Change Customer') . '" /></td> - <td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td> - </tr></table><br />'; + <td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td>'; } + echo '</tr></table><br />'; + echo '</div> + </form>'; + if (!isset($_POST['PartSearch'])) { + echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>'; + } if (isset($SearchResult)) { echo '<br />'; echo '<div class="page_help_text">' . _('Select an item by entering the quantity required. Click Order when ready.') . '</div>'; echo '<br />'; $j = 1; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" name="orderform">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" id="orderform">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="table1">'; echo '<tr><td colspan="1"><input type="hidden" name="previous" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; @@ -1762,7 +1782,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><font size="1"><input class="number" tabindex="'.strval($j+7).'" type="textbox" size="6" name="OrderQty'. $i . '" value="0" /> + <td><input class="number" tabindex="'.strval($j+7).'" type="text" size="6" name="OrderQty'. $i . '" value="0" /> <input type="hidden" name="StockID'. $i . '" value="' . $myrow['stockid']. '" /> </td> </tr>', @@ -1781,10 +1801,12 @@ #end of page full new headings if } #end of while loop - echo '<tr><td><input type="hidden" name="previous" value="'. strval($Offset-1).'"><input tabindex="'. strval($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; + echo '<tr><td><input type="hidden" name="previous" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>'; echo '<td><input type="hidden" name="nextlist" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>'; - echo '</table></form>'; + echo '</table> + </div> + </form>'; echo $jsCall; }#end if SearchResults to show @@ -1815,11 +1837,13 @@ <td><input type="text" class="date" name="itemdue_' . $i . '" size="25" maxlength="25" alt="'.$_SESSION['DefaultDateFormat'].'" value="' . $DefaultDeliveryDate . '" /></td></tr>'; } - echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>'; + echo '</table><script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>'; - echo '</table><br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '" /> + echo '<br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '" /> <input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>'; + echo '</div> + </form>'; } elseif (isset($_POST['SelectAsset'])){ echo '<div class="page_help_text"><b>' . _('Use this screen to select an asset to dispose of to this customer') . '</b></div><br /> @@ -1840,6 +1864,8 @@ <br /><div class="centre"><input type="submit" name="AssetDisposalEntered" value="' . _('Add Asset To Order') . '" /> <input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>'; + echo '</div> + </form>'; } //end of if it is a Quick Entry screen/part search or asset selection form to display if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){ @@ -1847,7 +1873,6 @@ } }#end of else not selecting a customer -echo '</form>'; if (isset($_GET['NewOrder']) and $_GET['NewOrder']!='') { echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>'; Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2012-04-10 22:05:59 UTC (rev 5238) +++ trunk/SelectProduct.php 2012-04-12 07:43:22 UTC (rev 5239) @@ -36,7 +36,7 @@ ORDER BY categorydescription"; $result1 = DB_query($SQL, $db); if (DB_num_rows($result1) == 0) { - echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>'; + echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>'; echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>'; exit; } @@ -71,18 +71,18 @@ $Its_A_Kitset = false; $Its_A_Labour_Item = false; if ($myrow['discontinued']==1){ - $ItemStatus = '<font class="bad">' ._('Obsolete') . '</font>'; + $ItemStatus = '<p class="bad">' ._('Obsolete') . '</p>'; } else { $ItemStatus = ''; } echo '<table width="90%"> <tr> - <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . ' ' . $ItemStatus . '</b></th> + <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th> </tr>'; echo '<tr> - <td width="40%" valign="top"> - <table align="left">'; //nested table + <td style="width:40%" valign="top"> + <table>'; //nested table echo '<tr><th class="number">' . _('Item Type:') . '</th> <td colspan="2" class="select">'; switch ($myrow['mbflag']) { @@ -194,12 +194,12 @@ } else { $Cost = $myrow['cost']; } - echo '<th class="number">' . _('Cost') . '</th> - <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td>'; + echo '<tr><th class="number">' . _('Cost') . '</th> + <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td></tr>'; } //end of if PricesSecuirty allows viewing of prices echo '</table>'; //end of first nested table // Item Category Property mod: display the item properties - echo '<table align="left">'; + echo '<table>'; $CatValResult = DB_query("SELECT categoryid FROM stockmaster WHERE stockid='" . $StockID . "'", $db); @@ -226,11 +226,11 @@ echo '<tr><th align="right">' . $PropertyRow['label'] . ':</th>'; switch ($PropertyRow['controltype']) { case 0; //textbox - echo '<td class="select" width="60"><in... [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 be entered for the search'); - } else { - If (mb_strlen($_POST['Keywords'])>0) { + $SQL = "SELECT chartmaster.accountcode, + chartmaster.accountname, + chartmaster.group_, + CASE WHEN accountgroups.pandl!=0 THEN '" . _('Profit and Loss') . "' ELSE '" . _('Balance Sheet') ."' END AS pl + FROM chartmaster, + accountgroups + WHERE chartmaster.group_=accountgroups.groupname + ORDER BY chartmaster.accountcode"; + } + elseif (mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%'; @@ -72,7 +79,6 @@ if (isset($SQL) and $SQL!=''){ $result = DB_query($SQL, $db); } - } //one of keywords or GLCode was more than a zero length string } //end of if search if (!isset($AccountID)) { @@ -82,6 +88,7 @@ '" alt="" />' . ' ' . _('Search for General Ledger Accounts') . '</p>'; 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'] . '" />'; if(mb_strlen($msg)>1){ @@ -90,10 +97,10 @@ echo '<table class="selection"> <tr> - <td><font size="1">' . _('Enter extract of text in the Account name') .':</font></td> + <td>' . _('Enter extract of text in the Account name') .':</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><font size="1">' . _('Enter Account No. to search from') . ':</font></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Enter Account No. to search from') . ':</td> <td><input type="text" name="GLCode" size="15" maxlength="18" class="number" /></td> </tr> </table> @@ -101,7 +108,7 @@ echo '<div class="centre"> <input type="submit" name="Search" value="' . _('Search Now') . '" /> - <input type="submit" action=reset value="' . _('Reset') .'" /> + <input type="submit" name="reset" value="' . _('Reset') .'" /> </div>'; if (isset($result) and DB_num_rows($result)>0) { @@ -122,13 +129,13 @@ while ($myrow=DB_fetch_array($result)) { printf('<tr> - <td><font size="1"><input type="submit" name="Select" value="%s" /></font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> - <td><font size="1">%s</font></td> + <td><input type="submit" name="Select" value="%s" /></td> + <td>%s</td> + <td>%s</td> + <td>%s</td> </tr>', $myrow['accountcode'], - $myrow['accountname'], + htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), $myrow['group_'], $myrow['pl']); @@ -147,7 +154,8 @@ } //end if results to show - echo '</form>'; + echo '</div> + </form>'; } //end AccountID already selected Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2012-04-10 22:05:59 UTC (rev 5238) +++ trunk/SelectOrderItems.php 2012-04-12 07:43:22 UTC (rev 5239) @@ -300,7 +300,16 @@ AND in_array(2,$_SESSION['AllowedPageSecurityTokens'])){ if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) { - prnMsg(_('At least one Customer Branch Name keyword OR an extract of a Customer Branch Code or Branch Phone Number must be entered for the search'), 'warn'); + $SQL = "SELECT custbranch.brname, + custbranch.contactname, + custbranch.phoneno, + custbranch.faxno, + custbranch.branchcode, + custbranch.debtorno, + debtorsmaster.name + FROM custbranch + LEFT JOIN debtorsmaster + ON custbranch.debtorno=debtorsmaster.debtorno"; } else { //insert wildcard characters in spaces $_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords'])); @@ -325,6 +334,7 @@ } $SQL .= " AND custbranch.disabletrans=0 ORDER BY custbranch.debtorno, custbranch.branchcode"; + } /*one of keywords or custcode was more than a zero length string */ $ErrMsg = _('The searched customer records requested cannot be retrieved because'); $result_CustSelect = DB_query($SQL,$db,$ErrMsg); @@ -336,7 +346,6 @@ } elseif (DB_num_rows($result_CustSelect)==0){ prnMsg(_('No Customer Branch records contain the search criteria') . ' - ' . _('please try again') . ' - ' . _('Note a Customer Branch Name may be different to the Customer Name'),'info'); } - } /*one of keywords or custcode was more than a zero length string */ } /*end of if search for customer codes/names */ if (isset($_POST['JustSelectedACustomer'])){ @@ -386,7 +395,7 @@ $myrow = DB_fetch_array($result); if ($myrow[1] != 1){ if ($myrow[1]==2){ - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently flagged as an account that needs to be watched. Please contact the credit control personnel to discuss'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently flagged as an account that needs to be watched. Please contact the credit control personnel to discuss'),'warn'); } $_SESSION['RequireCustomerSelection']=0; @@ -473,16 +482,16 @@ $_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db); if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){ - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently at or over their credit limit'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently at or over their credit limit'),'warn'); } elseif ($_SESSION['CheckCreditLimits']==2 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){ - prnMsg(_('No more orders can be placed by') . ' ' . $myrow[0] . ' ' . _(' their account is currently at or over their credit limit'),'warn'); + prnMsg(_('No more orders can be placed by') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _(' their account is currently at or over their credit limit'),'warn'); include('includes/footer.inc'); exit; } } } else { - prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn'); + prnMsg(_('The') . ' ' . htmlspecialchars($myrow[0], ENT_QUOTES, 'UTF-8', false) . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn'); } } elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType @@ -577,29 +586,35 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Enter an Order or Quotation') . ' : ' . _('Search for the Customer Branch.') . '</p>'; echo '<div class="page_help_text">' . _('Orders/Quotations are placed against the Customer Branch. A Customer may have several Branches.') . '</div>'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectCustomer" method="post"> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectCustomer" method="post"> + <div> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="3" class="selection"> <tr> - <td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td> + <td>' . _('Part of the Customer Branch Name') . ':</td> <td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td> - <td><h2><b>' . _('OR') . '</b></h2></td> - <td><h5>' . _('Part of the Customer Branch Code') . ':</h5></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Part of the Customer Branch Code') . ':</td> <td><input tabindex="2" type="text" name="CustCode" size="15" maxlength="18" /></td> - <td><h2><b>' . _('OR') . '</b></h2></td> - <td><h5>' . _('Part of the Branch Phone Number') . ':</h5></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Part of the Branch Phone Number') . ':</td> <td><input tabindex="3" type="text" name="CustPhone" size="15" maxlength="18" /></td> </tr> </table> <br /><div class="centre"><input tabindex="4" type="submit" name="SearchCust" value="' . _('Search Now') . '" /> - <input tabindex="5" type="submit" action="reset" value="' . _('Reset') . '" /></div>'; + <input tabindex="5" type="submit" name="reset" value="' . _('Reset') . '" /></div>'; + echo '</div> + </form>'; if (isset($result_CustSelect)) { - echo '<table class="selection">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<br /><table class="selection">'; - $TableHeader = '<br /><tr> + $TableHeader = '<tr> <th>' . _('Customer') . '</th> <th>' . _('Branch') . '</th> <th>' . _('Contact') . '</th> @@ -620,16 +635,14 @@ echo '<tr class="OddTableRows">'; $k=1; } - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if ($LastCustomer != $myrow['name']) { - echo '<td>'.$myrow['name'].'</td>'; + echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>'; } else { echo '<td></td>'; } - echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td> + echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" /> <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" /> - <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /> + <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td> <td>'.$myrow['contactname'].'</td> <td>'.$myrow['phoneno'].'</td> <td>'.$myrow['faxno'].'</td> @@ -639,8 +652,10 @@ //end of page full new headings if } //end of while loop + echo '</table>'; echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />'; - echo '</table></form>'; + echo '</div> + </form>'; }//end if results to show @@ -707,8 +722,8 @@ echo _('Order for customer') . ' '; } - echo ':<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('Customer Name') . ': ' . $_SESSION['Items'.$identifier]->CustomerName; - echo '</b></p><div class="page_help_text">' . '<b>' . _('Default Options (can be modified during order):') . '</b><br />' . _('Deliver To') . ':<b> ' . $_SESSION['Items'.$identifier]->DeliverTo; + echo ':<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('Customer Name') . ': ' . htmlspecialchars($_SESSION['Items'.$identifier]->CustomerName, ENT_QUOTES, 'UTF-8', false); + echo '</b></p><div class="page_help_text">' . '<b>' . _('Default Options (can be modified during order):') . '</b><br />' . _('Deliver To') . ':<b> ' . htmlspecialchars($_SESSION['Items'.$identifier]->DeliverTo, ENT_QUOTES, 'UTF-8', false); echo '</b> ' . _('From Location') . ':<b> ' . $_SESSION['Items'.$identifier]->LocationName; echo '</b><br />' . _('Sales Type') . '/' . _('Price List') . ':<b> ' . $_SESSION['Items'.$identifier]->SalesTypeName; echo '</b><br />' . _('Terms') . ':<b> ' . $_SESSION['Items'.$identifier]->PaymentTerms; @@ -718,11 +733,11 @@ if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){ if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') { - $msg='</b><div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>'; } elseif ($_POST['StockCode']!='' AND $_POST['Keywords']=='') { - $msg='</b><div class="page_help_text">' . _('Stock Code has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Stock Code has been used in search') . '.</div>'; } elseif ($_POST['Keywords']=='' AND $_POST['StockCode']=='') { - $msg='</b><div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; + $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; } if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces @@ -840,7 +855,8 @@ #Always do the stuff below if not looking for a customerid - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; //Get The exchange rate used for GPPercent calculations on adding or amending items @@ -1322,13 +1338,13 @@ /* This is where the order as selected should be displayed reflecting any deletions or insertions*/ + echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />'; echo '<br /> <table width="90%" cellpadding="2"> <tr style="background-color:#800000">'; if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){ echo '<th>' . _('PO Line') . '</th>'; } - echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />'; echo '<th>' . _('Item Code') . '</th> <th>' . _('Item Description') . '</th> <th>' . _('Quantity') . '</th> @@ -1367,13 +1383,14 @@ } echo $RowStarter; + echo '<td>'; if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required - echo '<td><input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" /></td>'; + echo '<input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" /></td><td>'; } else { echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />'; } - echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td> + echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td> <td>' . $OrderLine->ItemDescription . '</td>'; echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />'; @@ -1390,9 +1407,9 @@ <td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td> <td><input class="number" type="text" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" /></td>'; } else { - echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>'; + echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); echo '<input class="number" type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />'; - echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" />'; + echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>'; } if ($_SESSION['Items'.$identifier]->Some_Already_Delivered($OrderLine->LineNumber)){ $RemTxt = _('Clear Remaining'); @@ -1408,13 +1425,13 @@ echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" maxlength="10" value="' . $LineDueDate . '" /></td>'; - echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>'; + echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>'; if ($_SESSION['AllowOrderLineItemNarrative'] == 1){ echo $RowStarter; echo '<td colspan="10">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1">' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td></tr>'; } else { - echo '<input type="hidden" name="Narrative" value="" />'; + echo '<tr><td><input type="hidden" name="Narrative" value="" /></td></tr>'; } $_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal; @@ -1450,7 +1467,7 @@ <input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" /> <input type="submit" name="DeliveryDetails" value="' . _('Enter Delivery Details and Confirm Order') . '" /> </div> - <hr />'; + <br />'; } # end of if lines /* Now show the stock item selection search stuff below */ @@ -1570,14 +1587,14 @@ $Available = $QOH - $DemandQty + $OnOrder; - printf('<td>%s</font></td> + printf('<td>%s</td> <td>%s</td> <td>%s</td> <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><font size="1"><input class="number" tabindex="'. strval($j+7).'" type="textbox" size="6" name="OrderQty' . $i . '" value="0" /> + <td><input class="number" tabindex="'. strval($j+7).'" type="text" size="6" name="OrderQty' . $i . '" value="0" /> <input type="hidden" name="StockID' . $i . '" value="' . $myrow['stockid'] . '" /> </td> </tr>', @@ -1596,20 +1613,20 @@ #end of page full new headings if } #end of while loop for Frequently Ordered Items - echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>'; + echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>'; echo '</table>'; } //end of if Frequently Ordered Items > 0 - echo '<p><div class="centre"><b><p>' . $msg . '</b></p>'; + echo '<br /><div class="centre">' . $msg; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; - echo _('Search for Order Items') . '</p>'; + echo _('Search for Order Items') . '</p></div>'; echo '<div class="page_help_text">' . _('Search for Order Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />'; echo '<table class="selection"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex="1" name="StockCat">'; if (!isset($_POST['StockCat'])){ - echo '<option selected="selected" value="All">' . _('All'); + echo '<option selected="selected" value="All">' . _('All') . '</option>'; $_POST['StockCat'] ='All'; } else { - echo '<option value="All">' . _('All'); + echo '<option value="All">' . _('All') . '</option>'; } $SQL="SELECT categoryid, categorydescription @@ -1644,21 +1661,24 @@ <td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="' . _('Search Now') . '" /></td> <td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="' . _('Use Quick Entry') . '" /></td>'; - if (!isset($_POST['PartSearch'])) { - echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>'; - } if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){ //not a customer entry of own order echo '<td style="text-align:center" colspan="1"><input tabindex="6" type="submit" name="ChangeCustomer" value="' . _('Change Customer') . '" /></td> - <td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td> - </tr></table><br />'; + <td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td>'; } + echo '</tr></table><br />'; + echo '</div> + </form>'; + if (!isset($_POST['PartSearch'])) { + echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>'; + } if (isset($SearchResult)) { echo '<br />'; echo '<div class="page_help_text">' . _('Select an item by entering the quantity required. Click Order when ready.') . '</div>'; echo '<br />'; $j = 1; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" name="orderform">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" id="orderform">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="table1">'; echo '<tr><td colspan="1"><input type="hidden" name="previous" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; @@ -1762,7 +1782,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><font size="1"><input class="number" tabindex="'.strval($j+7).'" type="textbox" size="6" name="OrderQty'. $i . '" value="0" /> + <td><input class="number" tabindex="'.strval($j+7).'" type="text" size="6" name="OrderQty'. $i . '" value="0" /> <input type="hidden" name="StockID'. $i . '" value="' . $myrow['stockid']. '" /> </td> </tr>', @@ -1781,10 +1801,12 @@ #end of page full new headings if } #end of while loop - echo '<tr><td><input type="hidden" name="previous" value="'. strval($Offset-1).'"><input tabindex="'. strval($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; + echo '<tr><td><input type="hidden" name="previous" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>'; echo '<td><input type="hidden" name="nextlist" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>'; - echo '</table></form>'; + echo '</table> + </div> + </form>'; echo $jsCall; }#end if SearchResults to show @@ -1815,11 +1837,13 @@ <td><input type="text" class="date" name="itemdue_' . $i . '" size="25" maxlength="25" alt="'.$_SESSION['DefaultDateFormat'].'" value="' . $DefaultDeliveryDate . '" /></td></tr>'; } - echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>'; + echo '</table><script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>'; - echo '</table><br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '" /> + echo '<br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '" /> <input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>'; + echo '</div> + </form>'; } elseif (isset($_POST['SelectAsset'])){ echo '<div class="page_help_text"><b>' . _('Use this screen to select an asset to dispose of to this customer') . '</b></div><br /> @@ -1840,6 +1864,8 @@ <br /><div class="centre"><input type="submit" name="AssetDisposalEntered" value="' . _('Add Asset To Order') . '" /> <input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>'; + echo '</div> + </form>'; } //end of if it is a Quick Entry screen/part search or asset selection form to display if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){ @@ -1847,7 +1873,6 @@ } }#end of else not selecting a customer -echo '</form>'; if (isset($_GET['NewOrder']) and $_GET['NewOrder']!='') { echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>'; Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2012-04-10 22:05:59 UTC (rev 5238) +++ trunk/SelectProduct.php 2012-04-12 07:43:22 UTC (rev 5239) @@ -36,7 +36,7 @@ ORDER BY categorydescription"; $result1 = DB_query($SQL, $db); if (DB_num_rows($result1) == 0) { - echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>'; + echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>'; echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>'; exit; } @@ -71,18 +71,18 @@ $Its_A_Kitset = false; $Its_A_Labour_Item = false; if ($myrow['discontinued']==1){ - $ItemStatus = '<font class="bad">' ._('Obsolete') . '</font>'; + $ItemStatus = '<p class="bad">' ._('Obsolete') . '</p>'; } else { $ItemStatus = ''; } echo '<table width="90%"> <tr> - <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . ' ' . $ItemStatus . '</b></th> + <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th> </tr>'; echo '<tr> - <td width="40%" valign="top"> - <table align="left">'; //nested table + <td style="width:40%" valign="top"> + <table>'; //nested table echo '<tr><th class="number">' . _('Item Type:') . '</th> <td colspan="2" class="select">'; switch ($myrow['mbflag']) { @@ -194,12 +194,12 @@ } else { $Cost = $myrow['cost']; } - echo '<th class="number">' . _('Cost') . '</th> - <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td>'; + echo '<tr><th class="number">' . _('Cost') . '</th> + <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td></tr>'; } //end of if PricesSecuirty allows viewing of prices echo '</table>'; //end of first nested table // Item Category Property mod: display the item properties - echo '<table align="left">'; + echo '<table>'; $CatValResult = DB_query("SELECT categoryid FROM stockmaster WHERE stockid='" . $StockID . "'", $db); @@ -226,11 +226,11 @@ echo '<tr><th align="right">' . $PropertyRow['label'] . ':</th>'; switch ($PropertyRow['controltype']) { case 0; //textbox - echo '<td class="select" width="60"><in... [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 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('print') . '" alt="" />' . ' ' . $title.'</p><br />'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <table class="selection">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; - echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td> + echo '<tr><td>' . _('From Inventory Category Code') . ':</td> <td><select name="FromCriteria">'; $sql="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid"; @@ -351,8 +352,9 @@ </table> <br /> <div class="centre"> - <input type="submit" Name="PrintPDF" value="' . _('Print and Process') . '" /> + <input type="submit" name="PrintPDF" value="' . _('Print and Process') . '" /> </div> + </div> </form>'; } include('includes/footer.inc'); Modified: trunk/StockCostUpdate.php =================================================================== --- trunk/StockCostUpdate.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockCostUpdate.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -118,19 +118,21 @@ $myrow = DB_fetch_array($result); echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="2" class="selection">'; echo '<tr><th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" />'; echo '<input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">' . $StockID . ' - ' . $myrow['description'] . '</font></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</font></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</font></th></tr>'; +echo '<tr><th colspan="2">' . $StockID . ' - ' . $myrow['description'] . '</th></tr>'; +echo '<tr><th colspan="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</th></tr>'; +echo '<tr><th colspan="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</th></tr>'; if (($myrow['mbflag']=='D' AND $myrow['stocktype'] != 'L') OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K'){ - echo '</form>'; // Close the form + echo '</div> + </form>'; // Close the form if ($myrow['mbflag']=='D'){ echo '<br />' . $StockID .' ' . _('is a service item'); } else if ($myrow['mbflag']=='A'){ @@ -143,12 +145,13 @@ exit; } +echo '<tr><td>'; echo '<input type="hidden" name="OldMaterialCost" value="' . $myrow['materialcost'] .'" />'; echo '<input type="hidden" name="OldLabourCost" value="' . $myrow['labourcost'] .'" />'; echo '<input type="hidden" name="OldOverheadCost" value="' . $myrow['overheadcost'] .'" />'; echo '<input type="hidden" name="QOH" value="' . $myrow['totalqoh'] .'" />'; -echo '<tr><td>' . _('Last Cost') .':</td> +echo _('Last Cost') .':</td> <td class="number">' . locale_number_format($myrow['lastcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td></tr>'; if (! in_array($UpdateSecurity,$_SESSION['AllowedPageSecurityTokens'])){ echo '<tr><td>' . _('Cost') . ':</td> @@ -158,8 +161,8 @@ } else { if ($myrow['mbflag']=='M'){ - echo '<input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />'; - echo '<tr><td>' . _('Standard Material Cost Per Unit') .':</td> + echo '<tr><td><input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />'; + echo _('Standard Material Cost Per Unit') .':</td> <td class="number">' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td> </tr>'; echo '<tr> @@ -176,13 +179,14 @@ <td class="number"><input type="text" class="number" name="MaterialCost" value="' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td> </tr>'; } else { - echo '<input type="hidden" name="LabourCost" value="0" />'; - echo '<input type="hidden" name="OverheadCost" value="0" />'; + echo '<tr><td><input type="hidden" name="LabourCost" value="0" />'; + echo '<input type="hidden" name="OverheadCost" value="0" /></td></tr>'; } echo '</table> <br /> <div class="centre"> <input type="submit" name="UpdateData" value="' . _('Update') . '" /> + </div> <br /> <br />'; } @@ -193,7 +197,7 @@ echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>'; echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a></div>'; } -echo '</form> - </div>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vv...@us...> - 2012-04-15 23:55:03
|
Revision: 5245 http://web-erp.svn.sourceforge.net/web-erp/?rev=5245&view=rev Author: vvs2012 Date: 2012-04-15 23:54:56 +0000 (Sun, 15 Apr 2012) Log Message: ----------- xhtml Modified Paths: -------------- trunk/SMTPServer.php trunk/ShipmentCosting.php trunk/Shipments.php trunk/Shippers.php trunk/Shipt_Select.php trunk/ShiptsList.php trunk/SpecialOrder.php trunk/StockAdjustments.php trunk/StockAdjustmentsControlled.php trunk/StockCategories.php trunk/StockCheck.php trunk/StockCostUpdate.php Modified: trunk/SMTPServer.php =================================================================== --- trunk/SMTPServer.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/SMTPServer.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -80,6 +80,7 @@ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<input type="hidden" name="MailServerSetting" value="' . $MailServerSetting . '" />'; echo '<table class="selection">'; @@ -92,11 +93,11 @@ echo '<tr><td>'._('Authorisation Required').'</td><td>'; echo '<select name="Auth">'; if ($myrow['auth']==1) { - echo '<option selected value=1>'._('True').'</option>'; - echo '<option value=0>'._('False').'</option>'; + echo '<option selected="selected" value="1">'._('True').'</option>'; + echo '<option value="0">'._('False').'</option>'; } else { - echo '<option value=1>'._('True').'</option>'; - echo '<option selected value=0>'._('False').'</option>'; + echo '<option value="1">'._('True').'</option>'; + echo '<option selected="selected" value="0">'._('False').'</option>'; } echo '</select></td></tr>'; echo '<tr><td>'._('User Name').'</td> @@ -106,7 +107,9 @@ echo '<tr><td>'._('Timeout (seconds)').'</td> <td><input type="text" size="5" name="Timeout" class="number" value="'.$myrow['timeout'].'" /></td></tr>'; echo '<tr><td colspan="2"><div class="centre"><input type="submit" name="submit" value="' . _('Update') . '" /></div></td></tr>'; -echo '</table></form>'; +echo '</table> + </div> + </form>'; include('includes/footer.inc'); Modified: trunk/ShipmentCosting.php =================================================================== --- trunk/ShipmentCosting.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/ShipmentCosting.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -48,10 +48,10 @@ echo '<br /> <table class="selection"> <tr> - <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th> + <th colspan="4"><h3>'._('Shipment Details').'</h3></th> </tr> <tr> - <td><b>'. _('Shipment') .': </td> + <td><b>'. _('Shipment') .': </b></td> <td><b>' . $_GET['SelectedShipment'] . '</b></td> <td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td> </tr> @@ -142,7 +142,7 @@ echo '<br /><table cellpadding="2" class="selection">'; echo '<tr> - <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>'; + <th colspan="9"><h3>' . _('Items on shipment'). '</h3></th></tr>'; $TableHeader = '<tr> <th>'. _('Item'). '</th> @@ -528,7 +528,7 @@ echo '<table cellpadding="2" class="selection">'; echo '<tr> - <th colspan="6"><font color="navy" size="3">' . _('Shipment Charges Against Products'). '</font></th> + <th colspan="6"><h3>' . _('Shipment Charges Against Products'). '</h3></th> </tr>'; $TableHeader = '<tr> @@ -571,7 +571,7 @@ } echo '<tr> - <td colspan="5" class="number"><font color="blue"><b>'. _('Total Charges Against Shipment Items'). ':</b></font></td> + <td colspan="5" class="number"><b>'. _('Total Charges Against Shipment Items'). ':</b></td> <td class="number">' . locale_number_format($TotalItemShipmentChgs,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> </tr>'; @@ -605,7 +605,7 @@ echo '<table cellpadding="2" class="selection">'; echo '<tr> - <th colspan="6"><font color="navy" size="3">'._('General Shipment Charges').'</font></th> + <th colspan="6"><h3>'._('General Shipment Charges').'</h3></th> </tr>'; $TableHeader = '<tr> @@ -645,7 +645,7 @@ } echo '<tr> - <td class="number" colspan="4"><font color="blue"><b>'. _('Total General Shipment Charges'). ':</b></font></td> + <td class="number" colspan="4"><b>'. _('Total General Shipment Charges'). ':</b></td> <td class="number">' . locale_number_format($TotalGeneralShipmentChgs,$_SESSION['CompanyRecord']['decimalplaces']) . '</td></tr>'; echo '</table>'; Modified: trunk/Shipments.php =================================================================== --- trunk/Shipments.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/Shipments.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -298,11 +298,12 @@ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection"> <tr> - <td><b>'. _('Shipment').': </td> + <td><b>'. _('Shipment').': </b></td> <td><b>' . $_SESSION['Shipment']->ShiptRef . '</b></td> <td><b>'. _('From'). ' ' . $_SESSION['Shipment']->SupplierName . '</b></td> </tr>'; @@ -322,9 +323,9 @@ echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>'; if (isset($_SESSION['Shipment']->ETA)) { - echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>'; + echo '<td><input type="text" name="ETA" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="10" value="' . $ETA . '" /></td>'; } else { - echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>'; + echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>'; } echo '<td>'. _('Into').' '; @@ -392,7 +393,7 @@ /* Always display all shipment lines */ echo '<br /><table class="selection">'; - echo '<tr><th colspan="9"><font color="navy" size="3">'. _('Order Lines On This Shipment'). '</font></th></tr>'; + echo '<tr><th colspan="9"><h3>'. _('Order Lines On This Shipment'). '</h3></th></tr>'; $TableHeader = '<tr> <th>'. _('Order'). '</th> @@ -478,7 +479,7 @@ echo '<table cellpadding="2" class="selection">'; echo '<tr> - <th colspan="7"><font color="navy" size="3">'. _('Possible Order Lines To Add To This Shipment').'</font></th> + <th colspan="7"><h3>'. _('Possible Order Lines To Add To This Shipment').'</h3></th> </tr>'; $TableHeader = '<tr> @@ -526,7 +527,8 @@ echo '</table>'; } -echo '</form>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/Shippers.php =================================================================== --- trunk/Shippers.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/Shippers.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -142,7 +142,7 @@ printf('<td>%s</td> <td>%s</td> <td><a href="%sSelectedShipper=%s">'. _('Edit').'</a></td> - <td><a href="%sSelectedShipper=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this shipper?') . '\');">'. _('Delete'). '</a></td></tr>', + <td><a href="%sSelectedShipper=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this shipper?') . '\');">'. _('Delete'). '</a></td></tr>', $myrow[0], $myrow[1], htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' , @@ -165,6 +165,7 @@ if (!isset($_GET['delete'])) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedShipper)) { @@ -201,7 +202,7 @@ <div class="centre"> <input type="submit" name="submit" value="'. _('Enter Information').'" /> </div> - + </div> </form>'; } //end if record deleted no point displaying form to add record Modified: trunk/Shipt_Select.php =================================================================== --- trunk/Shipt_Select.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/Shipt_Select.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -27,6 +27,7 @@ } echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -151,10 +152,10 @@ echo '<table class="selection">'; echo '<tr> - <th colspan="5"><font size="3" color="navy">'._('To search for shipments for a specific part use the part selection facilities below') . '</font></th> + <th colspan="5"><h3>'._('To search for shipments for a specific part use the part selection facilities below') . '</h3></th> </tr> <tr> - <td><font size="1">' . _('Select a stock category') . ':</font> + <td>' . _('Select a stock category') . ': <select name="StockCat">'; while ($myrow1 = DB_fetch_array($result1)) { @@ -164,13 +165,13 @@ echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; } } -echo '</select> - <td><font size="1">' . _('Enter text extracts in the') . '<b> ' . _('description') . '</b>:</font></td> +echo '</select></td> + <td>' . _('Enter text extracts in the') . '<b> ' . _('description') . '</b>:</td> <td><input type="text" name="Keywords" size="20" maxlength="25" /></td> </tr> <tr> <td></td> - <td><font size="3"><b>' . _('OR') . ' </b></font><font size="1"> ' . _('Enter extract of the') . ' <b> ' . _('Stock Code') . '</b>:</font></td> + <td><b>' . _('OR') . ' </b> ' . _('Enter extract of the') . ' <b> ' . _('Stock Code') . '</b>:</td> <td><input type="text" name="StockCode" size="15" maxlength="18" /></td> </tr> </table> @@ -319,7 +320,7 @@ if ($myrow['closed']==0){ - $URL_Close_Shipment = $URL_View_Shipment . '&Close=Yes'; + $URL_Close_Shipment = $URL_View_Shipment . '&Close=Yes'; printf('<td>%s</td> <td>%s</td> @@ -367,6 +368,7 @@ } // end if shipments to show } -echo '</form>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/ShiptsList.php =================================================================== --- trunk/ShiptsList.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/ShiptsList.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -34,7 +34,7 @@ echo '<table cellpadding="2" class="selection">'; echo '<tr> - <th>'. _('Reference'). '</a></th> + <th>'. _('Reference'). '</th> <th>'. _('Vessel'). '</th> <th>'. _('ETA'). '</th></tr>'; Modified: trunk/SpecialOrder.php =================================================================== --- trunk/SpecialOrder.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/SpecialOrder.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -19,6 +19,7 @@ } echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($_GET['NewSpecial']) and $_GET['NewSpecial']=='yes'){ @@ -119,12 +120,12 @@ echo '<div class="centre">'; if (!isset($_SESSION['SPL'.$identifier]->BranchCode)){ echo '<br /> - <font size="4" color="blue">' . _('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ')'; + <h2>' . htmlspecialchars(_('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ')', ENT_QUOTES, 'UTF-8', false); } else { echo '<br /> - <font size="4" color="blue">' . _('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ') - ' . _('delivered to') . ' ' . $_SESSION['SPL'.$identifier]->BranchName . ' ' . _('branch'); + <h2>' . htmlspecialchars(_('Purchase from') . ' ' . $_SESSION['SPL'.$identifier]->SupplierName . ' ' . _('in') . ' ' . $_SESSION['SPL'.$identifier]->SuppCurrCode . ' ' . _('for') . ' ' . $_SESSION['SPL'.$identifier]->CustomerName . ' (' . $_SESSION['SPL'.$identifier]->CustCurrCode . ') - ' . _('delivered to') . ' ' . $_SESSION['SPL'.$identifier]->BranchName . ' ' . _('branch'), ENT_QUOTES, 'UTF-8', false); } -echo '</font></div>'; +echo '</h2></div>'; /*if the branch details and delivery details have not been entered then select them from the list */ if (!isset($_SESSION['SPL'.$identifier]->BranchCode)){ @@ -167,14 +168,15 @@ <td>%s</td> </tr>', $myrow['branchcode'], - $myrow['brname']); + htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false)); //end of page full new headings if } //end of while loop echo '</table>'; - echo '</form>'; + echo '</div> + </form>'; include('includes/footer.inc'); exit; @@ -431,7 +433,7 @@ '" . $SPLLine->Cost . "')"; - $ErrMsg = _('The item record for line') . ' ' . $SPLLine->LineNo . ' ' . _('could not be create because'); + $ErrMsg = _('The item record for line') . ' ' . $SPLLine->LineNo . ' ' . _('could not be created because'); $DbgMsg = _('The SQL statement used to insert the item and failed was'); $result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true); @@ -596,7 +598,7 @@ while ($LocnRow=DB_fetch_array($LocnResult)){ if ($_SESSION['SPL'.$identifier]->StkLocation == $LocnRow['loccode']){ - echo '<option selected="True" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>'; } else { echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>'; } @@ -679,13 +681,13 @@ /*Set up the form to enter new special items into */ -echo '<table>'; - echo '<input type="hidden" name="LineNo" value="' . ($_SESSION['SPL'.$identifier]->LinesOnOrder + 1) .'" />'; if (!isset($_POST['ItemDescription'])) { $_POST['ItemDescription']=''; } + +echo '<table>'; echo '<tr> <td>' . _('Ordered item Description') . ':</td> <td><input type="text" name="ItemDescription" size="40" maxlength="40" value="' . $_POST['ItemDescription'] . '" /></td> @@ -702,7 +704,7 @@ while ($myrow=DB_fetch_array($result)){ if (isset($_POST['StkCat']) and $myrow['categoryid']==$_POST['StkCat']){ - echo '<option selected="True" value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>'; } else { echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>'; } @@ -753,6 +755,7 @@ <br /> <input type="submit" name="Commit" value="' . _('Process This Order') . '" /> </div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/StockAdjustments.php =================================================================== --- trunk/StockAdjustments.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockAdjustments.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -115,7 +115,7 @@ echo '<tr> <td>'.$myrow[0].'</td> <td>'.$myrow[1].'</td> - <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a> + <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a> </tr>'; } echo '</table>'; @@ -353,6 +353,7 @@ echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (!isset($_SESSION['Adjustment' . $identifier])) { @@ -381,7 +382,7 @@ echo '<br /> <table class="selection"> <tr> - <th colspan="4"><font color=blue size="3">'._('Adjustment Details').'</font></th> + <th colspan="4"><h3>'._('Adjustment Details').'</h3></th> </tr>'; if (!isset($_GET['Description'])) { $_GET['Description']=''; @@ -406,7 +407,7 @@ </tr>'; if (isset($_SESSION['Adjustment' . $identifier]) AND mb_strlen($_SESSION['Adjustment' . $identifier]->ItemDescription)>1){ echo '<tr> - <td colspan="3"><font color="blue" size="3">' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Adjustment' . $identifier]->PartUnit . ' ) - ' . _('Unit Cost').' = ' . locale_number_format($_SESSION['Adjustment' . $identifier]->StandardCost,4) . '</font></td> + <td colspan="3"><h3>' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Adjustment' . $identifier]->PartUnit . ' ) - ' . _('Unit Cost').' = ' . locale_number_format($_SESSION['Adjustment' . $identifier]->StandardCost,4) . '</h3></td> </tr>'; } @@ -477,7 +478,7 @@ echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']. '</option>'; } } -echo '</select></td>'; +echo '</select></td></tr>'; // End select tag echo '</table> @@ -495,12 +496,14 @@ echo '<br /> <a href="'.$rootpath.'/StockMovements.php?StockID=' . $StockID . '">'._('Show Movements').'</a>'; echo '<br /> - <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">'._('Show Stock Usage').'</a>'; + <a href="'.$rootpath.'/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">'._('Show Stock Usage').'</a>'; echo '<br /> - <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem='. $StockID .'&StockLocation=' . $_POST['StockLocation'] . '">'. _('Search Outstanding Sales Orders').'</a>'; + <a href="'.$rootpath.'/SelectSalesOrder.php?SelectedStockItem='. $StockID .'&StockLocation=' . $_POST['StockLocation'] . '">'. _('Search Outstanding Sales Orders').'</a>'; echo '<br /> <a href="'.$rootpath.'/SelectCompletedOrder.php?SelectedStockItem=' . $StockID .'">'._('Search Completed Sales Orders').'</a>'; -echo '</div></form>'; +echo '</div> + </div> + </form>'; include('includes/footer.inc'); ?> Modified: trunk/StockAdjustmentsControlled.php =================================================================== --- trunk/StockAdjustmentsControlled.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockAdjustmentsControlled.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -47,7 +47,7 @@ echo '<br /><a href="'.$rootpath.'/StockAdjustments.php?identifier='.$identifier.'">' . _('Back to Adjustment Screen') . '</a>'; -echo '<br /><font size="2"><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ; +echo '<br /><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ; /** vars needed by InputSerialItem : **/ $LocationOut = $_SESSION['Adjustment'.$identifier]->StockLocation; @@ -67,7 +67,7 @@ include('includes/footer.inc'); exit; } -echo '</b></font></div>'; +echo '</b></div>'; include ('includes/InputSerialItems.php'); /*TotalQuantity set inside this include file from the sum of the bundles Modified: trunk/StockCategories.php =================================================================== --- trunk/StockCategories.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockCategories.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -260,8 +260,8 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this stock category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '");">' . _('Delete') . '</td> + <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this stock category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow['categoryid'], $myrow['categorydescription'], @@ -286,12 +286,13 @@ echo '<br />'; if (isset($SelectedCategory)) { - echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" >' . _('Show All Stock Categories') . '</a></div>'; + echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" >' . _('Show All Stock Categories') . '</a>'; } +echo '<form id="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; +echo '<div>'; echo '<br />'; -echo '<form name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedCategory)) { @@ -399,22 +400,22 @@ echo '</select></td> </tr>'; -echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />'; +echo '<tr><td><input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />'; if (isset($_POST['StockType']) and $_POST['StockType']=='L') { $Result = $PnLAccountsResult; - echo '<tr><td>' . _('Recovery GL Code'); + echo _('Recovery GL Code'); } else { $Result = $BSAccountsResult; - echo '<tr><td>' . _('Stock GL Code'); + echo _('Stock GL Code'); } echo ':</td><td><select name="StockAct">'; while ($myrow = DB_fetch_array($Result)){ if (isset($_POST['StockAct']) and $myrow['accountcode']==$_POST['StockAct']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop DB_data_seek($PnLAccountsResult,0); @@ -426,9 +427,9 @@ while ($myrow = DB_fetch_array($BSAccountsResult)) { if (isset($_POST['WIPAct']) and $myrow['accountcode']==$_POST['WIPAct']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -441,9 +442,9 @@ while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['AdjGLAct']) and $myrow['accountcode']==$_POST['AdjGLAct']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -456,9 +457,9 @@ while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['IssueGLAct']) and $myrow['accountcode']==$_POST['IssueGLAct']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -471,9 +472,9 @@ while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['PurchPriceVarAct']) and $myrow['accountcode']==$_POST['PurchPriceVarAct']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -493,9 +494,9 @@ while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['MaterialUseageVarAc']) and $myrow['accountcode']==$_POST['MaterialUseageVarAc']) { - echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -540,9 +541,9 @@ </tr>'; $PropertyCounter =0; while ($myrow = DB_fetch_array($result)) { - echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />'; echo '<tr> - <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> + <td><input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />'; + echo '<input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> <td><select name="PropControlType' . $PropertyCounter . '">'; if ($myrow['controltype']==0){ echo '<option selected="selected" value="0">' . _('Text Box') . '</option>'; @@ -582,14 +583,14 @@ echo '<td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'" /></td>'; } - echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td> + echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '\');">' . _('Delete') . '</a></td> </tr>'; $PropertyCounter++; } //end loop around defined properties for this category - echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="NewProperty" />'; echo '<tr> - <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td> + <td><input type="hidden" name="PropID' . $PropertyCounter .'" value="NewProperty" />'; + echo '<input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td> <td><select name="PropControlType' . $PropertyCounter . '"> <option selected="selected" value="0">' . _('Text Box') . '</option> <option value="1">' . _('Select Box') . '</option> @@ -611,6 +612,7 @@ <div class="centre"> <input type="submit" name="submit" value="' . _('Enter Information') . '" /> </div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/StockCheck.php =================================================================== --- trunk/StockCheck.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockCheck.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -262,11 +262,12 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('print') . '" alt="" />' . ' ' . $title.'</p><br />'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <table class="selection">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; + echo '<div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; - echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td> + echo '<tr><td>' . _('From Inventory Category Code') . ':</td> <td><select name="FromCriteria">'; $sql="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid"; @@ -351,8 +352,9 @@ </table> <br /> <div class="centre"> - <input type="submit" Name="PrintPDF" value="' . _('Print and Process') . '" /> + <input type="submit" name="PrintPDF" value="' . _('Print and Process') . '" /> </div> + </div> </form>'; } include('includes/footer.inc'); Modified: trunk/StockCostUpdate.php =================================================================== --- trunk/StockCostUpdate.php 2012-04-14 07:55:06 UTC (rev 5244) +++ trunk/StockCostUpdate.php 2012-04-15 23:54:56 UTC (rev 5245) @@ -118,19 +118,21 @@ $myrow = DB_fetch_array($result); echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table cellpadding="2" class="selection">'; echo '<tr><th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" />'; echo '<input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">' . $StockID . ' - ' . $myrow['description'] . '</font></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</font></th></tr>'; -echo '<tr><th colspan="2"><font color="navy" size="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</font></th></tr>'; +echo '<tr><th colspan="2">' . $StockID . ' - ' . $myrow['description'] . '</th></tr>'; +echo '<tr><th colspan="2">'. _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] .'</th></tr>'; +echo '<tr><th colspan="2">'. _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) .'</th></tr>'; if (($myrow['mbflag']=='D' AND $myrow['stocktype'] != 'L') OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K'){ - echo '</form>'; // Close the form + echo '</div> + </form>'; // Close the form if ($myrow['mbflag']=='D'){ echo '<br />' . $StockID .' ' . _('is a service item'); } else if ($myrow['mbflag']=='A'){ @@ -143,12 +145,13 @@ exit; } +echo '<tr><td>'; echo '<input type="hidden" name="OldMaterialCost" value="' . $myrow['materialcost'] .'" />'; echo '<input type="hidden" name="OldLabourCost" value="' . $myrow['labourcost'] .'" />'; echo '<input type="hidden" name="OldOverheadCost" value="' . $myrow['overheadcost'] .'" />'; echo '<input type="hidden" name="QOH" value="' . $myrow['totalqoh'] .'" />'; -echo '<tr><td>' . _('Last Cost') .':</td> +echo _('Last Cost') .':</td> <td class="number">' . locale_number_format($myrow['lastcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td></tr>'; if (! in_array($UpdateSecurity,$_SESSION['AllowedPageSecurityTokens'])){ echo '<tr><td>' . _('Cost') . ':</td> @@ -158,8 +161,8 @@ } else { if ($myrow['mbflag']=='M'){ - echo '<input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />'; - echo '<tr><td>' . _('Standard Material Cost Per Unit') .':</td> + echo '<tr><td><input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />'; + echo _('Standard Material Cost Per Unit') .':</td> <td class="number">' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td> </tr>'; echo '<tr> @@ -176,13 +179,14 @@ <td class="number"><input type="text" class="number" name="MaterialCost" value="' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td> </tr>'; } else { - echo '<input type="hidden" name="LabourCost" value="0" />'; - echo '<input type="hidden" name="OverheadCost" value="0" />'; + echo '<tr><td><input type="hidden" name="LabourCost" value="0" />'; + echo '<input type="hidden" name="OverheadCost" value="0" /></td></tr>'; } echo '</table> <br /> <div class="centre"> <input type="submit" name="UpdateData" value="' . _('Update') . '" /> + </div> <br /> <br />'; } @@ -193,7 +197,7 @@ echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>'; echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a></div>'; } -echo '</form> - </div>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |