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. |