From: <vv...@us...> - 2012-04-01 21:33:50
|
Revision: 5194 http://web-erp.svn.sourceforge.net/web-erp/?rev=5194&view=rev Author: vvs2012 Date: 2012-04-01 21:33:43 +0000 (Sun, 01 Apr 2012) Log Message: ----------- xhtml Modified Paths: -------------- trunk/Labels.php trunk/Locations.php trunk/MRP.php trunk/MRPCalendar.php trunk/MRPCreateDemands.php trunk/MRPDemandTypes.php trunk/MRPDemands.php trunk/MRPPlannedPurchaseOrders.php trunk/MRPPlannedWorkOrders.php trunk/MRPReport.php trunk/MRPReschedules.php trunk/MRPShortages.php Modified: trunk/Labels.php =================================================================== --- trunk/Labels.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/Labels.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -271,22 +271,25 @@ echo '<br /> <form action="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'" method="post"> + <div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <div class="centre"> <table border="2" cellspacing="4" class="selection"> <tbody> <tr> - <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0" /></td> + <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" alt="" /></td> <td>'.$TableGD.'</td> </tr> <tr> - <td align="center"><IMG src="'.$rootpath.'/css/labelsDim.png" align="top" border="0" /></td> + <td align="center"><img src="'.$rootpath.'/css/labelsDim.png" alt="" /></td> <td>'.$TableLines.'</td> </tr> </tbody> </table> <br /><input type="submit" name="'.$name.'" value="'.$value.'" /> <input type="submit" name="Cancel" value="'.$vCancel.'" /> + </div> + </div> </form>'; } @@ -308,7 +311,7 @@ if ($tag['type']=='s') { $input ='<select name="'. $iTag . '">'; foreach ($tag['values'] as $i=>$val) { - $xSel = ($vDat==$i)?' selected' : ''; + $xSel = ($vDat==$i)?' selected="selected"' : ''; $input .= ' <option value="'. $i .'"'. $xSel .'>'.$val.'</option>'; } @@ -317,8 +320,8 @@ } else { $ro=''; if ($ReadOnly AND $specialTag==$iTag) - $ro='readonly '; - $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'"'. $ro .' />'; + $ro='readonly="readonly"'; + $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'" '. $ro .' />'; } if (!$iCol++) // when zero begins a line $html .= ' @@ -377,7 +380,7 @@ if ($tag['type']=='s') { $input ='<select name="'. $iTag . '[]">'; foreach ($tag['values'] as $kI=>$kVal) { - $xSel = ($vDat==$kI) ? ' selected':''; + $xSel = ($vDat==$kI) ? ' selected="selected"':''; $input .= ' <option value="'. $kI .'"'. $xSel .'>'.$kVal.'</option>'; } @@ -422,10 +425,12 @@ } } </script> - <form action="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'" method="post" id="form1" target="_self"> + <form action="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'" method="post" id="form1"> + <div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <input type="hidden" name="action" id="action" value="" /> <input type="hidden" name="labelID" id="labelID" value="" /> + </div> </form> <div class="centre"> <table class="selection"> Modified: trunk/Locations.php =================================================================== --- trunk/Locations.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/Locations.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -388,8 +388,8 @@ printf('<td>%s</td> <td>%s</td> <td>%s</td> - <td><a href="%sSelectedLocation=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedLocation=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this inventory location?') . '\');">' . _('Delete') . '</td> + <td><a href="%sSelectedLocation=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedLocation=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this inventory location?') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow['loccode'], $myrow['locationname'], @@ -415,6 +415,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($SelectedLocation)) { @@ -478,7 +479,7 @@ } echo '<table class="selection"> <tr> - <th colspan="2"><font size="3" color="blue">'._('New Location details').'</font></th> + <th colspan="2"><h3>'._('New Location details').'</h3></th> </tr>'; echo '<tr> <td>' . _('Location Code') . ':</td> @@ -605,6 +606,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/MRP.php =================================================================== --- trunk/MRP.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRP.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -542,7 +542,7 @@ } echo '<table class="selection"> <tr> - <th colspan="3"><font color="blue" size="3">'._('Last Run Details').'</font></th> + <th colspan="3"><h3>'._('Last Run Details').'</h3></th> </tr> <tr> <td>' . _('Last Run Time') . ':</td><td>' . $myrow['runtime'] . '</td> @@ -573,11 +573,12 @@ </tr> </table>'; } - echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<br /><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection"> <tr> - <th colspan="3"><font color="blue" size="3">'._('This Run Details').'</font></th> + <th colspan="3"><h3>'._('This Run Details').'</h3></th> </tr> <tr> <td>' . _('Location') . '</td> @@ -598,23 +599,23 @@ echo '<tr> <td>' . _('Days Leeway') . ':</td> - <td><input type="text" name="Leeway" class="number" size="4" value="' . $leeway . '" /> + <td><input type="text" name="Leeway" class="number" size="4" value="' . $leeway . '" /></td> </tr> <tr> <td>' ._('Use MRP Demands?') . ':</td> - <td><input type="checkbox" name="usemrpdemands" value="y" checked /></td> + <td><input type="checkbox" name="usemrpdemands" value="y" checked="checked" /></td> </tr> <tr> <td>' ._('Use EOQ?') . ':</td> - <td><input type="checkbox" name="eoqflag" value="y" checked /></td> + <td><input type="checkbox" name="eoqflag" value="y" checked="checked" /></td> </tr> <tr> <td>' ._('Use Pan Size?') . ':</td> - <td><input type="checkbox" name="pansizeflag" value="y" checked /></td> + <td><input type="checkbox" name="pansizeflag" value="y" checked="checked" /></td> </tr> <tr> <td>' ._('Use Shrinkage?') . ':</td> - <td><input type="checkbox" name="shrinkageflag" value="y" checked /></td> + <td><input type="checkbox" name="shrinkageflag" value="y" checked="checked" /></td> </tr> </table> <div class="centre"> @@ -622,6 +623,7 @@ <br /> <input type="submit" name="submit" value="' . _('Run MRP') . '" /> </div> + </div> </form>'; } // End of Main program logic ------------------------------------------------------- Modified: trunk/MRPCalendar.php =================================================================== --- trunk/MRPCalendar.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPCalendar.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -215,7 +215,7 @@ echo '<br /> <table class="selection"> - <tr bgcolor ="#800000"> + <tr> <th>' . _('Date') . '</th> <th>' . _('Manufacturing Date') . '</th> </tr>'; @@ -253,6 +253,7 @@ $_POST['ToDate']=date($_SESSION['DefaultDateFormat']); } 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'] . '" />'; @@ -262,7 +263,7 @@ echo '<tr> <td>' . _('From Date') . ':</td> <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] .'" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] . '" /></td></tr> - <tr></tr><td>' . _('To Date') . ':</td> + <tr><td>' . _('To Date') . ':</td> <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] .'" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td> </tr> <tr><td></td></tr> @@ -316,6 +317,7 @@ </table> <br /> <br /> + </div> </form>'; } // End of function display() Modified: trunk/MRPCreateDemands.php =================================================================== --- trunk/MRPCreateDemands.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPCreateDemands.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -194,6 +194,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</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 '<table class="selection"> <tr> @@ -260,7 +261,8 @@ </tr> <tr> <td>' . _('Exclude Total Quantity Less Than') . ':</td> - <td><input type ="text" class="number" name="ExcludeQuantity" size="4" value="1" /> + <td><input type ="text" class="number" name="ExcludeQuantity" size="4" value="1" /></td> + </tr> <tr> <td>' . _('Exclude Total Dollars Less Than') . ':</td> <td><input type ="text" class="number" name="ExcludeAmount" size="8" value="0" /></td> @@ -277,6 +279,8 @@ <div class="centre"> <input type="submit" name="submit" value="' . _('Submit') . '" /> </div>'; +echo '</div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/MRPDemandTypes.php =================================================================== --- trunk/MRPDemandTypes.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPDemandTypes.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -117,8 +117,8 @@ printf('<tr><td>%s</td> <td>%s</td> - <td><a href="%sSelectedDT=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedDT=%s&delete=yes">' . _('Delete') .'</td> + <td><a href="%sSelectedDT=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedDT=%s&delete=yes">' . _('Delete') .'</a></td> </tr>', $myrow[0], $myrow[1], @@ -137,7 +137,8 @@ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show all Demand Types') . '</a></div>'; } -echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">'; +echo '<br /><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($SelectedDT) and !isset($_GET['delete'])) { @@ -186,6 +187,7 @@ <div class="centre"> <input type="submit" name="submit" value="' . _('Enter Information') . '" /> </div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/MRPDemands.php =================================================================== --- trunk/MRPDemands.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPDemands.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -85,8 +85,9 @@ // If the SELECT found records, display them if (DB_num_rows($result) > 0) { 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" colspan="7" class="selection">'; + echo '<table cellpadding="2" class="selection">'; $TableHeader = '<tr><th>' . _('Code') . '</th> <th>' . _('Description') . '</th> </tr>'; @@ -103,13 +104,14 @@ $k++; } $tabindex=$j+4; - echo '<td><input tabindex="' . $tabindex . '" type="submit" name="StockID" value="' . $myrow['stockid'] .'"</td> + echo '<td><input tabindex="' . $tabindex . '" type="submit" name="StockID" value="' . $myrow['stockid'] .'" /></td> <td>' . $myrow['description'] . '</td> </tr>'; $j++; } //end of while loop echo '</table>'; + echo '</div>'; echo '</form>'; } else { @@ -263,6 +265,7 @@ // demandtype echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $where = " "; if ($DemandType) { @@ -287,7 +290,7 @@ $result = DB_query($sql,$db,$ErrMsg); echo '<table class="selection"> - <tr bgcolor =#800000> + <tr> <th>' . _('Part Number') . '</th> <th>' . _('Description') . '</th> <th>' . _('Demand Type') . '</th> @@ -303,8 +306,8 @@ <td>' . $myrow['mrpdemandtype'] . '</td> <td>' . locale_number_format($myrow['quantity'],$myrow['decimalplaces']) . '</td> <td>' . $displaydate . '</td> - <td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?DemandID=' . $myrow['demandid'] . '&StockID=' . $myrow['stockid'] . '">' . _('Edit') . '</td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DemandID=' . $myrow['demandid'] . '&StockID=' . $myrow['stockid'].'&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this demand?') . '\');">' . _('Delete') .'</td> + <td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?DemandID=' . $myrow['demandid'] . '&StockID=' . $myrow['stockid'] . '">' . _('Edit') . '</a></td> + <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DemandID=' . $myrow['demandid'] . '&StockID=' . $myrow['stockid'].'&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this demand?') . '\');">' . _('Delete') .'</a></td> </tr>'; } @@ -312,6 +315,7 @@ echo '<tr><td>' . _('Number of Records') . '</td> <td>' . $ctr . '</td></tr>'; echo '</table>'; + echo '</div>'; echo '</form><br/><br/><br/><br/>'; unset ($StockID); display($db,$StockID,$DemandID); @@ -325,16 +329,17 @@ // the page is called, and is also invoked at the end of all of the other functions. // echo "<br/>DISPLAY - DemandID = $DemandID<br/>"; 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($StockID)) { - echo'</font><table cellpadding="3" colspan="4" class="selection"><tr> - <td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td> + echo'<table cellpadding="3" class="selection"><tr> + <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td> <td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td> + <td><b>' . _('OR') . '</b></td> + <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td> <td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20" /></td> - <td><font size="3"><b>' . _('OR') . '</b></font></td> - <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?listall=yes"><font size="3">' . _('List All Demands') .'</font></a></td></tr> + <td><b>' . _('OR') . '</b></td> + <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?listall=yes">' . _('List All Demands') .'</a></td></tr> <tr><td colspan="7"><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') . '" /></div></td></tr></table>'; } else { @@ -416,13 +421,14 @@ </table> <br /> <div class="centre"> - <input type="submit" name="submit" value="' . _('Enter Information') . '" />   - <input type="submit" name="listsome" value="' . _('List Selection') . '" />   + <input type="submit" name="submit" value="' . _('Enter Information') . '" /> + <input type="submit" name="listsome" value="' . _('List Selection') . '" /> <input type="submit" name="deletesome" value="' . _('Delete Demand Type') . '" />'; // If mrpdemand record exists, display option to delete it if ((isset($DemandID)) AND (DB_num_rows($result) > 0)) { - echo '<br/><br/><a href=" ' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?delete=yes&StockID='.$StockID.'&DemandID=' . $DemandID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this demand?') . '\');">' . _('Or Delete Record') ; + echo '<br/><br/><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?delete=yes&StockID='.$StockID.'&DemandID=' . $DemandID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this demand?') . '\');">' . _('Or Delete Record') . '</a>'; } + echo '</div>'; } echo '</div> </form>'; Modified: trunk/MRPPlannedPurchaseOrders.php =================================================================== --- trunk/MRPPlannedPurchaseOrders.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPPlannedPurchaseOrders.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -264,20 +264,24 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>'; - 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"> + <div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; echo '<tr><td>' . _('Consolidation') . ':</td><td><select name="Consolidation">'; echo '<option selected="selected" value="None">' . _('None') . '</option>'; echo '<option value="Weekly">' . _('Weekly') . '</option>'; echo '<option value="Monthly">' . _('Monthly') . '</option>'; echo '</select></td></tr>'; echo '<tr><td>' . _('Print Option') . ':</td><td><select name="Fill">'; - echo '<option selected="selected" value="yes">' . _('Print With Alternating Highlighted Lines'); - echo '<option value="no">' . _('Plain Print'); + echo '<option selected="selected" value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>'; + echo '<option value="no">' . _('Plain Print') . '</option>'; echo '</select></td></tr>'; - echo '<tr><td>' . _('Cut Off Date') . ':</td><td><input type ="text" class=date alt="'.$_SESSION['DefaultDateFormat'] . + echo '<tr><td>' . _('Cut Off Date') . ':</td><td><input type ="text" class="date" alt="'.$_SESSION['DefaultDateFormat'] . '" name="cutoffdate" size="10" value="'.date($_SESSION['DefaultDateFormat']).'" /></td></tr>'; - echo '</table><p><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div></form>'; + echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div> + </div> + </form>'; include('includes/footer.inc'); Modified: trunk/MRPPlannedWorkOrders.php =================================================================== --- trunk/MRPPlannedWorkOrders.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPPlannedWorkOrders.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -159,7 +159,7 @@ } // Print information on part break - if ($PartCounter > 0 & $HoldPart != $myrow['part']) { + if ($PartCounter > 0 AND $HoldPart != $myrow['part']) { $pdf->addTextWrap(50,$YPos,130,$FontSize,$HoldDescription,'',0,$fill); $pdf->addTextWrap(180,$YPos,40,$FontSize,_('Unit Cost: '),'center',0,$fill); $pdf->addTextWrap(220,$YPos,40,$FontSize,locale_number_format($HoldCost,$_SESSION['CompanyRecord']['decimalplaces']),'right',0,$fill); @@ -247,10 +247,11 @@ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>'; echo '<form action="MRPConvertWorkOrders.php" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection">'; - echo '<tr><th colspan="9"><font size="3" color="blue">' . _('Consolidation') . ': ' . $_POST['Consolidation'] . - " " . _('Cutoff Date') . ': ' . $_POST['cutoffdate'] . '</font></th></tr>'; + echo '<tr><th colspan="9"><h3>' . _('Consolidation') . ': ' . $_POST['Consolidation'] . + " " . _('Cutoff Date') . ': ' . $_POST['cutoffdate'] . '</h3></th></tr>'; echo '<tr> <th></th> <th>' . _('Code') . '</th> @@ -279,7 +280,7 @@ $k++; } - echo '<td><a href="' . $rootpath . '/WorkOrderEntry.php?NewItem=' . $myrow['part'] . '&ReqQty=' . $myrow['supplyquantity'] . '&ReqDate=' . $myrow['duedate'] . '">' . _('Convert') . '</a></td> + echo '<td><a href="' . $rootpath . '/WorkOrderEntry.php?NewItem=' . $myrow['part'] . '&ReqQty=' . $myrow['supplyquantity'] . '&ReqDate=' . $myrow['duedate'] . '">' . _('Convert') . '</a></td> <td>' . $myrow['part'] . ' <input type="hidden" name="' . $j . '_part" value="' . $myrow['part']. '" /></td> <td>' . $myrow['description'] . '</td> <td>' . ConvertSQLDate($myrow['mrpdate']) . '</td> @@ -304,6 +305,8 @@ <td colspan="4" class="number">' . _('Total Extended Cost') . ': ' . locale_number_format($Total_ExtCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> </tr> </table>'; + echo '</div> + </form>'; echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>'; include('includes/footer.inc'); @@ -317,9 +320,10 @@ echo '<p class="page_title_text"> <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>'; - echo '<br /><br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"><table class="selection">'; + echo '<br /><br /><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>' . _('Consolidation') . ':</td><td><select name="Consolidation">'; echo '<option selected="selected" value="None">' . _('None') . '</option>'; echo '<option value="Weekly">' . _('Weekly') . '</option>'; @@ -335,6 +339,8 @@ <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'" /></td> </tr>'; echo '</table><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '" /> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>'; + echo '</div> + </form>'; include('includes/footer.inc'); Modified: trunk/MRPReport.php =================================================================== --- trunk/MRPReport.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPReport.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -505,12 +505,13 @@ 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'); + echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up'); echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>'; exit; } 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') . '" alt="" />' . ' ' . _('Search for Inventory Items').'</p>'; echo '<table class="selection"><tr>'; @@ -531,7 +532,7 @@ echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; } } - echo '</select>'; + echo '</select></td>'; echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>'; if (isset($_POST['Keywords'])) { echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />'; @@ -539,7 +540,7 @@ echo '<input type="text" name="Keywords" size="20" maxlength="25" />'; } echo '</td></tr><tr><td></td>'; - echo '<td><font size 3><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>'; + echo '<td><h3><b>' . _('OR') . ' ' . '</b></h3>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>'; echo '<td>'; if (isset($_POST['StockCode'])) { echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />'; @@ -553,10 +554,10 @@ <div class="centre"> <input type="submit" name="Search" value="' . _('Search Now') . '" /> </div> - <br /> - </form>'; + <br />'; echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>'; + echo '</div>'; echo '</form>'; if (!isset($_POST['Search'])) { include('includes/footer.inc'); @@ -701,6 +702,7 @@ /* display list if there is more than one record */ if (isset($searchresult) AND !isset($_POST['Select'])) { echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $ListCount = DB_num_rows($searchresult); if ($ListCount > 0) { @@ -785,6 +787,7 @@ } //end of while loop echo '</table> + </div> </form> <br />'; } Modified: trunk/MRPReschedules.php =================================================================== --- trunk/MRPReschedules.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPReschedules.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -129,8 +129,9 @@ echo '<br /> <br /> <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> + <div> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <table class="selection"> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <tr> <td>' . _('Print Option') . ':</td> <td><select name="Fill"> @@ -150,7 +151,9 @@ <br /> <div class="centre"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /> - </div>'; + </div> + </div> + </form>'; include('includes/footer.inc'); Modified: trunk/MRPShortages.php =================================================================== --- trunk/MRPShortages.php 2012-04-01 17:56:40 UTC (rev 5193) +++ trunk/MRPShortages.php 2012-04-01 21:33:43 UTC (rev 5194) @@ -261,9 +261,9 @@ . _('Stock') . '" alt="" />' . ' ' . $title . '</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 '<table class="selection">'; - echo '</select></td></tr>'; echo '<tr><td>' . _('Inventory Category') . ':</td><td><select name="CategoryID">'; echo '<option selected="selected" value="All">' . _('All Stock Categories') .'</option>'; $sql = "SELECT categoryid, @@ -273,6 +273,7 @@ while ($myrow = DB_fetch_array($result)) { echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' .$myrow['categorydescription'] . '</option>'; } //end while loop + echo '</select></td></tr>'; echo '<tr><td>' . _('Sort') . ':</td> <td><select name="Sort"> <option selected="selected" value="extcost">' . _('Extended Shortage Dollars').'</option> @@ -300,7 +301,9 @@ <br /> <div class="centre"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /> - </div>'; + </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. |