From: <vv...@us...> - 2012-02-27 22:29:59
|
Revision: 4983 http://web-erp.svn.sourceforge.net/web-erp/?rev=4983&view=rev Author: vvs2012 Date: 2012-02-27 22:29:51 +0000 (Mon, 27 Feb 2012) Log Message: ----------- xhtml cleanup Modified Paths: -------------- trunk/CompanyPreferences.php trunk/Credit_Invoice.php trunk/CustomerTransInquiry.php trunk/InventoryValuation.php trunk/PDFPriceList.php trunk/PDFRemittanceAdvice.php trunk/Payments.php trunk/PcReportTab.php trunk/ReorderLevel.php trunk/SalesAnalRepts.php trunk/SalesGraph.php trunk/SelectWorkOrder.php trunk/StockCounts.php trunk/StockDispatch.php trunk/StockLocTransfer.php trunk/StockTransfers.php trunk/SuppLoginSetup.php trunk/SuppPriceList.php trunk/SystemParameters.php trunk/Z_DataExport.php trunk/install/timezone.php trunk/reportwriter/admin/RCFunctions.inc Modified: trunk/CompanyPreferences.php =================================================================== --- trunk/CompanyPreferences.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/CompanyPreferences.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -151,9 +151,10 @@ } /* end of if submit */ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . - '" alt="" />' . ' ' . $title.'</p><br />'; + '" alt="" />' . ' ' . $title.'</p>'; 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 '<table class="selection">'; @@ -313,9 +314,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['DebtorsAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -330,9 +331,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['CreditorsAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="' . $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="' . $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -347,9 +348,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['PayrollAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -364,9 +365,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['GRNAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -380,9 +381,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['RetainedEarnings']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -405,9 +406,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['FreightAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -422,9 +423,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['ExchangeDiffAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -439,9 +440,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -456,9 +457,9 @@ while ($myrow = DB_fetch_row($result)) { if ($_POST['PytDiscountAct']==$myrow[0]){ - echo '<option selected="selected" value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option selected="selected" value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } else { - echo '<option value="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>'; + echo '<option value="'. $myrow[0] . '">' . htmlentities($myrow[1],ENT_QUOTES,'UTF-8') . ' ('.$myrow[0].')</option>'; } } //end while loop @@ -518,6 +519,7 @@ <div class="centre"> <input tabindex="26" type="submit" name="submit" value="' . _('Update') . '" /> </div>'; +echo '</div></form>'; include('includes/footer.inc'); ?> Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/Credit_Invoice.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -1511,7 +1511,7 @@ echo '<tr><td>' . _('Credit note text') . '</td><td><textarea tabindex="' . $j . '" name="CreditText" cols="31" rows="5">' . $_POST['CreditText'] . '</textarea></td></tr>'; echo '</table><br /><div class="centre"><input tabindex="' . $j . '" type="submit" name="Update" value="' . _('Update') . '" /><br />'; $j++; - echo '<input type="submit" tabindex="'.$j++.'" name="ProcessCredit" Value="' . _('Process Credit') .'" /></div>'; + echo '<input type="submit" tabindex="'.$j++.'" name="ProcessCredit" value="' . _('Process Credit') .'" /></div>'; } echo '</form>'; Modified: trunk/CustomerTransInquiry.php =================================================================== --- trunk/CustomerTransInquiry.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/CustomerTransInquiry.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -37,7 +37,7 @@ echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; } } else { - echo '<option Value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; + echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; } } echo '</select></td>'; Modified: trunk/InventoryValuation.php =================================================================== --- trunk/InventoryValuation.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/InventoryValuation.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -259,7 +259,7 @@ <td>' . _('Summary or Detailed Report') . ':</td> <td><select name="DetailedReport"> <option selected="selected" value="No">' . _('Summary Report') . '</option> - <option Value="Yes">' . _('Detailed Report') . '</option> + <option value="Yes">' . _('Detailed Report') . '</option> </select></td> </tr> </table> Modified: trunk/PDFPriceList.php =================================================================== --- trunk/PDFPriceList.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/PDFPriceList.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -286,27 +286,27 @@ $SalesTypesResult=DB_query($sql,$db); while ($myrow=DB_fetch_array($SalesTypesResult)){ - echo '<option Value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>'; + echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>'; } echo '</select></td></tr>'; echo '<tr><td>' . _('Show Gross Profit %') . ':</td> <td><select name="ShowGPPercentages">'; - echo '<option selected="selected" Value="No">'. _('Prices Only') . '</option>'; - echo '<option Value="Yes">'. _('Show GP % too') . '</option>'; + echo '<option selected="selected" value="No">'. _('Prices Only') . '</option>'; + echo '<option value="Yes">'. _('Show GP % too') . '</option>'; echo '</select></td></tr>'; echo '<tr><td>' . _('Price Listing Type'). ':</td><td><select name="CustomerSpecials">'; echo '<option selected="selected" value="Sales Type Prices">'. _('Default Sales Type Prices'); - echo '<option Value="Customer Special Prices Only">'. _('Customer Special Prices Only') . '</option>'; - echo '<option Value="Full Description">'. _('Full Description') . '</option>'; + echo '<option value="Customer Special Prices Only">'. _('Customer Special Prices Only') . '</option>'; + echo '<option value="Full Description">'. _('Full Description') . '</option>'; echo '</select></td></tr>'; echo '<tr><td>' . _('Effective As At') . ':</td>'; echo '<td><input type="text" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" />'; echo '</td></tr>'; - echo '</table><br /><div class="centre"><input type="submit" Name="PrintPDF" Value="'. _('Print PDF'). '" /></div>'; + echo '</table><br /><div class="centre"><input type="submit" Name="PrintPDF" value="'. _('Print PDF'). '" /></div>'; } include('includes/footer.inc'); Modified: trunk/PDFRemittanceAdvice.php =================================================================== --- trunk/PDFRemittanceAdvice.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/PDFRemittanceAdvice.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -167,7 +167,7 @@ echo '</table> <div class="centre"> - <input type="submit" Name="PrintPDF" Value="' . _('Print PDF') . '" /> + <input type="submit" Name="PrintPDF" value="' . _('Print PDF') . '" /> </div>'; include ('includes/footer.inc'); Modified: trunk/Payments.php =================================================================== --- trunk/Payments.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/Payments.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -1103,7 +1103,7 @@ </tr>'; echo '<input type="hidden" name="SuppName" value="' . $_SESSION['PaymentDetail' . $identifier]->SuppName . '" />'; } else { - echo '<input type="hidden" name="Discount" Value="0" />'; + echo '<input type="hidden" name="Discount" value="0" />'; } echo '</table><br />'; echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />'; Modified: trunk/PcReportTab.php =================================================================== --- trunk/PcReportTab.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/PcReportTab.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -67,7 +67,7 @@ echo '<tr><td>' . _('To Date:') .'</td><td>'; echo '<input tabindex="3" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" />'; echo '</td></tr></table><br />'; - echo '<div class="centre"><input type="submit" Name="ShowTB" Value="' . _('Show HTML') .'" />'; + echo '<div class="centre"><input type="submit" Name="ShowTB" value="' . _('Show HTML') .'" />'; echo '<input type="submit" name="PrintPDF" value="' . _('PrintPDF') . '" /></div>'; } else if (isset($_POST['PrintPDF'])) { Modified: trunk/ReorderLevel.php =================================================================== --- trunk/ReorderLevel.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/ReorderLevel.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -184,9 +184,9 @@ } while ($myrow=DB_fetch_array($resultStkLocs)){ if ($myrow['loccode'] == $_POST['StockLocation']){ - echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } else { - echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } echo '</select></td></tr>'; Modified: trunk/SalesAnalRepts.php =================================================================== --- trunk/SalesAnalRepts.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SalesAnalRepts.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -31,22 +31,22 @@ if ($GroupByDataX == 'Sales Type') { echo '<option selected="selected" value="Sales Type">' . _('Sales Type') . '</option>'; } else { - echo '<option Value="Sales Type">' . _('Sales Type') . '</option>'; + echo '<option value="Sales Type">' . _('Sales Type') . '</option>'; } if ($GroupByDataX == 'Product Type') { echo '<option selected="selected" value="Product Type">' . _('Product Type') . '</option>'; } else { - echo '<option Value="Product Type">' . _('Product Type') . '</option>'; + echo '<option value="Product Type">' . _('Product Type') . '</option>'; } if ($GroupByDataX == 'Customer Branch') { echo '<option selected="selected" value="Customer Branch">' . _('Customer Branch') . '</option>'; } else { - echo '<option Value="Customer Branch">' . _('Customer Branch') . '</option>'; + echo '<option value="Customer Branch">' . _('Customer Branch') . '</option>'; } if ($GroupByDataX == 'Sales Person') { echo '<option selected="selected" value="Sales Person">' . _('Sales Person') . '</option>'; } else { - echo '<option Value="Sales Person">' . _('Sales Person') . '</option>'; + echo '<option value="Sales Person">' . _('Sales Person') . '</option>'; } if ($GroupByDataX=='Not Used' OR $GroupByDataX == '' OR ! isset($GroupByDataX) OR is_null($GroupByDataX)){ echo '<option selected="selected" value="Not Used">' . _('Not Used') . '</option>'; @@ -470,7 +470,7 @@ echo '<option selected="selected" value="0">' . _('No') . '</option>'; echo '<option value="1">' . _('Yes') . '</option>'; } else { - echo 'OPTION value="0">' . _('No') . '</option>'; + echo '<option value="0">' . _('No') . '</option>'; echo '<option selected="selected" value="1">' . _('Yes') . '</option>'; } Modified: trunk/SalesGraph.php =================================================================== --- trunk/SalesGraph.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SalesGraph.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -189,7 +189,7 @@ 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>'; include('includes/footer.inc'); } else { Modified: trunk/SelectWorkOrder.php =================================================================== --- trunk/SelectWorkOrder.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SelectWorkOrder.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -128,7 +128,7 @@ } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } else { - echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } Modified: trunk/StockCounts.php =================================================================== --- trunk/StockCounts.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/StockCounts.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -126,7 +126,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> Modified: trunk/StockDispatch.php =================================================================== --- trunk/StockDispatch.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/StockDispatch.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -249,9 +249,9 @@ <td><select name="FromLocation"> '; while ($myrow=DB_fetch_array($resultStkLocs)){ if ($myrow['loccode'] == $_POST['FromLocation']){ - echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } else { - echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } echo '</select></td> Modified: trunk/StockLocTransfer.php =================================================================== --- trunk/StockLocTransfer.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/StockLocTransfer.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -237,7 +237,7 @@ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){ - echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; $_POST['FromStockLocation']=$myrow['loccode']; } else { echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; Modified: trunk/StockTransfers.php =================================================================== --- trunk/StockTransfers.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/StockTransfers.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -522,12 +522,12 @@ while ($myrow=DB_fetch_array($resultStkLocs)){ if (isset($_SESSION['Transfer']) AND isset($_SESSION['Transfer']->StockLocationTo)){ if ($myrow['loccode'] == $_SESSION['Transfer']->StockLocationTo){ - echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } else { echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } elseif ($myrow['loccode']==$_SESSION['UserStockLocation'] AND isset($_SESSION['Transfer'])){ - echo '<option selected="selected" Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; + echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; $_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>'; } else { echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; Modified: trunk/SuppLoginSetup.php =================================================================== --- trunk/SuppLoginSetup.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SuppLoginSetup.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -238,7 +238,7 @@ if(isset($_POST['PageSize']) and $_POST['PageSize']=='legal'){ echo '<option selected="selected" value="legal">' . _('Legal') . '</option>'; } else { - echo '<option Value="legal">' . _('Legal') . '</option>'; + echo '<option value="legal">' . _('Legal') . '</option>'; } if(isset($_POST['PageSize']) and $_POST['PageSize']=='legal_landscape'){ echo '<option selected="selected" value="legal_landscape">' . _('Legal') . ' ' . _('landscape') . '</option>'; Modified: trunk/SuppPriceList.php =================================================================== --- trunk/SuppPriceList.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SuppPriceList.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -233,7 +233,7 @@ if (isset($_POST['categoryid']) and ($myrow['categoryid'] == $_POST['categoryid'])) { echo '<option selected="selected" value="' . $myrow['categoryid'] . '">' . $myrow['categoryid']-$myrow['categorydescription'] . '</option>'; } else { - echo '<option Value="' . $myrow['categoryid'] . '">' .$myrow['categoryid'].' - '. $myrow['categorydescription'] . '</option>'; + echo '<option value="' . $myrow['categoryid'] . '">' .$myrow['categoryid'].' - '. $myrow['categorydescription'] . '</option>'; } } echo '</select></td> Modified: trunk/SystemParameters.php =================================================================== --- trunk/SystemParameters.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/SystemParameters.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -325,14 +325,16 @@ } /* end of if submit */ -echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '>'; +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 '<table cellpadding="2" class="selection" width="98%">'; $TableHeader = '<tr> <th>' . _('System Variable Name') . '</th> <th>' . _('Value') . '</th> - <th>' . _('Notes') . '</th>'; + <th>' . _('Notes') . '</th> + </tr>'; echo '<tr><th colspan="3">' . _('General Settings') . '</th></tr>'; echo $TableHeader; @@ -340,10 +342,10 @@ // DefaultDateFormat echo '<tr style="outline: 1px solid"><td>' . _('Default Date Format') . ':</td> <td><select name="X_DefaultDateFormat"> - <option '.(($_SESSION['DefaultDateFormat']=='d/m/Y')?'selected ':'').'Value="d/m/Y">d/m/Y</option> - <option '.(($_SESSION['DefaultDateFormat']=='d.m.Y')?'selected ':'').'Value="d.m.Y">d.m.Y</option> - <option '.(($_SESSION['DefaultDateFormat']=='m/d/Y')?'selected ':'').'Value="m/d/Y">m/d/Y</option> - <option '.(($_SESSION['DefaultDateFormat']=='Y/m/d')?'selected ':'').'Value="Y/m/d">Y/m/d</option> + <option '.(($_SESSION['DefaultDateFormat']=='d/m/Y')?'selected="selected" ':'').'value="d/m/Y">d/m/Y</option> + <option '.(($_SESSION['DefaultDateFormat']=='d.m.Y')?'selected="selected" ':'').'value="d.m.Y">d.m.Y</option> + <option '.(($_SESSION['DefaultDateFormat']=='m/d/Y')?'selected="selected" ':'').'value="m/d/Y">m/d/Y</option> + <option '.(($_SESSION['DefaultDateFormat']=='Y/m/d')?'selected="selected" ':'').'value="Y/m/d">Y/m/d</option> </select></td> <td>' . _('The default date format for entry of dates and display.') . '</td></tr>'; @@ -384,17 +386,17 @@ // Check Credit Limits echo '<tr style="outline: 1px solid"><td>' . _('Check Credit Limits') . ':</td> <td><select name="X_CheckCreditLimits"> - <option '.($_SESSION['CheckCreditLimits']==0?'selected ':'').'value="0">'._('Do not check').'</option> - <option '.($_SESSION['CheckCreditLimits']==1?'selected ':'').'value="1">'._('Warn on breach').'</option> - <option '.($_SESSION['CheckCreditLimits']==2?'selected ':'').'value="2">'._('Prohibit Sales').'</option> + <option '.($_SESSION['CheckCreditLimits']==0?'selected="selected" ':'').'value="0">'._('Do not check').'</option> + <option '.($_SESSION['CheckCreditLimits']==1?'selected="selected" ':'').'value="1">'._('Warn on breach').'</option> + <option '.($_SESSION['CheckCreditLimits']==2?'selected="selected" ':'').'value="2">'._('Prohibit Sales').'</option> </select></td> <td>' . _('Credit limits can be checked at order entry to warn only or to stop the order from being entered where it would take a customer account balance over their limit') . '</td></tr>'; // Show_Settled_LastMonth echo '<tr style="outline: 1px solid"><td>' . _('Show Settled Last Month') . ':</td> <td><select name="X_Show_Settled_LastMonth"> - <option '.($_SESSION['Show_Settled_LastMonth']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['Show_Settled_LastMonth']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['Show_Settled_LastMonth']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['Show_Settled_LastMonth']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('This setting refers to the format of customer statements. If the invoices and credit notes that have been paid and settled during the course of the current month should be shown then select Yes. Selecting No will only show currently outstanding invoices, credits and payments that have not been allocated') . '</td></tr>'; @@ -416,15 +418,15 @@ // SO_AllowSameItemMultipleTimes echo '<tr style="outline: 1px solid"><td>' . _('Sales Order Allows Same Item Multiple Times') . ':</td> <td><select name="X_SO_AllowSameItemMultipleTimes"> - <option '.($_SESSION['SO_AllowSameItemMultipleTimes']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['SO_AllowSameItemMultipleTimes']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['SO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['SO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td><td> </td></tr>'; //'AllowOrderLineItemNarrative' echo '<tr style="outline: 1px solid"><td>' . _('Order Entry allows Line Item Narrative') . ':</td> <td><select name="X_AllowOrderLineItemNarrative"> - <option '.($_SESSION['AllowOrderLineItemNarrative']=='1'?'selected ':'').'value="1">'._('Allow Narrative Entry').'</option> - <option '.($_SESSION['AllowOrderLineItemNarrative']=='0'?'selected ':'').'value="0">'._('No Narrative Line').'</option> + <option '.($_SESSION['AllowOrderLineItemNarrative']=='1'?'selected="selected" ':'').'value="1">'._('Allow Narrative Entry').'</option> + <option '.($_SESSION['AllowOrderLineItemNarrative']=='0'?'selected="selected" ':'').'value="0">'._('No Narrative Line').'</option> </select></td> <td>' . _('Select whether or not to allow entry of narrative on order line items. This narrative will appear on invoices and packing slips. Useful mainly for service businesses.') . '</td> </tr>'; @@ -432,8 +434,8 @@ //'RequirePickingNote' echo '<tr style="outline: 1px solid"><td>' . _('A picking note must be produced before an order can be delivered') . ':</td> <td><select name="X_RequirePickingNote"> - <option '.($_SESSION['RequirePickingNote']=='1'?'selected ':'').'value="1">'._('Yes').'</option> - <option '.($_SESSION['RequirePickingNote']=='0'?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['RequirePickingNote']=='1'?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.($_SESSION['RequirePickingNote']=='0'?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('Select whether or not a picking note must be produced before an order can be delivered to a customer.') . '</td> </tr>'; @@ -441,8 +443,8 @@ //UpdateCurrencyRatesDaily echo '<tr style="outline: 1px solid"><td>' . _('Auto Update Exchange Rates Daily') . ':</td> <td><select name="X_UpdateCurrencyRatesDaily"> - <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected ':'').'value="1">'._('Automatic').'</option> - <option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'</option> + <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected="selected" ':'').'value="1">'._('Automatic').'</option> + <option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected="selected" ':'').'value="0">'._('Manual').'</option> </select></td> <td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td> </tr>'; @@ -450,8 +452,8 @@ //Default Packing Note Format echo '<tr style="outline: 1px solid"><td>' . _('Format of Packing Slips') . ':</td> <td><select name="X_PackNoteFormat"> - <option '.($_SESSION['PackNoteFormat']=='1'?'selected ':'').'value="1">'._('Laser Printed').'</option> - <option '.($_SESSION['PackNoteFormat']=='2'?'selected ':'').'value="2">'._('Special Stationery').'</option> + <option '.($_SESSION['PackNoteFormat']=='1'?'selected="selected" ':'').'value="1">'._('Laser Printed').'</option> + <option '.($_SESSION['PackNoteFormat']=='2'?'selected="selected" ':'').'value="2">'._('Special Stationery').'</option> </select></td> <td>' . _('Choose the format that packing notes should be printed by default') . '</td> </tr>'; @@ -459,8 +461,8 @@ //Default Invoice Format echo '<tr style="outline: 1px solid"><td>' . _('Invoice Orientation') . ':</td> <td><select name="X_InvoicePortraitFormat"> - <option '.($_SESSION['InvoicePortraitFormat']=='0'?'selected ':'').'value="0">'._('Landscape').'</option> - <option '.($_SESSION['InvoicePortraitFormat']=='1'?'selected ':'').'value="1">'._('Portrait').'</option> + <option '.($_SESSION['InvoicePortraitFormat']=='0'?'selected="selected" ':'').'value="0">'._('Landscape').'</option> + <option '.($_SESSION['InvoicePortraitFormat']=='1'?'selected="selected" ':'').'value="1">'._('Portrait').'</option> </select></td> <td>' . _('Select the invoice layout') . '</td> </tr>'; @@ -468,8 +470,8 @@ //Blind packing note echo '<tr style="outline: 1px solid"><td>' . _('Show company details on packing slips') . ':</td> <td><select name="X_DefaultBlindPackNote"> - <option '.($_SESSION['DefaultBlindPackNote']=='1'?'selected ':'').'value="1">'._('Show Company Details').'</option> - <option '.($_SESSION['DefaultBlindPackNote']=='2'?'selected ':'').'value="2">'._('Hide Company Details').'</option> + <option '.($_SESSION['DefaultBlindPackNote']=='1'?'selected="selected" ':'').'value="1">'._('Show Company Details').'</option> + <option '.($_SESSION['DefaultBlindPackNote']=='2'?'selected="selected" ':'').'value="2">'._('Hide Company Details').'</option> </select></td> <td>' . _('Customer branches can be set by default not to print packing slips with the company logo and address. This is useful for companies that ship to customers customers and to show the source of the shipment would be inappropriate. There is an option on the setup of customer branches to ship blind, this setting is the default applied to all new customer branches') . '</td> </tr>'; @@ -477,9 +479,9 @@ // Working days on a week echo '<tr style="outline: 1px solid"><td>' . _('Working Days on a Week') . ':</td> <td><select name="X_WorkingDaysWeek"> - <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected ':'').'value="7">7 '._('working days').'</option> - <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected ':'').'value="6">6 '._('working days').'</option> - <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected ':'').'value="5">5 '._('working days').'</option> + <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected="selected" ':'').'value="7">7 '._('working days').'</option> + <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected="selected" ':'').'value="6">6 '._('working days').'</option> + <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected="selected" ':'').'value="5">5 '._('working days').'</option> </select></td> <td>' . _('Number of working days on a week') . '</td> </tr>'; @@ -488,23 +490,23 @@ echo '<tr style="outline: 1px solid"><td>' . _('Dispatch Cut-Off Time') . ':</td> <td><select name="X_DispatchCutOffTime">'; for ($i=0; $i < 24; $i++ ) - echo '<option '.($_SESSION['DispatchCutOffTime'] == $i?'selected ':'').'value="'.$i.'">'.$i; + echo '<option '.($_SESSION['DispatchCutOffTime'] == $i?'selected="selected" ':'').'value="'.$i.'">' . $i . '</option>'; echo '</select></td> <td>' . _('Orders entered after this time will default to be dispatched the following day, this can be over-ridden at the time of sales order entry') . '</td></tr>'; // AllowSalesOfZeroCostItems echo '<tr style="outline: 1px solid"><td>' . _('Allow Sales Of Zero Cost Items') . ':</td> <td><select name="X_AllowSalesOfZeroCostItems"> - <option '.($_SESSION['AllowSalesOfZeroCostItems']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['AllowSalesOfZeroCostItems']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['AllowSalesOfZeroCostItems']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['AllowSalesOfZeroCostItems']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('If an item selected at order entry does not have a cost set up then if this parameter is set to No then the order line will not be able to be entered') . '</td></tr>'; // CreditingControlledItems_MustExist echo '<tr style="outline: 1px solid"><td>' . _('Controlled Items Must Exist For Crediting') . ':</td> <td><select name="X_CreditingControlledItems_MustExist"> - <option '.($_SESSION['CreditingControlledItems_MustExist']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['CreditingControlledItems_MustExist']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['CreditingControlledItems_MustExist']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['CreditingControlledItems_MustExist']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('This parameter relates to the behaviour of the controlled items code. If a serial numbered item has not previously existed then a credit note for it will not be allowed if this is set to Yes') . '</td></tr>'; @@ -518,7 +520,7 @@ echo '<option selected="selected" value="">'._('Unavailable'); } else { while( $row = DB_fetch_array($result) ) { - echo '<option '.($_SESSION['DefaultPriceList'] == $row['typeabbrev']?'selected ':'').'value="'.$row['typeabbrev'].'">'.$row['sales_type']; + echo '<option '.($_SESSION['DefaultPriceList'] == $row['typeabbrev']?'selected="selected" ':'').'value="'.$row['typeabbrev'].'">' . $row['sales_type'] . '</option>'; } } echo '</select></td> @@ -534,7 +536,7 @@ echo '<option selected="selected" value="">'._('Unavailable') . '</option>'; } else { while( $row = DB_fetch_array($result) ) { - echo '<option '.($_SESSION['Default_Shipper'] == $row['shipper_id']?'selected ':'').'value="'.$row['shipper_id'].'">'.$row['shippername'] . '</option>'; + echo '<option '.($_SESSION['Default_Shipper'] == $row['shipper_id']?'selected="selected" ':'').'value="'.$row['shipper_id'].'">'.$row['shippername'] . '</option>'; } } echo '</select></td> @@ -543,8 +545,8 @@ // DoFreightCalc echo '<tr style="outline: 1px solid"><td>' . _('Do Freight Calculation') . ':</td> <td><select name="X_DoFreightCalc"> - <option '.($_SESSION['DoFreightCalc']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['DoFreightCalc']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['DoFreightCalc']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['DoFreightCalc']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('If this is set to Yes then the system will attempt to calculate the freight cost of a dispatch based on the weight and cubic and the data defined for each shipper and their rates for shipping to various locations. The results of this calculation will only be meaningful if the data is entered for the item weight and volume in the stock item setup for all items and the freight costs for each shipper properly maintained.') . '</td></tr>'; @@ -578,7 +580,7 @@ echo '<option selected="selected" value="">'._('Unavailable') . '</option>'; } else { while( $row = DB_fetch_array($result) ) { - echo '<option '.($_SESSION['DefaultTaxCategory'] == $row['taxcatid']?'selected ':'').'value="'.$row['taxcatid'].'">'.$row['taxcatname'] . '</option>'; + echo '<option '.($_SESSION['DefaultTaxCategory'] == $row['taxcatid']?'selected="selected" ':'').'value="'.$row['taxcatid'].'">'.$row['taxcatname'] . '</option>'; } } echo '</select></td> @@ -600,7 +602,7 @@ echo '<option selected="selected" value="">'._('Unavailable') . '</option>'; } else { while( $row = DB_fetch_array($result) ) { - echo '<option '.($_SESSION['CountryOfOperation'] == $row['currabrev']?'selected ':'').'value="'.$row['currabrev'].'">'.$row['country'] . '</option>'; + echo '<option '.($_SESSION['CountryOfOperation'] == $row['currabrev']?'selected="selected" ':'').'value="'.$row['currabrev'].'">'.$row['country'] . '</option>'; } } echo '</select></td> @@ -610,21 +612,21 @@ echo '<tr style="outline: 1px solid"><td>' . _('Standard Cost Decimal Places') . ':</td> <td><select name="X_StandardCostDecimalPlaces">'; for ($i=0; $i <= 4; $i++ ) - echo '<option '.($_SESSION['StandardCostDecimalPlaces'] == $i?'selected ':'').'value="'.$i.'">'.$i; + echo '<option '.($_SESSION['StandardCostDecimalPlaces'] == $i?'selected="selected" ':'').'value="'.$i.'">' . $i . '</option>'; echo '</select></td><td>' . _('Decimal Places to be used in Standard Cost') .'</td></tr>'; // NumberOfPeriodsOfStockUsage echo '<tr style="outline: 1px solid"><td>' . _('Number Of Periods Of StockUsage') . ':</td> <td><select name="X_NumberOfPeriodsOfStockUsage">'; for ($i=1; $i <= 12; $i++ ) - echo '<option '.($_SESSION['NumberOfPeriodsOfStockUsage'] == $i?'selected ':'').'value="'.$i.'">'.$i; + echo '<option '.($_SESSION['NumberOfPeriodsOfStockUsage'] == $i?'selected="selected" ':'').'value="'.$i.'">' . $i . '</option>'; echo '</select></td><td>' . _('In stock usage inquiries this determines how many periods of stock usage to show. An average is calculated over this many periods') .'</td></tr>'; //Show values on GRN echo '<tr style="outline: 1px solid"><td>' . _('Show order values on GRN') . ':</td> <td><select name="X_ShowValueOnGRN"> - <option '.($_SESSION['ShowValueOnGRN']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['ShowValueOnGRN']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['ShowValueOnGRN']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['ShowValueOnGRN']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('Should the value of the purchased stock be shown on the GRN screen') . '</td> </tr>'; @@ -632,16 +634,16 @@ // Check_Qty_Charged_vs_Del_Qty echo '<tr style="outline: 1px solid"><td>' . _('Check Quantity Charged vs Deliver Qty') . ':</td> <td><select name="X_Check_Qty_Charged_vs_Del_Qty"> - <option '.($_SESSION['Check_Qty_Charged_vs_Del_Qty']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['Check_Qty_Charged_vs_Del_Qty']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['Check_Qty_Charged_vs_Del_Qty']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['Check_Qty_Charged_vs_Del_Qty']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('In entry of AP invoices this determines whether or not to check the quantities received into stock tie up with the quantities invoiced') .'</td></tr>'; // Check_Price_Charged_vs_Order_Price echo '<tr style="outline: 1px solid"><td>' . _('Check Price Charged vs Order Price') . ':</td> <td><select name="X_Check_Price_Charged_vs_Order_Price"> - <option '.($_SESSION['Check_Price_Charged_vs_Order_Price']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['Check_Price_Charged_vs_Order_Price']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['Check_Price_Charged_vs_Order_Price']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['Check_Price_Charged_vs_Order_Price']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('In entry of AP invoices this parameter determines whether or not to check invoice prices tie up to ordered prices') .'</td></tr>'; @@ -658,15 +660,15 @@ // PO_AllowSameItemMultipleTimes echo '<tr style="outline: 1px solid"><td>' . _('Purchase Order Allows Same Item Multiple Times') . ':</td> <td><select name="X_PO_AllowSameItemMultipleTimes"> - <option '.($_SESSION['PO_AllowSameItemMultipleTimes']?'selected ':'').'value="1">'._('Yes') . '</option> - <option '.(!$_SESSION['PO_AllowSameItemMultipleTimes']?'selected ':'').'value="0">'._('No') . '</option> + <option '.($_SESSION['PO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="1">'._('Yes') . '</option> + <option '.(!$_SESSION['PO_AllowSameItemMultipleTimes']?'selected="selected" ':'').'value="0">'._('No') . '</option> </select></td><td>' . _('If a purchase order can have the same item on the order several times this parameter should be set to yes') . '</td></tr>'; // AutoAuthorisePO echo '<tr style="outline: 1px solid"><td>' . _('Automatically authorise purchase orders if user has authority') . ':</td> <td><select name="X_AutoAuthorisePO"> - <option '.($_SESSION['AutoAuthorisePO'] ?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['AutoAuthorisePO'] ?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['AutoAuthorisePO'] ?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['AutoAuthorisePO'] ?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td><td>' . _('If the user changing an existing purchase order or adding a new puchase order is set up to authorise purchase orders and the order is within their limit, then the purchase order status is automatically set to authorised') . '</td></tr>'; @@ -689,7 +691,7 @@ echo '<tr style="outline: 1px solid"><td>' . _('Financial Year Ends On') . ':</td> <td><select name="X_YearEnd">'; for ($i=1; $i <= sizeof($MonthNames); $i++ ) - echo '<option '.($_SESSION['YearEnd'] == $i ? 'selected ' : '').'value="'.$i.'">'.$MonthNames[$i] . '</option>'; + echo '<option '.($_SESSION['YearEnd'] == $i ? 'selected="selected" ' : '').'value="'.$i.'">'.$MonthNames[$i] . '</option>'; echo '</select></td> <td>' . _('Defining the month in which the financial year ends enables the system to provide useful defaults for general ledger reports') .'</td></tr>'; @@ -792,8 +794,8 @@ // HTTPS_Only echo '<tr style="outline: 1px solid"><td>' . _('Only allow secure socket connections') . ':</td> <td><select name="X_HTTPS_Only"> - <option '.($_SESSION['HTTPS_Only']?'selected ':'').'value="1">'._('Yes') . '</option> - <option '.(!$_SESSION['HTTPS_Only']?'selected ':'').'value="0">'._('No') . '</option> + <option '.($_SESSION['HTTPS_Only']?'selected="selected" ':'').'value="1">'._('Yes') . '</option> + <option '.(!$_SESSION['HTTPS_Only']?'selected="selected" ':'').'value="0">'._('No') . '</option> </select></td> <td>' . _('Force connections to be only over secure sockets - ie encrypted data only') . '</td> </tr>'; @@ -834,7 +836,7 @@ echo '<tr style="outline: 1px solid"><td>' . _('Wiki application') . ':</td> <td><select name="X_WikiApp">'; for ($i=0; $i < sizeof($WikiApplications); $i++ ) { - echo '<option '.($_SESSION['WikiApp'] == $WikiApplications[$i] ? 'selected ' : '').'value="'.$WikiApplications[$i].'">'.$WikiApplications[$i] . '</option>'; + echo '<option '.($_SESSION['WikiApp'] == $WikiApplications[$i] ? 'selected="selected" ' : '').'value="'.$WikiApplications[$i].'">'.$WikiApplications[$i] . '</option>'; } echo '</select></td> <td>' . _('This feature makes webERP show links to a free form company knowledge base using a wiki. This allows sharing of important company information - about customers, suppliers and products and the set up of work flow menus and/or company procedures documentation') .'</td></tr>'; @@ -995,8 +997,8 @@ //DefineControlledOnWOEntry echo '<tr style="outline: 1px solid"><td>' . _('Controlled Items Defined At Work Order Entry') . ':</td> <td><select name="X_DefineControlledOnWOEntry"> - <option '.($_SESSION['DefineControlledOnWOEntry']?'selected ':'').'value="1">'._('Yes').'</option> - <option '.(!$_SESSION['DefineControlledOnWOEntry']?'selected ':'').'value="0">'._('No').'</option> + <option '.($_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="1">'._('Yes').'</option> + <option '.(!$_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="0">'._('No').'</option> </select></td> <td>' . _('When set to yes, controlled items are defined at the time of the work order creation. Otherwise controlled items (serial numbers and batch/roll/lot references) are entered at the time the finished items are received against the work order') . '</td></tr>'; @@ -1043,7 +1045,8 @@ echo '</table> - <br /><div class="centre"><input type="Submit" name="submit" value="' . _('Update') . '" /></div> + <br /><div class="centre"><input type="submit" name="submit" value="' . _('Update') . '" /></div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/Z_DataExport.php =================================================================== --- trunk/Z_DataExport.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/Z_DataExport.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -541,7 +541,7 @@ echo '<tr><td>' . _('For Sales Type/Price List') . ':</td>'; echo '<td><select name="SalesType">'; while ($myrow=DB_fetch_array($SalesTypesResult)){ - echo '<option Value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type']; + echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type']; } echo '</select></td></tr>'; @@ -550,7 +550,7 @@ echo '<tr><td>' . _('For Location') . ':</td>'; echo '<td><select name="Location">'; while ($myrow=DB_fetch_array($SalesTypesResult)){ - echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname']; + echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname']; } echo '</select></td></tr>'; echo '</table>'; @@ -572,7 +572,7 @@ echo '<tr><td>' . _('For Location') . ':</td>'; echo '<td><select name="Location">'; while ($myrow=DB_fetch_array($SalesTypesResult)){ - echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname']; + echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname']; } echo '</select></td></tr>'; echo '</table>'; Modified: trunk/install/timezone.php =================================================================== --- trunk/install/timezone.php 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/install/timezone.php 2012-02-27 22:29:51 UTC (rev 4983) @@ -16,9 +16,9 @@ $timezone=$data[$c]; $c++; if ($timezone==$ltz) { - echo "<OPTION selected value='".$timezone."'>".$timezone; + echo "<option selected='selected' value='".$timezone."'>".$timezone; } else { - echo "<OPTION value='".$timezone."'>".$timezone; + echo "<option value='".$timezone."'>".$timezone; } } } Modified: trunk/reportwriter/admin/RCFunctions.inc =================================================================== --- trunk/reportwriter/admin/RCFunctions.inc 2012-02-27 19:19:27 UTC (rev 4982) +++ trunk/reportwriter/admin/RCFunctions.inc 2012-02-27 22:29:51 UTC (rev 4983) @@ -717,8 +717,8 @@ while ($mytable=DB_fetch_row($Result)) { $tablename = strtolower($mytable[0]); - if ($myrow[0] == $tablename) $TableList .= "<OPTION SELECTED Value='" . $tablename . "'>" . $tablename . "</OPTION>"; - else $TableList .= "<OPTION Value='" . $tablename . "'>" . $tablename . "</OPTION>"; + if ($myrow[0] == $tablename) $TableList .= "<option selected='selected' value='" . $tablename . "'>" . $tablename . "</option>"; + else $TableList .= "<option value='" . $tablename . "'>" . $tablename . "</option>"; } return $TableList; } // CreateTableList @@ -739,15 +739,15 @@ while($mytable=DB_fetch_row($Result)) { if ($myrow[$Table]) { if ($myrow[$Table] == $mytable[1]){ - $LinkList .= "<OPTION SELECTED Value='" . $mytable[1] . "'>" . $mytable[1]; + $LinkList .= "<option selected='selected' value='" . $mytable[1] . "'>" . $mytable[1]; } else { - $LinkList .= "<OPTION Value='" . $mytable[1] . "'>" . $mytable[1]; + $LinkList .= "<option value='" . $mytable[1] . "'>" . $mytable[1]; } } else { if ($j == 0){ - $LinkList .= "<OPTION SELECTED Value='" . $mytable[1] . "'>" . $mytable[1]; + $LinkList .= "<option selected='selected' value='" . $mytable[1] . "'>" . $mytable[1]; } else { - $LinkList .= "<OPTION Value='" . $mytable[1] . "'>" . $mytable[1]; + $LinkList .= "<option value='" . $mytable[1] . "'>" . $mytable[1]; } $j++; } @@ -780,15 +780,15 @@ while($mytable=DB_fetch_row($Result)) { if ($myrow[$Table+3]) { if ($myrow[$Table+3] == $mytable[2]){ - $LinkEqList .= "<OPTION SELECTED Value='" . $mytable[2] . "'>" . $mytable[2]; + $LinkEqList .= "<option selected='selected' value='" . $mytable[2] . "'>" . $mytable[2]; } else { - $LinkEqList .= "<OPTION Value='" . $mytable[2] . "'>" . $mytable[2]; + $LinkEqList .= "<option value='" . $mytable[2] . "'>" . $mytable[2]; } } else { if ($j == 0){ - $LinkEqList .= "<OPTION SELECTED Value='" . $mytable[2] . "'>" . $mytable[2]; + $LinkEqList .= "<option selected='selected' value='" . $mytable[2] . "'>" . $mytable[2]; } else { - $LinkEqList .= "<OPTION Value='" . $mytable[2] . "'>" . $mytable[2]; + $LinkEqList .= "<option value='" . $mytable[2] . "'>" . $mytable[2]; } $j++; } @@ -818,9 +818,9 @@ while ($mytable=DB_fetch_row($Result)) { $fieldname = strtolower($myrow[$i]) . "." . strtolower($mytable[0]); if ($FName == $fieldname){ - $FieldList .= "<OPTION SELECTED Value='" . $fieldname . "'>" . $fieldname . "</OPTION>"; + $FieldList .= "<option selected='selected' value='" . $fieldname . "'>" . $fieldname . "</option>"; } else { - $FieldList .= "<OPTION Value='" . $fieldname . "'>" . $fieldname . "</OPTION>"; + $FieldList .= "<option value='" . $fieldname . "'>" . $fieldname . "</option>"; } } // while } // if This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |