From: <dai...@us...> - 2012-12-29 04:47:47
|
Revision: 5785 http://sourceforge.net/p/web-erp/reponame/5785 Author: daintree Date: 2012-12-29 04:47:42 +0000 (Sat, 29 Dec 2012) Log Message: ----------- logout logic rework Modified Paths: -------------- trunk/AccountGroups.php trunk/AccountSections.php trunk/AddCustomerContacts.php trunk/AddCustomerNotes.php trunk/AddCustomerTypeNotes.php trunk/AgedDebtors.php trunk/AgedSuppliers.php trunk/Areas.php trunk/AuditTrail.php trunk/BOMExtendedQty.php trunk/BOMIndented.php trunk/BOMIndentedReverse.php trunk/BOMInquiry.php trunk/BOMListing.php trunk/BOMs.php trunk/BackupDatabase.php trunk/BankAccounts.php trunk/BankMatching.php trunk/BankReconciliation.php trunk/COGSGLPostings.php trunk/CompanyPreferences.php trunk/ConfirmDispatch_Invoice.php trunk/ContractBOM.php trunk/ContractCosting.php trunk/ContractOtherReqts.php trunk/Contracts.php trunk/CopyBOM.php trunk/CounterReturns.php trunk/CounterSales.php trunk/CreditStatus.php trunk/Credit_Invoice.php trunk/Currencies.php trunk/CustEDISetup.php trunk/CustLoginSetup.php trunk/CustWhereAlloc.php trunk/CustomerAllocations.php trunk/CustomerBranches.php trunk/CustomerInquiry.php trunk/CustomerPurchases.php trunk/CustomerReceipt.php trunk/CustomerTransInquiry.php trunk/CustomerTypes.php trunk/Customers.php trunk/DailyBankTransactions.php trunk/DailySalesInquiry.php trunk/DebtorsAtPeriodEnd.php trunk/DeliveryDetails.php trunk/Departments.php trunk/DiscountCategories.php trunk/DiscountMatrix.php trunk/EDIMessageFormat.php trunk/ExchangeRateTrend.php trunk/Factors.php trunk/FixedAssetCategories.php trunk/FixedAssetItems.php trunk/FixedAssetLocations.php trunk/FixedAssetRegister.php trunk/FixedAssetTransfer.php trunk/FormDesigner.php trunk/FreightCosts.php trunk/GLAccountCSV.php trunk/GLAccountInquiry.php trunk/GLAccountReport.php trunk/GLAccounts.php trunk/GLBalanceSheet.php trunk/GLBudgets.php trunk/GLJournal.php trunk/GLJournalInquiry.php trunk/GLProfit_Loss.php trunk/GLTagProfit_Loss.php trunk/GLTags.php trunk/GLTransInquiry.php trunk/GLTrialBalance.php trunk/GeocodeSetup.php trunk/GoodsReceived.php trunk/InternalStockCategoriesByRole.php trunk/InternalStockRequest.php trunk/InternalStockRequestAuthorisation.php trunk/InternalStockRequestFulfill.php trunk/InventoryPlanning.php trunk/InventoryPlanningPrefSupplier.php trunk/InventoryQuantities.php trunk/InventoryValuation.php trunk/Labels.php trunk/Locations.php trunk/Logout.php trunk/MRP.php trunk/MRPCalendar.php trunk/MRPCreateDemands.php trunk/MRPDemandTypes.php trunk/MRPDemands.php trunk/MRPPlannedPurchaseOrders.php trunk/MRPPlannedWorkOrders.php trunk/MRPReport.php trunk/MRPReschedules.php trunk/MRPShortages.php trunk/NoSalesItems.php trunk/OffersReceived.php trunk/OrderDetails.php trunk/PDFBankingSummary.php trunk/PDFChequeListing.php trunk/PDFCustTransListing.php trunk/PDFCustomerList.php trunk/PDFDIFOT.php trunk/PDFDeliveryDifferences.php trunk/PDFLowGP.php trunk/PDFOrderStatus.php trunk/PDFOrdersInvoiced.php trunk/PDFPeriodStockTransListing.php trunk/PDFPickingList.php trunk/PDFPriceList.php trunk/PDFPrintLabel.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_Header.php trunk/PO_Items.php trunk/PO_OrderDetails.php trunk/PO_SelectOSPurchOrder.php trunk/PO_SelectPurchOrder.php trunk/PageSecurity.php trunk/PaymentAllocations.php trunk/PaymentMethods.php trunk/PaymentTerms.php trunk/Payments.php trunk/PcAssignCashToTab.php trunk/PcAuthorizeExpenses.php trunk/PcClaimExpensesFromTab.php trunk/PcExpenses.php trunk/PcExpensesTypeTab.php trunk/PcReportTab.php trunk/PcTabs.php trunk/PcTypeTabs.php trunk/PeriodsInquiry.php trunk/Prices.php trunk/PricesBasedOnMarkUp.php trunk/PricesByCost.php trunk/Prices_Customer.php trunk/PrintCustStatements.php trunk/PrintCustTrans.php trunk/PrintCustTransPortrait.php trunk/PurchData.php trunk/RecurringSalesOrders.php trunk/ReorderLevel.php trunk/ReorderLevelLocation.php trunk/ReprintGRN.php trunk/ReverseGRN.php trunk/SMTPServer.php trunk/SalesAnalReptCols.php trunk/SalesAnalRepts.php trunk/SalesByTypePeriodInquiry.php trunk/SalesCategories.php trunk/SalesCategoryPeriodInquiry.php trunk/SalesGLPostings.php trunk/SalesGraph.php trunk/SalesPeople.php trunk/SalesTopItemsInquiry.php trunk/SalesTypes.php trunk/SecurityTokens.php trunk/SelectAsset.php trunk/SelectCompletedOrder.php trunk/SelectContract.php trunk/SelectCreditItems.php trunk/SelectCustomer.php trunk/SelectGLAccount.php trunk/SelectOrderItems.php trunk/SelectProduct.php trunk/SelectRecurringSalesOrder.php trunk/SelectSalesOrder.php trunk/SelectSupplier.php trunk/SelectWorkOrder.php trunk/ShipmentCosting.php trunk/Shipments.php trunk/Shippers.php trunk/Shipt_Select.php trunk/ShiptsList.php trunk/StockAdjustments.php trunk/StockCategories.php trunk/StockCheck.php trunk/StockCostUpdate.php trunk/StockCounts.php trunk/StockDispatch.php trunk/StockLocMovements.php trunk/StockLocStatus.php trunk/StockLocTransfer.php trunk/StockLocTransferReceive.php trunk/StockMovements.php trunk/StockQties_csv.php trunk/StockQuantityByDate.php trunk/StockReorderLevel.php trunk/StockSerialItemResearch.php trunk/StockSerialItems.php trunk/StockStatus.php trunk/StockTransferControlled.php trunk/StockTransfers.php trunk/StockUsage.php trunk/Stocks.php trunk/SuppCreditGRNs.php trunk/SuppInvGRNs.php trunk/SuppLoginSetup.php trunk/SuppPaymentRun.php trunk/SuppPriceList.php trunk/SuppTransGLAnalysis.php trunk/SupplierAllocations.php trunk/SupplierBalsAtPeriodEnd.php trunk/SupplierContacts.php trunk/SupplierCredit.php trunk/SupplierInquiry.php trunk/SupplierInvoice.php trunk/SupplierPriceList.php trunk/SupplierTenderCreate.php trunk/SupplierTenders.php trunk/SupplierTransInquiry.php trunk/SupplierTypes.php trunk/Suppliers.php trunk/SystemParameters.php trunk/Tax.php trunk/TaxAuthorities.php trunk/TaxAuthorityRates.php trunk/TaxCategories.php trunk/TaxGroups.php trunk/TaxProvinces.php trunk/TopItems.php trunk/UnitsOfMeasure.php trunk/UpgradeDatabase.php trunk/UserSettings.php trunk/WOSerialNos.php trunk/WWW_Access.php trunk/WWW_Users.php trunk/WhereUsedInquiry.php trunk/WorkCentres.php trunk/WorkOrderCosting.php trunk/WorkOrderEntry.php trunk/WorkOrderIssue.php trunk/WorkOrderReceive.php trunk/WorkOrderStatus.php trunk/Z_BottomUpCosts.php trunk/Z_MakeNewCompany.php trunk/Z_Upgrade_3.04-3.05.php trunk/config.distrib.php trunk/doc/Change.log trunk/geocode.php trunk/includes/ConnectDB.inc trunk/includes/ConnectDB_mysql.inc trunk/includes/ConnectDB_mysqli.inc trunk/includes/ConnectDB_postgres.inc trunk/includes/DefineLabelClass.php trunk/includes/GetConfig.php trunk/includes/Login.php trunk/includes/header.inc trunk/includes/session.inc trunk/index.php trunk/install/save.php Modified: trunk/AccountGroups.php =================================================================== --- trunk/AccountGroups.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AccountGroups.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -259,7 +259,7 @@ $DbgMsg = _('The sql that was used to retrieve the account group information was '); $ErrMsg = _('Could not get account groups because'); $result = DB_query($sql,$db,$ErrMsg,$DbgMsg); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>'; echo '<table class="selection"> <tr> Modified: trunk/AccountSections.php =================================================================== --- trunk/AccountSections.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AccountSections.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -166,7 +166,7 @@ $ErrMsg = _('Could not get account group sections because'); $result = DB_query($sql,$db,$ErrMsg); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>'; echo '<table class="selection"> <tr> Modified: trunk/AddCustomerContacts.php =================================================================== --- trunk/AddCustomerContacts.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AddCustomerContacts.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -22,9 +22,9 @@ $Result = DB_query($SQLname,$db); $row = DB_fetch_array($Result); if (!isset($_GET['Id'])) { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />'; } else { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />'; } if ( isset($_POST['submit']) ) { Modified: trunk/AddCustomerNotes.php =================================================================== --- trunk/AddCustomerNotes.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AddCustomerNotes.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -98,7 +98,7 @@ WHERE debtorno='".$DebtorNo."'"; $Result = DB_query($SQLname,$db); $row = DB_fetch_array($Result); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p> + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p> <br />'; $sql = "SELECT noteid, Modified: trunk/AddCustomerTypeNotes.php =================================================================== --- trunk/AddCustomerTypeNotes.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AddCustomerTypeNotes.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -91,7 +91,7 @@ $SQLname="SELECT typename from debtortype where typeid='".$DebtorType."'"; $result = DB_query($SQLname,$db); $myrow = DB_fetch_array($result); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p> + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p> <br />'; $sql = "SELECT noteid, Modified: trunk/AgedDebtors.php =================================================================== --- trunk/AgedDebtors.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AgedDebtors.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -441,7 +441,7 @@ $Title=_('Aged Debtor Analysis'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) { Modified: trunk/AgedSuppliers.php =================================================================== --- trunk/AgedSuppliers.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AgedSuppliers.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -273,7 +273,7 @@ $Title = _('Aged Supplier Analysis'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) { Modified: trunk/Areas.php =================================================================== --- trunk/Areas.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/Areas.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -141,7 +141,7 @@ FROM areas"; $result = DB_query($sql,$db); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; echo '<table class="selection"> <tr> Modified: trunk/AuditTrail.php =================================================================== --- trunk/AuditTrail.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/AuditTrail.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -8,7 +8,7 @@ include('includes/header.inc'); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>'; if (!isset($_POST['FromDate'])){ $_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])); Modified: trunk/BOMExtendedQty.php =================================================================== --- trunk/BOMExtendedQty.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMExtendedQty.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -247,7 +247,7 @@ $Title=_('Quantity Extended BOM Listing'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <div> Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMIndented.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -243,7 +243,7 @@ $Title=_('Indented BOM Listing'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <div> Modified: trunk/BOMIndentedReverse.php =================================================================== --- trunk/BOMIndentedReverse.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMIndentedReverse.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -231,7 +231,7 @@ $Title=_('Reverse Indented BOM Listing'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <div> Modified: trunk/BOMInquiry.php =================================================================== --- trunk/BOMInquiry.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMInquiry.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -184,7 +184,7 @@ } else { echo '<a href="'.$RootPath.'/index.php">'._('Return to Main Menu').'</a>'; echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.' + <img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.' </p> <br />'; Modified: trunk/BOMListing.php =================================================================== --- trunk/BOMListing.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMListing.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -106,7 +106,7 @@ $Title=_('Bill Of Material Listing'); include('includes/header.inc'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/reports.png" title="' . _('Search') . + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />'; if (!isset($_POST['FromCriteria']) || !isset($_POST['ToCriteria'])) { Modified: trunk/BOMs.php =================================================================== --- trunk/BOMs.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BOMs.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -228,7 +228,7 @@ if (isset($Select)) { //Parent Stock Item selected so display BOM or edit Component $SelectedParent = $Select; unset($Select);// = NULL; - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if (isset($SelectedParent) AND isset($_POST['Submit'])) { @@ -855,7 +855,7 @@ if (!isset($SelectedParent)) { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' . '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. ' <div> Modified: trunk/BackupDatabase.php =================================================================== --- trunk/BackupDatabase.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BackupDatabase.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -32,7 +32,7 @@ } else { $BackupFile = $RootPath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz'; - $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . + $Command = 'mysqldump --opt -h' . $host . ' -u' . $DBUser . ' -p' . $DBPassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . $_SERVER['DOCUMENT_ROOT'] . $BackupFile; Modified: trunk/BankAccounts.php =================================================================== --- trunk/BankAccounts.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BankAccounts.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -9,7 +9,7 @@ $BookMark = 'BankAccounts'; include('includes/header.inc'); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>'; echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />'; if (isset($_GET['SelectedBankAccount'])) { Modified: trunk/BankMatching.php =================================================================== --- trunk/BankMatching.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BankMatching.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -12,7 +12,7 @@ $Type = 'Receipts'; $TypeName =_('Receipts'); echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . ' + <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . ' </p>'; } elseif ((isset($_GET['Type']) AND $_GET['Type']=='Payments') @@ -21,7 +21,7 @@ $Type = 'Payments'; $TypeName =_('Payments'); echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . ' + <img src="'.$RootPath.'/css/'.$Theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . ' </p>'; } else { Modified: trunk/BankReconciliation.php =================================================================== --- trunk/BankReconciliation.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/BankReconciliation.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -11,7 +11,7 @@ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if (isset($_GET['Account'])) { $_POST['BankAccount']=$_GET['Account']; Modified: trunk/COGSGLPostings.php =================================================================== --- trunk/COGSGLPostings.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/COGSGLPostings.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -16,7 +16,7 @@ $SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID']; } -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if (isset($_POST['submit'])) { Modified: trunk/CompanyPreferences.php =================================================================== --- trunk/CompanyPreferences.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CompanyPreferences.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -152,7 +152,7 @@ } /* end of if submit */ - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>'; echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/ConfirmDispatch_Invoice.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -258,11 +258,11 @@ if ($_SESSION['Items'.$identifier]->SpecialInstructions) { prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn'); } -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Confirm Invoice') . +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Confirm Invoice') . '" alt="" />' . ' ' . _('Confirm Dispatch and Invoice'). '</p>'; echo '<table class="selection"> <tr> - <th><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th> + <th><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th> <th>' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName. '</b></th> </tr> <tr> @@ -1621,9 +1621,9 @@ echo '<br /><div class="centre">'; if ($_SESSION['InvoicePortraitFormat']==0){ - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; } else { - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; } echo '<a href="'.$RootPath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />'; echo '<a href="'.$RootPath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />'; Modified: trunk/ContractBOM.php =================================================================== --- trunk/ContractBOM.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/ContractBOM.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -221,7 +221,7 @@ if (count($_SESSION['Contract'.$identifier]->ContractBOM)>0){ echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . ' + <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . ' </p>'; echo '<table class="selection">'; @@ -291,7 +291,7 @@ $DbgMsg = _('The SQL used to retrieve the category details but failed was'); $result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg); echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . + <img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . '</p>'; echo '<table class="selection"> <tr></tr> Modified: trunk/ContractCosting.php =================================================================== --- trunk/ContractCosting.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/ContractCosting.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -55,7 +55,7 @@ } echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />'; + <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />'; if ($_SESSION['Contract'.$identifier]->Status==3){ echo _('Closed') . ' '; } elseif ($_SESSION['Contract'.$identifier]->Status==2){ Modified: trunk/ContractOtherReqts.php =================================================================== --- trunk/ContractOtherReqts.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/ContractOtherReqts.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -78,7 +78,7 @@ echo '<form name="ContractReqtsForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>'; if (count($_SESSION['Contract'.$identifier]->ContractReqts)>0){ Modified: trunk/Contracts.php =================================================================== --- trunk/Contracts.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/Contracts.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -745,7 +745,7 @@ if (!isset($_SESSION['Contract'.$identifier]->DebtorNo) OR $_SESSION['Contract'.$identifier]->DebtorNo=='' ) { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>'; echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -817,7 +817,7 @@ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" /> ' . $_SESSION['Contract'.$identifier]->CustomerName; + <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" /> ' . $_SESSION['Contract'.$identifier]->CustomerName; if ($_SESSION['CompanyRecord']['currencydefault'] != $_SESSION['Contract'.$identifier]->CurrCode){ echo ' - ' . _('All amounts stated in') . ' ' . $_SESSION['Contract'.$identifier]->CurrCode . '<br />'; Modified: trunk/CopyBOM.php =================================================================== --- trunk/CopyBOM.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CopyBOM.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -153,7 +153,7 @@ } //end if there is no input error } else { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $Title . '</p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $Title . '</p>'; echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; echo '<div>'; Modified: trunk/CounterReturns.php =================================================================== --- trunk/CounterReturns.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CounterReturns.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -193,7 +193,7 @@ } else { /*Not cancelling the return */ - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Counter Return') . '" alt="" />' . ' '; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Counter Return') . '" alt="" />' . ' '; echo '<font color="red" size="5">' . $_SESSION['Items'.$identifier]->CustomerName . '<br /> ' . _('Counter Return') . ' ' . _('to') . ' ' . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('inventory') . ' (' . _('all amounts in') . ' ' . $_SESSION['Items'.$identifier]->DefaultCurrency . ')'; echo '</font></p>'; } @@ -1582,9 +1582,9 @@ echo '<br /><div class="centre">'; if ($_SESSION['InvoicePortraitFormat']==0){ - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True">'. _('Print this credit note'). ' (' . _('Landscape') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True">'. _('Print this credit note'). ' (' . _('Landscape') . ')</a><br /><br />'; } else { - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True" onClick="return window.location=\'index.php\'">'. _('Print this credit note'). ' (' . _('Portrait') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True" onClick="return window.location=\'index.php\'">'. _('Print this credit note'). ' (' . _('Portrait') . ')</a><br /><br />'; } echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Return') . '</a></div>'; @@ -1604,7 +1604,7 @@ if (isset($_POST['PartSearch']) and $_POST['PartSearch']!=''){ echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />'; - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; echo _('Search for Items') . '</p>'; echo '<div class="page_help_text">' . _('Search for Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />'; echo '<table class="selection"> Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CounterSales.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -223,7 +223,7 @@ } else { /*Not cancelling the order */ - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Counter Sales') . '" alt="" />' . ' '; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Counter Sales') . '" alt="" />' . ' '; echo $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('Counter Sale') . ' ' ._('from') . ' ' . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('inventory') . ' (' . _('all amounts in') . ' ' . $_SESSION['Items'.$identifier]->DefaultCurrency . ')'; echo '</p>'; } @@ -2030,9 +2030,9 @@ echo '<br /><div class="centre">'; if ($_SESSION['InvoicePortraitFormat']==0){ - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; } else { - echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; + echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; } echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Sale') . '</a></div>'; @@ -2071,7 +2071,7 @@ ORDER BY sales DESC LIMIT " . $_SESSION['FrequentlyOrderedItems']; $result2 = DB_query($SQL,$db); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; echo _('Frequently Ordered Items') . '</p><br />'; echo '<div class="page_help_text">' . _('Frequently Ordered Items') . _(', shows the most frequently ordered items in the last 6 months. You can choose from this list, or search further for other items') . '.</div><br />'; echo '<table class="table1">'; @@ -2196,7 +2196,7 @@ if (isset($msg)){ echo '<div class="page_help_text"><p><b>' . $msg . '</b></p></div>'; } - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' '; echo _('Search for Items') . '</p>'; echo '<div class="page_help_text">' . _('Search for Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />'; echo '<table class="selection"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex="1" name="StockCat">'; Modified: trunk/CreditStatus.php =================================================================== --- trunk/CreditStatus.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CreditStatus.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -18,7 +18,7 @@ $Errors = array(); $InputError = 0; echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.' + <img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.' </p> <br />'; Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/Credit_Invoice.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -267,7 +267,7 @@ /* Always display credit quantities NB QtyDispatched in the LineItems array is used for the quantity to credit */ -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title.'</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title.'</p>'; if (!isset($_POST['ProcessCredit'])) { Modified: trunk/Currencies.php =================================================================== --- trunk/Currencies.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/Currencies.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -26,7 +26,7 @@ $Errors = array(); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p> +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p> <br />'; if (isset($_POST['submit'])) { Modified: trunk/CustEDISetup.php =================================================================== --- trunk/CustEDISetup.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustEDISetup.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -14,7 +14,7 @@ $Errors = array(); $i=0; -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />'; if (isset($_POST['submit'])) { //initialise no input errors assumed initially before we test Modified: trunk/CustLoginSetup.php =================================================================== --- trunk/CustLoginSetup.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustLoginSetup.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -29,7 +29,7 @@ $CustomerName=$myrow['name']; echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') . + <img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') . '</p> <br />'; Modified: trunk/CustWhereAlloc.php =================================================================== --- trunk/CustWhereAlloc.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustWhereAlloc.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -11,7 +11,7 @@ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Customer Where Allocated'). '" alt="" />' . $Title . ' + <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Customer Where Allocated'). '" alt="" />' . $Title . ' </p> <table class="selection"> <tr> Modified: trunk/CustomerAllocations.php =================================================================== --- trunk/CustomerAllocations.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustomerAllocations.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -319,7 +319,7 @@ echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/transactions.png" title="' . _('Allocate Receipt') . '" alt="" />' . ' ' . _('Allocate Receipts') . ' + <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Allocate Receipt') . '" alt="" />' . ' ' . _('Allocate Receipts') . ' </p>'; $TableHeader = '<tr> Modified: trunk/CustomerBranches.php =================================================================== --- trunk/CustomerBranches.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustomerBranches.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -363,7 +363,7 @@ $TotalEnable = 0; $TotalDisable = 0; if ($myrow) { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>'; echo '<table class="selection"> <tr> @@ -540,7 +540,7 @@ echo '<input type="hidden" name="SelectedBranch" value="' . $SelectedBranch . '" />'; echo '<input type="hidden" name="BranchCode" value="' . $_POST['BranchCode'] . '" />'; - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>'; if (isset($SelectedBranch)) { echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '">' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>'; @@ -587,7 +587,7 @@ if (!isset($_POST['BranchCode'])) { $_POST['BranchCode']=''; } - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>'; echo '<table class="selection"> <tr> <td>'._('Branch Code'). ':</td> Modified: trunk/CustomerInquiry.php =================================================================== --- trunk/CustomerInquiry.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustomerInquiry.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -123,7 +123,7 @@ } echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Customer') . ' : ' . $CustomerRecord['name'] . ' - (' . _('All amounts stated in') . ' ' . $CustomerRecord['currency'] . ') + <img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Customer') . ' : ' . $CustomerRecord['name'] . ' - (' . _('All amounts stated in') . ' ' . $CustomerRecord['currency'] . ') <br /> <br />' . _('Terms') . ' : ' . $CustomerRecord['terms'] . ' <br />' . _('Credit Limit') . ': ' . locale_number_format($CustomerRecord['creditlimit'],0) . ' ' . _('Credit Status') . ': ' . $CustomerRecord['reasondescription'] . ' @@ -249,11 +249,11 @@ $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" alt="" /></a></td>'; $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" alt="" /></a></td> - <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> + <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" alt="" /></a></td>'; $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td> - <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> + <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" alt="" /></a></td>'; /* assumed allowed page security token 3 allows the user to create credits for invoices */ @@ -267,7 +267,7 @@ printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString . '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' - <img src="' .$RootPath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> + <img src="' .$RootPath. '/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> </tr>', //$BaseFormatString parameters $myrow['typename'], @@ -283,18 +283,18 @@ //$CreditInvoiceFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', //$PreviewInvoiceFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', $RootPath, $PrintCustomerTransactionScript, $myrow['transno'], $RootPath, $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', //Parameter for string for GL Trans Inquiries $RootPath, $myrow['type'], @@ -316,18 +316,18 @@ //CreditInvoiceFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', //$PreviewInvoiceFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', $RootPath, $PrintCustomerTransactionScript, $myrow['transno'], $RootPath, $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images'); + $RootPath.'/css/'.$Theme.'/images'); } } elseif($myrow['type']==10) { /*its an invoice but not high enough priveliges to credit it */ @@ -349,21 +349,21 @@ //$PreviewInvoiceFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', $RootPath, $PrintCustomerTransactionScript, $myrow['transno'], $RootPath, $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images'); + $RootPath.'/css/'.$Theme.'/images'); } elseif ($myrow['type']==11) { /*its a credit note */ if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ printf($BaseFormatString . $PreviewCreditFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$RootPath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>', + '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath .'/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> + <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$RootPath.'/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>', //$BaseFormatString parameters $myrow['typename'], $myrow['transno'], @@ -378,14 +378,14 @@ //$PreviewCreditFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', $RootPath, $PrintCustomerTransactionScript, $myrow['transno'], $RootPath, $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', // hand coded format string for Allocations and GLTrans Inquiry parameters $RootPath, $myrow['id'], @@ -410,26 +410,26 @@ //$PreviewCreditFormatString parameters $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', $RootPath, $PrintCustomerTransactionScript, $myrow['transno'], $RootPath, $RootPath, $myrow['transno'], - $RootPath.'/css/'.$theme.'/images', + $RootPath.'/css/'.$Theme.'/images', //Parameters for hand coded string to show allocations $RootPath, $myrow['id'], - $RootPath.'/css/'.$theme.'/images'); + $RootPath.'/css/'.$Theme.'/images'); } } elseif ($myrow['type']==12 AND $myrow['totalamount']<0) { /*its a receipt which could have an allocation*/ //If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ printf($BaseFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$RootPath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> + '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> + <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$RootPath . '/css/' . $Theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> </tr>', $myrow['typename'], $myrow['transno'], @@ -448,7 +448,7 @@ $myrow['transno']); } else { //no permission for GLTrans Inquiries printf($BaseFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> + '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> </tr>', $myrow['typename'], $myrow['transno'], Modified: trunk/CustomerPurchases.php =================================================================== --- trunk/CustomerPurchases.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustomerPurchases.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -28,7 +28,7 @@ $CustomerRecord = DB_fetch_array($CustomerResult); echo '<p class="page_title_text"> - <img src="' . $RootPath . '/css/' . $theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . ' + <img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . ' </p>'; $SQL = "SELECT stockmoves.stockid, Modified: trunk/CustomerReceipt.php =================================================================== --- trunk/CustomerReceipt.php 2012-12-29 04:00:43 UTC (rev 5784) +++ trunk/CustomerReceipt.php 2012-12-29 04:47:42 UTC (rev 5785) @@ -239,7 +239,7 @@ echo '<br /> <p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="" />' . ' ' . _('Summary of Receipt Batch').' + <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="" />' . ' ' . _('Summary of Receipt Batch').' </p> <br />'; @@ -549,8 +549,8 @@ echo '<br />'; prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch']->BatchNo . ' ' . _('has been successfully entered into the database'),'success'); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>'; - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>'; echo '<p class="page_title_text"><a href="' . $RootPath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a> </p>'; @@ -749,9 +749,9 @@ $AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg); if (isset($_POST['GLEntry'])) { - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('General Ledger Receipt Entry') . '</p>'; + echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/t... [truncated message content] |