From: <dai...@us...> - 2011-07-02 23:05:11
|
Revision: 4618 http://web-erp.svn.sourceforge.net/web-erp/?rev=4618&view=rev Author: daintree Date: 2011-07-02 23:04:59 +0000 (Sat, 02 Jul 2011) Log Message: ----------- <br> replaced with <br /> Modified Paths: -------------- trunk/Areas.php trunk/BankMatching.php trunk/CustomerBranches.php trunk/CustomerReceipt.php trunk/DailyBankTransactions.php trunk/DailySalesInquiry.php trunk/EDIMessageFormat.php trunk/EDIProcessOrders.php trunk/EmailConfirmation.php trunk/EmailCustTrans.php trunk/FixedAssetLocations.php trunk/FixedAssetRegister.php trunk/FixedAssetTransfer.php trunk/FormDesigner.php trunk/GLAccountCSV.php trunk/GLAccountInquiry.php trunk/GLAccountReport.php trunk/GLAccounts.php trunk/GLBalanceSheet.php trunk/GLTagProfit_Loss.php trunk/GLTrialBalance.php trunk/GeocodeSetup.php trunk/GetStockImage.php trunk/GoodsReceivedControlled.php trunk/InventoryPlanningPrefSupplier.php trunk/Labels.php trunk/Locations.php trunk/MRPCalendar.php trunk/MRPDemandTypes.php trunk/MRPPlannedPurchaseOrders.php trunk/MailInventoryValuation.php trunk/Numbers/Words/lang.cs.php trunk/Numbers/Words/lang.lt.php trunk/OrderDetails.php trunk/PDFChequeListing.php trunk/PDFCustTransListing.php trunk/PDFCustomerList.php trunk/PDFDIFOT.php trunk/PDFDeliveryDifferences.php trunk/PDFGrn.php trunk/PDFPeriodStockTransListing.php trunk/PDFPriceList.php trunk/PDFPrintLabel.php trunk/PDFQuotation.php trunk/PDFQuotationPortrait.php trunk/PDFRemittanceAdvice.php trunk/PDFStockCheckComparison.php trunk/PDFStockLocTransfer.php trunk/PDFStockTransfer.php trunk/PDFSuppTransListing.php trunk/POReport.php trunk/PO_AuthorisationLevels.php trunk/PO_AuthoriseMyOrders.php trunk/PO_Chk_ShiptRef_JobRef.php trunk/PO_OrderDetails.php trunk/PO_SelectOSPurchOrder.php trunk/PO_SelectPurchOrder.php trunk/PaymentAllocations.php trunk/PaymentTerms.php trunk/PcExpenses.php trunk/PcTabs.php trunk/PricesByCost.php trunk/Prices_Customer.php trunk/PrintCustOrder.php trunk/PrintCustStatements.php trunk/PrintCustTrans.php trunk/RecurringSalesOrders.php trunk/ReorderLevel.php trunk/ReorderLevelLocation.php trunk/SMTPServer.php trunk/SalesAnalReptCols.php trunk/SalesByTypePeriodInquiry.php trunk/SalesCategoryPeriodInquiry.php trunk/SalesGraph.php trunk/SalesPeople.php trunk/SalesTopItemsInquiry.php trunk/SalesTypes.php trunk/SelectAsset.php trunk/SelectCreditItems.php trunk/SelectGLAccount.php trunk/SelectSalesOrder.php trunk/Shipments.php trunk/Shippers.php trunk/Shipt_Select.php trunk/StockAdjustments.php trunk/StockCostUpdate.php trunk/StockCounts.php trunk/StockDispatch.php trunk/StockLocMovements.php trunk/StockLocTransferReceive.php trunk/StockSerialItemResearch.php trunk/StockTransferControlled.php trunk/StockUsageGraph.php trunk/SuppContractChgs.php trunk/SuppFixedAssetChgs.php trunk/SuppLoginSetup.php trunk/SuppPaymentRun.php trunk/SuppPriceList.php trunk/SupplierContacts.php trunk/SupplierInvoice.php trunk/TaxAuthorities.php trunk/TaxAuthorityRates.php trunk/TaxCategories.php trunk/TaxProvinces.php trunk/WhereUsedInquiry.php trunk/WorkCentres.php trunk/WorkOrderCosting.php trunk/WorkOrderReceive.php trunk/WorkOrderStatus.php trunk/Z_BottomUpCosts.php trunk/Z_ChangeCustomerCode.php trunk/Z_ChangeStockCategory.php trunk/Z_CheckAllocs.php trunk/Z_DeleteInvoice.php trunk/Z_ImportChartOfAccounts.php trunk/Z_ImportGLAccountGroups.php trunk/Z_ImportGLAccountSections.php trunk/Z_ImportPartCodes.php trunk/Z_MakeNewCompany.php trunk/Z_ReverseSuppPaymentRun.php trunk/Z_UpdateChartDetailsBFwd.php trunk/Z_Upgrade3.10.php trunk/Z_Upgrade_3.10-3.11.php trunk/Z_Upgrade_3.11-4.00.php trunk/Z_index.php trunk/Z_poAddLanguage.php trunk/Z_poEditLangHeader.php trunk/Z_poEditLangModule.php trunk/Z_poEditLangRemaining.php trunk/Z_poRebuildDefault.php trunk/doc/Manual/ManualAPIFunctions.php trunk/geocode.php trunk/includes/DefineLabelClass.php trunk/includes/InputSerialItems.php trunk/includes/InputSerialItemsKeyed.php trunk/includes/InputSerialItemsSequential.php trunk/includes/OutputSerialItems.php trunk/includes/tcpdf/2dbarcodes.php trunk/includes/tcpdf/barcodes.php trunk/includes/tcpdf/tcpdf.php trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/Manual/ManualARInquiries.html trunk/locale/de_DE.utf8/Manual/ManualARReports.html trunk/locale/de_DE.utf8/Manual/ManualARTransactions.html trunk/locale/de_DE.utf8/Manual/ManualAccountsPayable.html trunk/locale/de_DE.utf8/Manual/ManualAccountsReceivable.html trunk/locale/de_DE.utf8/Manual/ManualContents.php trunk/locale/de_DE.utf8/Manual/ManualContributors.html trunk/locale/de_DE.utf8/Manual/ManualCreatingNewSystem.html trunk/locale/de_DE.utf8/Manual/ManualCreditStatus.html trunk/locale/de_DE.utf8/Manual/ManualDevelopmentStructure.html trunk/locale/de_DE.utf8/Manual/ManualGeneralLedger.html trunk/locale/de_DE.utf8/Manual/ManualGettingStarted.html trunk/locale/de_DE.utf8/Manual/ManualHeader.html trunk/locale/de_DE.utf8/Manual/ManualIntroduction.html trunk/locale/de_DE.utf8/Manual/ManualInventory.html trunk/locale/de_DE.utf8/Manual/ManualManufacturing.html trunk/locale/de_DE.utf8/Manual/ManualMultilanguage.html trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html trunk/locale/de_DE.utf8/Manual/ManualPaymentTerms.html trunk/locale/de_DE.utf8/Manual/ManualPrices.html trunk/locale/de_DE.utf8/Manual/ManualReportBuilder.html trunk/locale/de_DE.utf8/Manual/ManualRequirements.html trunk/locale/de_DE.utf8/Manual/ManualSalesAnalysis.html trunk/locale/de_DE.utf8/Manual/ManualSalesOrders.html trunk/locale/de_DE.utf8/Manual/ManualSalesPeople.html trunk/locale/de_DE.utf8/Manual/ManualSalesTypes.html trunk/locale/de_DE.utf8/Manual/ManualSecuritySchema.html trunk/locale/de_DE.utf8/Manual/ManualSecuritySchemaorig.html trunk/locale/de_DE.utf8/Manual/ManualShipments.html trunk/locale/de_DE.utf8/Manual/ManualSpecialUtilities.html trunk/locale/de_DE.utf8/Manual/ManualSystemConventions.html trunk/locale/de_DE.utf8/Manual/ManualTax.html trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages-P-Y.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/Manual/ManualAPIFunctions.php trunk/locale/zh_CN.utf8/Manual/ManualContents.php trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/Manual/ManualAPIFunctions.php trunk/locale/zh_HK.utf8/Manual/ManualContents.php trunk/reportwriter/FormMaker.php trunk/reportwriter/WriteReport.inc trunk/reportwriter/admin/RCFunctions.inc trunk/reportwriter/admin/forms/ReportsCritSetup.html trunk/reportwriter/admin/forms/ReportsImport.html trunk/reportwriter/admin/forms/TplFrmCBlk.html trunk/reportwriter/admin/forms/TplFrmCDta.html trunk/reportwriter/admin/forms/TplFrmData.html trunk/reportwriter/admin/forms/TplFrmLine.html trunk/reportwriter/admin/forms/TplFrmPgNum.html trunk/reportwriter/admin/forms/TplFrmRect.html trunk/reportwriter/admin/forms/TplFrmTBlk.html trunk/reportwriter/admin/forms/TplFrmTbl.html trunk/reportwriter/admin/forms/TplFrmText.html trunk/reportwriter/admin/forms/TplFrmTtl.html trunk/reportwriter/forms/TplFrmLine.html trunk/reportwriter/languages/en_US/reports.php trunk/sql/mysql/upgrade2.9-2.9a.sql trunk/sql/mysql/weberp-demo.sql Modified: trunk/Areas.php =================================================================== --- trunk/Areas.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/Areas.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -113,7 +113,7 @@ if ($myrow[0]>0) { $CancelDelete = 1; prnMsg( _('Cannot delete this area because customer branches have been created using this area'),'warn'); - echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches using this area code'); + echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches using this area code'); } else { $sql= "SELECT COUNT(*) FROM salesanalysis WHERE salesanalysis.area ='$SelectedArea'"; @@ -122,7 +122,7 @@ if ($myrow[0]>0) { $CancelDelete = 1; prnMsg( _('Cannot delete this area because sales analysis records exist that use this area'),'warn'); - echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records referring this area code'); + echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records referring this area code'); } } @@ -178,7 +178,7 @@ if (!isset($_GET['delete'])) { - echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '"><br>'; + echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '"><br />'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedArea)) { Modified: trunk/BankMatching.php =================================================================== --- trunk/BankMatching.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/BankMatching.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -75,7 +75,7 @@ $_POST['ShowTransactions'] = True; } -echo '<div class="page_help_text">' . _('Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction.') . '</div><br>'; +echo '<div class="page_help_text">' . _('Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction.') . '</div><br />'; echo '<form action="'. $_SERVER['PHP_SELF'] . '" method=post>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -136,7 +136,7 @@ echo '</select></td></tr>'; -echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '">'; +echo '</table><br /><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '">'; echo '<p><a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a></div>'; echo '<hr />'; Modified: trunk/CustomerBranches.php =================================================================== --- trunk/CustomerBranches.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/CustomerBranches.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -534,7 +534,7 @@ if (isset($SelectedBranch)) { echo '<div class="centre"><a href=' . $_SERVER['PHP_SELF'] . '?DebtorNo=' . $DebtorNo. '>' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>'; } - echo '<br><table class="selection">'; + echo '<br /><table class="selection">'; echo '<tr><th colspan=2><div class="centre"><b>'._('Change Branch').'</b></th></tr>'; echo '<tr><td>'._('Branch Code').':</td><td>'; Modified: trunk/CustomerReceipt.php =================================================================== --- trunk/CustomerReceipt.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/CustomerReceipt.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -571,7 +571,7 @@ if (DB_error_no($db) !=0) { prnMsg(_('The searched customer records requested cannot be retrieved because') . ' - ' . DB_error_msg($db),'error'); if ($debug==1){ - prnMsg(_('SQL used to retrieve the customer details was') . '<br>' . $sql,'error'); + prnMsg(_('SQL used to retrieve the customer details was') . '<br />' . $sql,'error'); } } elseif (DB_num_rows($CustomerSearchResult)==1){ $myrow=DB_fetch_array($CustomerSearchResult); @@ -723,7 +723,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="">' . ' ' . _('Enter Customer Receipt') . '</p>'; echo '<div class="page_help_text">' . _('To enter a payment TO a customer (ie. to pay out a credit note), enter a negative payment amount.') . '</div>'; } -echo '<br><table class=selection><tr><td>' . _('Bank Account') . ':</td> +echo '<br /><table class=selection><tr><td>' . _('Bank Account') . ':</td> <td><select tabindex=1 name="BankAccount" onChange="ReloadForm(form1.BatchInput)">'; if (DB_num_rows($AccountsResults)==0){ @@ -895,7 +895,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . $_SESSION['CustomerRecord']['name'] . ' - (' . _('All amounts stated in') . ' ' . $_SESSION['CustomerRecord']['currency'] . ')' . _('Terms') . ': ' . $_SESSION['CustomerRecord']['terms'] . '<br/>' . _('Credit Limit') . ': ' . number_format($_SESSION['CustomerRecord']['creditlimit'],0) . ' ' . _('Credit Status') . ': ' . $_SESSION['CustomerRecord']['reasondescription']; if ($_SESSION['CustomerRecord']['dissallowinvoices']!=0){ - echo '<br><font color=red size=4><b>' . _('ACCOUNT ON HOLD') . '</font></b><br/>'; + echo '<br /><font color=red size=4><b>' . _('ACCOUNT ON HOLD') . '</font></b><br/>'; } echo '<table width="90%" class=selection> @@ -914,7 +914,7 @@ <td class=number>' . number_format(($_SESSION['CustomerRecord']['overdue1']-$_SESSION['CustomerRecord']['overdue2']) ,2) . '</td> <td class=number>' . number_format($_SESSION['CustomerRecord']['overdue2'],2) . '</td> </tr> - </table><br>'; + </table><br />'; echo '<table class="selection">'; @@ -1009,7 +1009,7 @@ echo '<td>' . _('Narrative') . ':</td>'; echo '<td><textarea name="Narrative" cols=40 rows=1></textarea></td>'; echo '</table>'; - echo '<br><div class="centre"><input tabindex=14 type="submit" name="Process" value="' . _('Accept') . '">'; + echo '<br /><div class="centre"><input tabindex=14 type="submit" name="Process" value="' . _('Accept') . '">'; echo '<input tabindex=14 type="submit" name="Cancel" value="' . _('Cancel') . '"></div>'; } elseif (isset($_SESSION['ReceiptBatch']) AND !isset($_POST['GLEntry'])){ @@ -1028,7 +1028,7 @@ echo '<td>' . _('Customer invoice number') . ':</td>'; echo '<td><input tabindex=11 type="text" name="CustInvNo" size=8 maxlength=8></td>'; echo '</tr></table>'; - echo '<div class="centre"><br>'; + echo '<div class="centre"><br />'; echo '<input tabindex=11 type=submit name="Search" value="' . _('Search Now') . '">'; echo '<br/><br/><input tabindex=12 type=submit name="GLEntry" value="' . _('Enter A GL Receipt') . '"><br /></div>'; Modified: trunk/DailyBankTransactions.php =================================================================== --- trunk/DailyBankTransactions.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/DailyBankTransactions.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -58,7 +58,7 @@ </tr>'; echo '</table>'; - echo '<br><div class="centre"><input type="submit" name="Show" value="' . _('Show transactions'). '"></div>'; + echo '<br /><div class="centre"><input type="submit" name="Show" value="' . _('Show transactions'). '"></div>'; echo '</form>'; } else { $SQL = "SELECT bankaccountname, @@ -133,7 +133,7 @@ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo '<br><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '"></div>'; + echo '<br /><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '"></div>'; echo '</form>'; } include('includes/footer.inc'); Modified: trunk/DailySalesInquiry.php =================================================================== --- trunk/DailySalesInquiry.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/DailySalesInquiry.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -8,7 +8,7 @@ include('includes/DefineCartClass.php'); echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Daily Sales') . '" alt="" />' . ' ' . _('Daily Sales') . '</p>'; -echo '<div class="page_help_text">' . _('Select the month to show daily sales for') . '</div><br>'; +echo '<div class="page_help_text">' . _('Select the month to show daily sales for') . '</div><br />'; echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/EDIMessageFormat.php =================================================================== --- trunk/EDIMessageFormat.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/EDIMessageFormat.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -162,7 +162,7 @@ echo '</table><p>'; if (DB_num_rows($result)==0){ echo '<div class="centre"><input tabindex=1 type=submit name="NewEDIInvMsg" value="' . - _('Create New EDI Invoice Message From Default Template') . '"></div><br>'; + _('Create New EDI Invoice Message From Default Template') . '"></div><br />'; } } //end of ifs SelectedLine is not set @@ -240,7 +240,7 @@ echo '<td>'; echo '<input tabindex=4 type="Text" name="LineText" size=50 maxlength=50 VALUE='.$_POST['LineText'] .'>'; echo '</td></tr>'; -echo '</table><br>'; +echo '</table><br />'; if (isset($_GET['SelectedMessageLine'])) { echo '<div class="centre"><input tabindex=5 type="submit" name="update" value="'. _('Update Information'). '"></div>'; } else { Modified: trunk/EDIProcessOrders.php =================================================================== --- trunk/EDIProcessOrders.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/EDIProcessOrders.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -58,7 +58,7 @@ while (false !== ($OrderFile=readdir($dirhandle))){ /*there are files in the incoming orders dir */ $TryNextFile = False; - echo "<br>$OrderFile"; + echo "<br />$OrderFile"; /*Counter that keeps track of the array pointer for the 1st seg in the current seg group */ $FirstSegInGrp =0; @@ -79,7 +79,7 @@ while ($LineText = fgets($fp) AND $TryNextFile != True){ /* get each line of the order file */ $LineText = StripTrailingComma($LineText); - echo "<br>".$LineText; + echo "<br />".$LineText; if ($SegTag != substr($LineText,0,3)){ $SegCounter=1; @@ -87,7 +87,7 @@ } else { $SegCounter++; if ($SegCounter > $Seg[$SegID]['MaxOccur']){ - $EmailText = $EmailText . "\n" . _('The EANCOM Standard only allows for') . ' ' . $Seg[$SegID]['MaxOccur'] . ' ' ._('occurrences of the segment') . ' ' . $Seg[$SegID]['SegTag'] . ' ' . _('this is the') . ' ' . $SegCounter . ' ' . _('occurrence') . '<br>' . _('The segment line read as follows') . ':<br>' . $LineText; + $EmailText = $EmailText . "\n" . _('The EANCOM Standard only allows for') . ' ' . $Seg[$SegID]['MaxOccur'] . ' ' ._('occurrences of the segment') . ' ' . $Seg[$SegID]['SegTag'] . ' ' . _('this is the') . ' ' . $SegCounter . ' ' . _('occurrence') . '<br />' . _('The segment line read as follows') . ':<br />' . $LineText; } } @@ -114,12 +114,12 @@ if ($SegTag != $Seg[$SegID]['SegTag']){ - $EmailText .= "\n" . _('ERROR') . ': ' . _('Unable to identify segment tag') . ' ' . $SegTag . ' ' . _('from the message line') . '<br>' . $LineText . '<br><font color=RED><b>' . _('This message processing has been aborted and separate advice will be required from the customer to obtain details of the order') . '<b></font>'; + $EmailText .= "\n" . _('ERROR') . ': ' . _('Unable to identify segment tag') . ' ' . $SegTag . ' ' . _('from the message line') . '<br />' . $LineText . '<br /><font color=RED><b>' . _('This message processing has been aborted and separate advice will be required from the customer to obtain details of the order') . '<b></font>'; $TryNextFile = True; } - echo '<br>' . _('The segment tag') . ' ' . $SegTag . ' ' . _('is being processed'); + echo '<br />' . _('The segment tag') . ' ' . $SegTag . ' ' . _('is being processed'); switch ($SegTag){ case 'UNH': $UNH_elements = explode ('+',substr($LineText,4)); @@ -181,13 +181,13 @@ } /*end switch for type of order */ if (isset($BGM_elements[1])){ - echo '<br>echo BGM_elements[1] ' .$BGM_elements[1]; + echo '<br />echo BGM_elements[1] ' .$BGM_elements[1]; $BGM_C106 = explode(':',$BGM_elements[1]); $Order->CustRef = $BGM_C106[0]; $EmailText .= "\n" . _('Customers order ref') . ': ' . $BGM_C106[0]; } if (isset($BGM_elements[2])){ - echo "<br>echo BGM_elements[2] " .$BGM_elements[2]; + echo "<br />echo BGM_elements[2] " .$BGM_elements[2]; $BGM_1225 = explode(':',$BGM_elements[2]); $MsgFunction = $BGM_1225[0]; @@ -222,7 +222,7 @@ if (isset($BGM_1225[1])){ $ResponseCode = $BGM_1225[1]; - echo '<br>' . _('Response Code') . ': ' . $ResponseCode; + echo '<br />' . _('Response Code') . ': ' . $ResponseCode; switch ($ResponseCode) { case 'AC': $EmailText .= "\n" . _('Please acknowledge to customer with detail and changes made to the order'); Modified: trunk/EmailConfirmation.php =================================================================== --- trunk/EmailConfirmation.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/EmailConfirmation.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -9,12 +9,12 @@ If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){ $title = _('Select Order To Print'); include('includes/header.inc'); - echo '<div class="centre"><br><br><br>'; + echo '<div class="centre"><br /><br /><br />'; prnMsg( _('Select an Order Number to Print before calling this page') , 'error'); - echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item"> + echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item"> <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li> <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li> - </td></tr></table></div><br><br><br>'; + </td></tr></table></div><br /><br /><br />'; include('includes/footer.inc'); exit(); } @@ -65,12 +65,12 @@ if (DB_num_rows($result)==0){ $title = _('Print Packing Slip Error'); include('includes/header.inc'); - echo '<div class="centre"><br><br><br>'; + echo '<div class="centre"><br /><br /><br />'; prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error'); - echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item"> + echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item"> <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li> <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li> - </td></tr></table></div><br><br><br>'; + </td></tr></table></div><br /><br /><br />'; include('includes/footer.inc'); exit(); } elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */ @@ -86,17 +86,17 @@ echo '<p>'; prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' . _('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) . - '<br>' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' ); + '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' ); echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">' . _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed') . '</a><p>' . '<a href="' . $rootpath. '/PrintCustOrder_generic.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>'; - echo '<br><br><br>'; + echo '<br /><br /><br />'; echo _('Or select another Order Number to Print'); echo '<table class="table_index"><tr><td class="menu_group_item"> <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li> <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li> - </td></tr></table></div><br><br><br>'; + </td></tr></table></div><br /><br /><br />'; include('includes/footer.inc'); exit; @@ -125,11 +125,11 @@ $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' . $_SESSION['CompanyRecord']['fax'] . "</td></tr>"; $MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" . - $_SESSION['CompanyRecord']['email'] . "<br><br><br></td></tr>"; + $_SESSION['CompanyRecord']['email'] . "<br /><br /><br /></td></tr>"; $MailMessage = $MailMessage . "<Table><tr><td align='center' colspan='4'> <h2> Order Acknowledgement</h2></td></tr>"; $MailMessage = $MailMessage . "<tr><td align='center' colspan='4'> <b>Order Number " . - $_GET['TransNo'] . "</b><br><br><br></td></tr>"; + $_GET['TransNo'] . "</b><br /><br /><br /></td></tr>"; $MailMessage = $MailMessage . "<tr><td colspan='4'> <b>Delivered To:</b></td></tr>"; $MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" . $myrow['deliverto'] . "</td></tr>"; @@ -139,12 +139,12 @@ { $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd2'] . "</td></tr>"; $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . - ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. "<br><br><br></td></tr>"; + ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. "<br /><br /><br /></td></tr>"; } else { $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . ' ' . - $myrow['deladd4'] . ' ' . $myrow['deladd5'] . "<br><br><br></td></tr>"; + $myrow['deladd4'] . ' ' . $myrow['deladd5'] . "<br /><br /><br /></td></tr>"; } $MailMessage = $MailMessage . "</table><table border='1' width='50%'><tr>"; if($_REQUEST['POLine'] == 1){ @@ -205,7 +205,7 @@ } /*end if there are order details to show on the order*/ $MailMessage = $MailMessage . "</Table></body></html>"; -// echo $MailMessage . "=mailMessage<br>"; +// echo $MailMessage . "=mailMessage<br />"; IF(mail( $MailTo, $MailSubject, $MailMessage, $headers )){ echo " The following E-Mail was sent to $MailTo:"; } @@ -225,7 +225,7 @@ <td align='center' colspan='4'> <h2> Order Acknowledgement</h2></td> </tr> <tr> - <td align='center' colspan='4'> <b>Order Number <?=$_GET['TransNo']?> </b><br><br><br></td> + <td align='center' colspan='4'> <b>Order Number <?=$_GET['TransNo']?> </b><br /><br /><br /></td> </tr> <tr> <td colspan='2' nowrap width="50%"> <b><?=$_SESSION['CompanyRecord']['coyname']?></b></td> @@ -251,10 +251,10 @@ </tr> <tr> <td colspan='2' nowrap width="50%"> - <b><?=$_SESSION['CompanyRecord']['email']?><br><br><br> + <b><?=$_SESSION['CompanyRecord']['email']?><br /><br /><br /> </td> <td nowrap width="50%"> - <b><?=$myrow['deladd3']?> <?=$myrow['deladd4'] ?> <?=$myrow['deladd5']?><br><br><br> + <b><?=$myrow['deladd3']?> <?=$myrow['deladd4'] ?> <?=$myrow['deladd5']?><br /><br /><br /> </td> </tr> </table> Modified: trunk/EmailCustTrans.php =================================================================== --- trunk/EmailCustTrans.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/EmailCustTrans.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -64,7 +64,7 @@ <td><input type="text" name="EmailAddr" maxlength=60 size=60 value="' . $EmailAddress . '"></td> </table>'; -echo '<br><div class="centre"><input type=submit name="DoIt" value="' . _('OK') . '">'; +echo '<br /><div class="centre"><input type=submit name="DoIt" value="' . _('OK') . '">'; echo '</div></form>'; include ('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/FixedAssetLocations.php =================================================================== --- trunk/FixedAssetLocations.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/FixedAssetLocations.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -102,7 +102,7 @@ echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?' . SID.'SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>'; } -echo '</table><br>'; +echo '</table><br />'; echo '<form name="LocationForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><table class=selection>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<tr><th style="text-align:left">'._('Location ID').'</th>'; @@ -133,7 +133,7 @@ echo '</select>'; echo '</td></tr>'; -echo '</table><br>'; +echo '</table><br />'; //Batman: ParentLocationID checking the location ID Modified: trunk/FixedAssetRegister.php =================================================================== --- trunk/FixedAssetRegister.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/FixedAssetRegister.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -76,7 +76,7 @@ echo '<form name="RegisterForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><table class=selection>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<div class="centre">' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '</div>'; - echo '<br><table width=80% cellspacing="1" class=selection><tr>'; + echo '<br /><table width=80% cellspacing="1" class=selection><tr>'; echo '<th>' . _('Asset ID') . '</th>'; echo '<th>' . _('Description') . '</th>'; echo '<th>' . _('Serial Number') . '</th>'; @@ -164,13 +164,13 @@ echo '<tr><td style="vertical-align:top">' . $myrow['assetid'] . '</td>'; echo '<td style="vertical-align:top">' . $myrow['longdescription'] . '</td>'; echo '<td style="vertical-align:top">' . $myrow['serialno'] . '</td>'; - echo '<td>' . $myrow['locationdescription'] . '<br>'; + echo '<td>' . $myrow['locationdescription'] . '<br />'; /* Not reworked yet * for ($i = 1;$i < sizeOf($Ancestors) - 1;$i++) { for ($j = 0;$j < $i;$j++) { echo ' '; } - echo '|_' . $Ancestors[$i] . '<br>'; + echo '|_' . $Ancestors[$i] . '<br />'; } */ echo '</td><td style="vertical-align:top">' . ConvertSQLDate($myrow['datepurchased']) . '</td>'; @@ -230,7 +230,7 @@ echo '<th style="text-align:right">' . number_format($TotalNBV, 2) . '</th>'; echo '<th style="text-align:right">' . number_format($TotalDisposals, 2) . '</th></tr>'; echo '</table>'; - echo '<br><div class="centre"><input type="Submit" name="pdf" value="' . _('Print as a pdf') . '"> '; + echo '<br /><div class="centre"><input type="Submit" name="pdf" value="' . _('Print as a pdf') . '"> '; echo '<input type="Submit" name="csv" value="' . _('Print as CSV') . '"></div></form>'; } } else { @@ -289,7 +289,7 @@ echo '<tr><th>' . _('To Date ') . "</th><td><input type='text' class='date' alt='" . $_SESSION['DefaultDateFormat'] . "' name='ToDate' maxlength=10 size=11 value='" . $_POST['ToDate'] . "'></td>"; echo '</tr>'; - echo '</table><br>'; + echo '</table><br />'; echo '<div class="centre"><input type="Submit" name="submit" value="' . _('Show Assets') . '"> '; echo '<input type="Submit" name="pdf" value="' . _('Print as a pdf') . '"> '; echo '<input type="Submit" name = "csv" value= "' . _('Print as CSV') . '"></div>'; Modified: trunk/FixedAssetTransfer.php =================================================================== --- trunk/FixedAssetTransfer.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/FixedAssetTransfer.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -67,9 +67,9 @@ echo '<input type="text" name="AssetID" size=15 maxlength=18>'; } - echo '</td></tr></table><br>'; + echo '</td></tr></table><br />'; - echo '<div class="centre"><input type=submit name="Search" value="'. _('Search Now') . '"></div></form><br>'; + echo '<div class="centre"><input type=submit name="Search" value="'. _('Search Now') . '"></div></form><br />'; } if (isset($_POST['Search'])) { Modified: trunk/FormDesigner.php =================================================================== --- trunk/FormDesigner.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/FormDesigner.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -154,7 +154,7 @@ $FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']); } echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="">' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . ''; -echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') .'<br /> '. _('All measurements are in millimetres') . '.</div><br>'; +echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') .'<br /> '. _('All measurements are in millimetres') . '.</div><br />'; $Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations echo '<form method="post" id="Form" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/GLAccountCSV.php =================================================================== --- trunk/GLAccountCSV.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLAccountCSV.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -16,7 +16,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Account Inquiry') . '" alt="" />' . ' ' . _('General Ledger Account Report') . '</p>'; -echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br>'; +echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />'; echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -258,7 +258,7 @@ } /*end for each SelectedAccount */ fclose($fp); - echo '<p><a href="' . $FileName . '">' . _('click here') . '</a> ' . _('to view the file') . '<br>'; + echo '<p><a href="' . $FileName . '">' . _('click here') . '</a> ' . _('to view the file') . '<br />'; } /* end of if CreateCSV button hit */ include('includes/footer.inc'); Modified: trunk/GLAccountInquiry.php =================================================================== --- trunk/GLAccountInquiry.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLAccountInquiry.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -23,7 +23,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Account Inquiry') . '" alt="" />' . ' ' . _('General Ledger Account Inquiry') . '</p>'; -echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br>'; +echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br />'; echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -145,7 +145,7 @@ $ErrMsg = _('The transactions for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved because') ; $TransResult = DB_query($sql,$db,$ErrMsg); - echo '<br><table class=selection>'; + echo '<br /><table class=selection>'; echo '<tr><th colspan=8><b>' ._('Transactions for account').' '.$SelectedAccount. ' - '. $SelectedAccountName.'</b></th></tr>'; $TableHeader = '<tr> @@ -233,7 +233,7 @@ <td colspan=2></td> </tr>'; } - $IntegrityReport .= '<br>' . _('Period') . ': ' . $PeriodNo . _('Account movement per transaction') . ': ' . number_format($PeriodTotal,2) . ' ' . _('Movement per ChartDetails record') . ': ' . number_format($ChartDetailRow['actual'],2) . ' ' . _('Period difference') . ': ' . number_format($PeriodTotal -$ChartDetailRow['actual'],3); + $IntegrityReport .= '<br />' . _('Period') . ': ' . $PeriodNo . _('Account movement per transaction') . ': ' . number_format($PeriodTotal,2) . ' ' . _('Movement per ChartDetails record') . ': ' . number_format($ChartDetailRow['actual'],2) . ' ' . _('Period difference') . ': ' . number_format($PeriodTotal -$ChartDetailRow['actual'],3); if (ABS($PeriodTotal -$ChartDetailRow['actual'])>0.01){ $ShowIntegrityReport = True; Modified: trunk/GLAccountReport.php =================================================================== --- trunk/GLAccountReport.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLAccountReport.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -226,7 +226,7 @@ $title = _('Print GL Accounts Report Error'); include('includes/header.inc'); prnMsg (_('There were no accounts to print out'),'error'); - echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>'; + echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>'; include('includes/footer.inc'); exit; } else { @@ -251,7 +251,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Account Inquiry') . '" alt="" />' . ' ' . _('General Ledger Account Report') . '</p>'; - echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br>'; + echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />'; echo "<form method='POST' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/GLAccounts.php =================================================================== --- trunk/GLAccounts.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLAccounts.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -77,7 +77,7 @@ if ($myrow[0]>0) { $CancelDelete = 1; prnMsg(_('Cannot delete this account because chart details have been created using this account and at least one period has postings to it'),'warn'); - echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('chart details that require this account code'); + echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('chart details that require this account code'); } else { // PREVENT DELETES IF DEPENDENT RECORDS IN 'GLTrans' @@ -91,7 +91,7 @@ if ($myrow[0]>0) { $CancelDelete = 1; prnMsg( _('Cannot delete this account because transactions have been created using this account'),'warn'); - echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions that require this account code'); + echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions that require this account code'); } else { //PREVENT DELETES IF Company default accounts set up to this account @@ -255,7 +255,7 @@ echo '</select></td></tr></table>'; - echo '<br><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '"></div>'; + echo '<br /><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '"></div>'; echo '</form>'; @@ -281,7 +281,7 @@ $result = DB_query($sql,$db,$ErrMsg); - echo '<br><table class=selection>'; + echo '<br /><table class=selection>'; echo '<tr> <th>' . _('Account Code') . '</th> <th>' . _('Account Name') . '</th> Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLBalanceSheet.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -20,8 +20,8 @@ echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Balance Sheet') . '</p></div>'; echo '<div class="page_help_text">' - . _('Balance Sheet (or statement of financial position) is a summary of balances. Assets, liabilities and ownership equity are listed as of a specific date, such as the end of its financial year. Of the four basic financial statements, the balance sheet is the only statement which applies to a single point in time.') . '<br>' - . _('The balance sheet has three parts: assets, liabilities and ownership equity. The main categories of assets are listed first and are followed by the liabilities. The difference between the assets and the liabilities is known as equity or the net assets or the net worth or capital of the company and according to the accounting equation, net worth must equal assets minus liabilities.') . '<br>' + . _('Balance Sheet (or statement of financial position) is a summary of balances. Assets, liabilities and ownership equity are listed as of a specific date, such as the end of its financial year. Of the four basic financial statements, the balance sheet is the only statement which applies to a single point in time.') . '<br />' + . _('The balance sheet has three parts: assets, liabilities and ownership equity. The main categories of assets are listed first and are followed by the liabilities. The difference between the assets and the liabilities is known as equity or the net assets or the net worth or capital of the company and according to the accounting equation, net worth must equal assets minus liabilities.') . '<br />' . _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>'; echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">'; @@ -54,8 +54,8 @@ echo '</table>'; - echo '<br><div class="centre"><input type=submit Name="ShowBalanceSheet" Value="'._('Show on Screen (HTML)').'"></div>'; - echo '<br><div class="centre"><input type=submit Name="PrintPDF" Value="'._('Produce PDF Report').'"></div>'; + echo '<br /><div class="centre"><input type=submit Name="ShowBalanceSheet" Value="'._('Show on Screen (HTML)').'"></div>'; + echo '<br /><div class="centre"><input type=submit Name="PrintPDF" Value="'._('Produce PDF Report').'"></div>'; /*Now do the posting while the user is thinking about the period to select */ include ('includes/GLPostings.inc'); @@ -90,9 +90,9 @@ $title = _('Balance Sheet') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg( _('The accumulated profits brought forward could not be calculated by the SQL because') . ' - ' . DB_error_msg($db) ); - echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; if ($debug==1){ - echo '<br>'. $SQL; + echo '<br />'. $SQL; } include('includes/footer.inc'); exit; @@ -128,9 +128,9 @@ $title = _('Balance Sheet') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) ); - echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; if ($debug==1){ - echo '<br>'. $SQL; + echo '<br />'. $SQL; } include('includes/footer.inc'); exit; @@ -291,7 +291,7 @@ $title = _('Print Balance Sheet Error'); include('includes/header.inc'); prnMsg( _('There were no entries to print out for the selections specified') ); - echo '<br><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; include('includes/footer.inc'); exit; } else { @@ -658,7 +658,7 @@ </tr>'; echo '</table>'; - echo '<br><div class="centre"><input type=submit Name="SelectADifferentPeriod" Value="'._('Select A Different Balance Date').'"></div>'; + echo '<br /><div class="centre"><input type=submit Name="SelectADifferentPeriod" Value="'._('Select A Different Balance Date').'"></div>'; } echo '</form>'; Modified: trunk/GLTagProfit_Loss.php =================================================================== --- trunk/GLTagProfit_Loss.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLTagProfit_Loss.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -104,10 +104,10 @@ echo '<option selected VALUE="Detailed">'._('All Accounts') . '</option>'; echo '</select></td></tr>'; - echo '</table><br>'; + echo '</table><br />'; - echo "<div class='centre'><input type=submit Name='ShowPL' Value='"._('Show Statement of Income and Expenditure')."'><br>"; - echo "<br><input type=submit Name='PrintPDF' Value='"._('PrintPDF')."'></div>"; + echo "<div class='centre'><input type=submit Name='ShowPL' Value='"._('Show Statement of Income and Expenditure')."'><br />"; + echo "<br /><input type=submit Name='PrintPDF' Value='"._('PrintPDF')."'></div>"; /*Now do the posting while the user is thinking about the period to select */ @@ -172,9 +172,9 @@ $title = _('Income and Expenditure') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) ); - echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; if ($debug == 1){ - echo '<br>'. $SQL; + echo '<br />'. $SQL; } include('includes/footer.inc'); exit; @@ -184,7 +184,7 @@ include('includes/header.inc'); echo '<p>'; prnMsg( _('There were no entries to print out for the selections specified'),'info'); - echo '<br><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>'; include('includes/footer.inc'); exit; } Modified: trunk/GLTrialBalance.php =================================================================== --- trunk/GLTrialBalance.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GLTrialBalance.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -92,7 +92,7 @@ echo '<option value ="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>'; } } - echo '</select></td></tr></table><br>'; + echo '</select></td></tr></table><br />'; echo '<div class="centre"><input type=submit Name="ShowTB" Value="' . _('Show Trial Balance') .'">'; echo '<input type=submit Name="PrintPDF" Value="'._('PrintPDF').'"></div>'; @@ -151,9 +151,9 @@ $title = _('Trial Balance') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) ); - echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; if ($debug==1){ - echo '<br>'. $SQL; + echo '<br />'. $SQL; } include('includes/footer.inc'); exit; @@ -163,7 +163,7 @@ include('includes/header.inc'); echo '<p>'; prnMsg( _('There were no entries to print out for the selections specified') ); - echo '<br><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; include('includes/footer.inc'); exit; } @@ -710,7 +710,7 @@ number_format($CheckPeriodActual,2), number_format($CheckPeriodBudget,2)); - echo '</table><br>'; + echo '</table><br />'; echo '<div class="centre"><input type=submit Name="SelectADifferentPeriod" Value="' . _('Select A Different Period') . '"></div>'; } echo '</form>'; Modified: trunk/GeocodeSetup.php =================================================================== --- trunk/GeocodeSetup.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GeocodeSetup.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -137,7 +137,7 @@ '<a href="http://code.google.com/apis/maps/signup.html" target="_blank"> http://code.google.com/apis/maps/signup.html</a></b>'; echo '<div class="centre"><p>'. _('Find the lat/long for your map center point at ') . '<a href="http://www.batchgeocode.com/lookup/" target="_blank">http://www.batchgeocode.com/lookup/</a></b>'; - echo '<p>'. _('Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)').'</div><br>'; + echo '<p>'. _('Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)').'</div><br />'; echo '<table border=1>'; echo '<tr> @@ -189,7 +189,7 @@ } //end of ifs and buts! if (isset($SelectedParam)) { - echo '<div class="centre"><br><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show Defined Geocode Param Codes') . '</a><br></div>'; + echo '<div class="centre"><br /><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show Defined Geocode Param Codes') . '</a><br /></div>'; } if (!isset($_GET['delete'])) { @@ -243,7 +243,7 @@ if (!isset($_POST['geocode_key'])) { $_POST['geocode_key'] = ''; } - echo '<br><tr> + echo '<br /><tr> <td>'. _('Geocode Key') .':</td> <td><input ' . (in_array('geocode_key',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=2 type="text" name="geocode_key" VALUE="'. $_POST['geocode_key'] .'" size=28 maxlength=300> @@ -264,13 +264,13 @@ <tr><td>'. _('Geocode Host') . '</td> <td><input tabindex=7 type="text" name="map_host" VALUE="'. $_POST['map_host'] .'" size=20 maxlength=300></td></tr> </table> - <div class="centre"><input tabindex=4 type="Submit" name="submit" value="' . _('Enter Information') . '"</div><br><br> + <div class="centre"><input tabindex=4 type="Submit" name="submit" value="' . _('Enter Information') . '"</div><br /><br /> </form>'; echo '<div class="page_help_text">' . _('When ready, click on the link below to run the GeoCode process. This will Geocode all Branches and Suppliers. This may take some time. Errors will be returned to the screen.') . '</p>'; -echo '<p>' . _('Suppliers and Customer Branches are geocoded when being entered/updated. You can rerun the geocode process from this screen at any time.') . '</p></div><br>'; +echo '<p>' . _('Suppliers and Customer Branches are geocoded when being entered/updated. You can rerun the geocode process from this screen at any time.') . '</p></div><br />'; -echo '<div class="centre"><a href="' . $rootpath . '/geocode.php">' . _('Run GeoCode process (may take a long time)') . '</a></p><br>'; -echo '<a href="' . $rootpath . '/geo_displaymap_customers.php">' . _('Display Map of Customer Branches') . '</a><br>'; +echo '<div class="centre"><a href="' . $rootpath . '/geocode.php">' . _('Run GeoCode process (may take a long time)') . '</a></p><br />'; +echo '<a href="' . $rootpath . '/geo_displaymap_customers.php">' . _('Display Map of Customer Branches') . '</a><br />'; echo '<a href="' . $rootpath . '/geo_displaymap_suppliers.php">' . _('Display Map of Suppliers') . '</a></div>'; } //end if record deleted no point displaying form to add record include('includes/footer.inc'); Modified: trunk/GetStockImage.php =================================================================== --- trunk/GetStockImage.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GetStockImage.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -151,7 +151,7 @@ $title = _('Stock Image Retrieval ....'); include('includes/header.inc'); prnMsg( _('The Image could not be retrieved because it does not exist'), 'error'); - echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; + echo '<br /><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>'; include('includes/footer.inc'); exit; } @@ -160,9 +160,9 @@ $title = _('Stock Image Retrieval ....'); include('includes/header.inc'); echo 'The image ' . $filename . ' using functype ' . $functype - . '<br> The tmpfilename = ' . $tmpfilename . '<br> The temppath = ' . $filepath . '<br>The stockid = ' . $stockid . '<br> filepath . stockid .jpg = ' . $filepath . $stockid .'.jpg<br> The result of file_exists($filepath . $stockid .jpg) =' . file_exists($filepath . $stockid .'.jpg') - . '<br>filepath = ' . $filepath - . '<br>rootpath = ' . $rootpath; + . '<br /> The tmpfilename = ' . $tmpfilename . '<br /> The temppath = ' . $filepath . '<br />The stockid = ' . $stockid . '<br /> filepath . stockid .jpg = ' . $filepath . $stockid .'.jpg<br /> The result of file_exists($filepath . $stockid .jpg) =' . file_exists($filepath . $stockid .'.jpg') + . '<br />filepath = ' . $filepath + . '<br />rootpath = ' . $rootpath; include('includes/footer.inc'); exit; */ Modified: trunk/GoodsReceivedControlled.php =================================================================== --- trunk/GoodsReceivedControlled.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/GoodsReceivedControlled.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -24,7 +24,7 @@ if (!isset($_SESSION['PO'.$identifier])) { /* This page can only be called with a purchase order number for receiving*/ echo '<div class="centre"><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">'. - _('Select a purchase order to receive'). '</a></div><br>'; + _('Select a purchase order to receive'). '</a></div><br />'; prnMsg( _('This page can only be opened if a purchase order and line item has been selected') . '. ' . _('Please do that first'),'error'); include('includes/footer.inc'); exit; @@ -59,9 +59,9 @@ ********************************************/ echo '<div class="centre">'; -echo '<br><a href="'.$rootpath.'/GoodsReceived.php?identifier=' .$identifier . '">'. _('Back To Purchase Order'). ' # '. $_SESSION['PO'.$identifier]->OrderNo . '</a>'; +echo '<br /><a href="'.$rootpath.'/GoodsReceived.php?identifier=' .$identifier . '">'. _('Back To Purchase Order'). ' # '. $_SESSION['PO'.$identifier]->OrderNo . '</a>'; -echo '<br><font size=2><b>'. _('Receive controlled item'). ' '. $LineItem->StockID . ' - ' . $LineItem->ItemDescription . +echo '<br /><font size=2><b>'. _('Receive controlled item'). ' '. $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' ' . _('on order') . ' ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . _('from') . ' ' . $_SESSION['PO'.$identifier]->SupplierName . '</b></font></div>'; /** vars needed by InputSerialItem : **/ @@ -72,7 +72,7 @@ $ShowExisting = false; include ('includes/InputSerialItems.php'); -//echo '<br><input type=submit name=\'AddBatches\' VALUE=\'Enter\'><br>'; +//echo '<br /><input type=submit name=\'AddBatches\' VALUE=\'Enter\'><br />'; /*TotalQuantity set inside this include file from the sum of the bundles of the item selected for dispatch */ Modified: trunk/InventoryPlanningPrefSupplier.php =================================================================== --- trunk/InventoryPlanningPrefSupplier.php 2011-07-02 22:51:40 UTC (rev 4617) +++ trunk/InventoryPlanningPrefSupplier.php 2011-07-02 23:04:59 UTC (rev 4618) @@ -208,9 +208,9 @@ $title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg(_('The inventory quantities could not be retrieved by the SQL because') . ' - ' . DB_error_msg($db),'error'); - echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>'; + echo "<br /><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>'; if ($debug==1){ - echo "<br>$SQL"; + echo "<br />$SQL"; } include('includes/footer.inc'); exit; @@ -276,9 +276,9 @@ $title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); prnMsg( _('The sales quantities could not be retrieved by the SQL because') . ' - ' . DB_error_msg($db),'error'); - echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>'; + echo "<br /><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>'; if ($debug==1){ - echo "<br>$SQL"; + echo "<br />$SQL"; } include('includes/footer.... [truncated message content] |