From: <rc...@us...> - 2017-04-13 16:34:35
|
Revision: 7751 http://sourceforge.net/p/web-erp/reponame/7751 Author: rchacon Date: 2017-04-13 16:34:26 +0000 (Thu, 13 Apr 2017) Log Message: ----------- Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php and includes/session.php. Modified Paths: -------------- trunk/AccountGroups.php trunk/AccountSections.php trunk/AddCustomerContacts.php trunk/AddCustomerNotes.php trunk/AddCustomerTypeNotes.php trunk/AgedControlledInventory.php trunk/AgedDebtors.php trunk/AgedSuppliers.php trunk/AnalysisHorizontalIncome.php trunk/AnalysisHorizontalPosition.php trunk/Areas.php trunk/AuditTrail.php trunk/AutomaticTranslationDescriptions.php trunk/BOMExtendedQty.php trunk/BOMIndented.php trunk/BOMIndentedReverse.php trunk/BOMInquiry.php trunk/BOMListing.php trunk/BOMs.php trunk/BackupDatabase.php trunk/BankAccountUsers.php trunk/BankAccounts.php trunk/BankMatching.php trunk/BankReconciliation.php trunk/COGSGLPostings.php trunk/CollectiveWorkOrderCost.php trunk/CompanyPreferences.php trunk/ConfirmDispatchControlled_Invoice.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/CreditItemsControlled.php trunk/CreditStatus.php trunk/Credit_Invoice.php trunk/Currencies.php trunk/CustEDISetup.php trunk/CustItem.php trunk/CustLoginSetup.php trunk/CustWhereAlloc.php trunk/CustomerAccount.php trunk/CustomerAllocations.php trunk/CustomerBalancesMovement.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/Dashboard.php trunk/DebtorsAtPeriodEnd.php trunk/DeliveryDetails.php trunk/Departments.php trunk/DiscountCategories.php trunk/DiscountMatrix.php trunk/EDIMessageFormat.php trunk/EDIProcessOrders.php trunk/EDISendInvoices.php trunk/EDISendInvoices_Reece.php trunk/EmailConfirmation.php trunk/EmailCustTrans.php trunk/ExchangeRateTrend.php trunk/FTP_RadioBeacon.php trunk/Factors.php trunk/FixedAssetCategories.php trunk/FixedAssetDepreciation.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/GLAccountUsers.php trunk/GLAccounts.php trunk/GLBalanceSheet.php trunk/GLBudgets.php trunk/GLCashFlowsIndirect.php trunk/GLCashFlowsSetup.php trunk/GLCodesInquiry.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/GLTrialBalance_csv.php trunk/GeocodeSetup.php trunk/GetStockImage.php trunk/GoodsReceived.php trunk/GoodsReceivedControlled.php trunk/HistoricalTestResults.php trunk/ImportBankTrans.php trunk/ImportBankTransAnalysis.php trunk/InternalStockCategoriesByRole.php trunk/InternalStockRequest.php trunk/InternalStockRequestAuthorisation.php trunk/InternalStockRequestFulfill.php trunk/InternalStockRequestInquiry.php trunk/InventoryPlanning.php trunk/InventoryPlanningPrefSupplier.php trunk/InventoryQuantities.php trunk/InventoryValuation.php trunk/Labels.php trunk/LocationUsers.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/MailInventoryValuation.php trunk/MailSalesReport.php trunk/MailSalesReport_csv.php trunk/MailingGroupMaintenance.php trunk/MaintenanceReminders.php trunk/MaintenanceTasks.php trunk/MaintenanceUserSchedule.php trunk/ManualContents.php trunk/Manufacturers.php trunk/MaterialsNotUsed.php trunk/NoSalesItems.php trunk/OffersReceived.php trunk/OrderDetails.php trunk/OutstandingGRNs.php trunk/PDFBankingSummary.php trunk/PDFCOA.php trunk/PDFChequeListing.php trunk/PDFCustTransListing.php trunk/PDFCustomerList.php trunk/PDFDIFOT.php trunk/PDFDeliveryDifferences.php trunk/PDFFGLabel.php trunk/PDFGLJournal.php trunk/PDFGLJournalCN.php trunk/PDFGrn.php trunk/PDFLowGP.php trunk/PDFOrderStatus.php trunk/PDFOrdersInvoiced.php trunk/PDFPeriodStockTransListing.php trunk/PDFPickingList.php trunk/PDFPriceList.php trunk/PDFPrintLabel.php trunk/PDFProdSpec.php trunk/PDFQALabel.php trunk/PDFQuotation.php trunk/PDFQuotationPortrait.php trunk/PDFReceipt.php trunk/PDFRemittanceAdvice.php trunk/PDFSalesBySalesperson.php trunk/PDFSellThroughSupportClaim.php trunk/PDFStockCheckComparison.php trunk/PDFStockLocTransfer.php trunk/PDFStockNegatives.php trunk/PDFStockTransfer.php trunk/PDFSuppTransListing.php trunk/PDFTopItems.php trunk/PDFWOPrint.php trunk/PDFWeeklyOrders.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_PDFPurchOrder.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/PcAnalysis.php trunk/PcAssignCashTabToTab.php trunk/PcAssignCashToTab.php trunk/PcAuthorizeExpenses.php trunk/PcClaimExpensesFromTab.php trunk/PcExpenses.php trunk/PcExpensesTypeTab.php trunk/PcReportExpense.php trunk/PcReportTab.php trunk/PcTabExpensesList.php trunk/PcTabs.php trunk/PcTypeTabs.php trunk/PeriodsInquiry.php trunk/PriceMatrix.php trunk/Prices.php trunk/PricesBasedOnMarkUp.php trunk/PricesByCost.php trunk/Prices_Customer.php trunk/PrintCheque.php trunk/PrintCustOrder.php trunk/PrintCustOrder_generic.php trunk/PrintCustStatements.php trunk/PrintCustTrans.php trunk/PrintCustTransPortrait.php trunk/PrintWOItemSlip.php trunk/ProductSpecs.php trunk/PurchData.php trunk/PurchaseByPrefSupplier.php trunk/PurchasesReport.php trunk/QATests.php trunk/RecurringSalesOrders.php trunk/RecurringSalesOrdersProcess.php trunk/RelatedItemsUpdate.php trunk/ReorderLevel.php trunk/ReorderLevelLocation.php trunk/ReprintGRN.php trunk/ReverseGRN.php trunk/RevisionTranslations.php trunk/SMTPServer.php trunk/SalesAnalReptCols.php trunk/SalesAnalRepts.php trunk/SalesAnalysis_UserDefined.php trunk/SalesByTypePeriodInquiry.php trunk/SalesCategories.php trunk/SalesCategoryPeriodInquiry.php trunk/SalesGLPostings.php trunk/SalesGraph.php trunk/SalesInquiry.php trunk/SalesPeople.php trunk/SalesTopCustomersInquiry.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/SelectQASamples.php trunk/SelectRecurringSalesOrder.php trunk/SelectSalesOrder.php trunk/SelectSupplier.php trunk/SelectWorkOrder.php trunk/SellThroughSupport.php trunk/ShipmentCosting.php trunk/Shipments.php trunk/Shippers.php trunk/Shipt_Select.php trunk/ShiptsList.php trunk/ShopParameters.php trunk/SpecialOrder.php trunk/StockAdjustments.php trunk/StockAdjustmentsControlled.php trunk/StockCategories.php trunk/StockCategorySalesInquiry.php trunk/StockCheck.php trunk/StockClone.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/StockUsageGraph.php trunk/Stocks.php trunk/SuppContractChgs.php trunk/SuppCreditGRNs.php trunk/SuppFixedAssetChgs.php trunk/SuppInvGRNs.php trunk/SuppLoginSetup.php trunk/SuppPaymentRun.php trunk/SuppPriceList.php trunk/SuppShiptChgs.php trunk/SuppTransGLAnalysis.php trunk/SuppWhereAlloc.php trunk/SupplierAllocations.php trunk/SupplierBalsAtPeriodEnd.php trunk/SupplierContacts.php trunk/SupplierCredit.php trunk/SupplierGRNAndInvoiceInquiry.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/TestPlanResults.php trunk/TopItems.php trunk/UnitsOfMeasure.php trunk/UpgradeDatabase.php trunk/UserBankAccounts.php trunk/UserGLAccounts.php trunk/UserLocations.php trunk/UserSettings.php trunk/WOCanBeProducedNow.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_AutoCustomerAllocations.php trunk/Z_BottomUpCosts.php trunk/Z_ChangeBranchCode.php trunk/Z_ChangeCustomerCode.php trunk/Z_ChangeGLAccountCode.php trunk/Z_ChangeLocationCode.php trunk/Z_ChangeStockCategory.php trunk/Z_ChangeStockCode.php trunk/Z_ChangeSupplierCode.php trunk/Z_CheckAllocationsFrom.php trunk/Z_CheckAllocs.php trunk/Z_CheckDebtorsControl.php trunk/Z_CheckGLTransBalance.php trunk/Z_ClearPOBackOrders.php trunk/Z_CreateChartDetails.php trunk/Z_CreateCompany.php trunk/Z_CreateCompanyTemplateFile.php trunk/Z_CurrencyDebtorsBalances.php trunk/Z_CurrencySuppliersBalances.php trunk/Z_DataExport.php trunk/Z_DeleteCreditNote.php trunk/Z_DeleteInvoice.php trunk/Z_DeleteOldPrices.php trunk/Z_DeleteSalesTransActions.php trunk/Z_DescribeTable.php trunk/Z_ExportSalesAnalysis.php trunk/Z_GLAccountUsersCopyAuthority.php trunk/Z_ImportChartOfAccounts.php trunk/Z_ImportCustbranch.php trunk/Z_ImportDebtors.php trunk/Z_ImportFixedAssets.php trunk/Z_ImportGLAccountGroups.php trunk/Z_ImportGLAccountSections.php trunk/Z_ImportGLTransactions.php trunk/Z_ImportPartCodes.php trunk/Z_ImportPriceList.php trunk/Z_ImportStocks.php trunk/Z_ImportSuppliers.php trunk/Z_ItemsWithoutPicture.php trunk/Z_MakeLocUsers.php trunk/Z_MakeNewCompany.php trunk/Z_MakeStockLocns.php trunk/Z_ReApplyCostToSA.php trunk/Z_RePostGLFromPeriod.php trunk/Z_RebuildSalesAnalysis.php trunk/Z_ReverseSuppPaymentRun.php trunk/Z_SalesIntegrityCheck.php trunk/Z_UpdateChartDetailsBFwd.php trunk/Z_UpdateItemCosts.php trunk/Z_UpdateSalesAnalysisWithLatestCustomerData.php trunk/Z_Upgrade3.10.php trunk/Z_Upgrade_3.01-3.02.php trunk/Z_Upgrade_3.04-3.05.php trunk/Z_Upgrade_3.05-3.06.php trunk/Z_Upgrade_3.07-3.08.php trunk/Z_Upgrade_3.08-3.09.php trunk/Z_Upgrade_3.09-3.10.php trunk/Z_Upgrade_3.10-3.11.php trunk/Z_Upgrade_3.11-4.00.php trunk/Z_UploadForm.php trunk/Z_UploadResult.php trunk/Z_poAddLanguage.php trunk/Z_poAdmin.php trunk/Z_poEditLangHeader.php trunk/Z_poEditLangModule.php trunk/Z_poEditLangRemaining.php trunk/Z_poRebuildDefault.php trunk/doc/Change.log trunk/doc/Manual/ManualNewScripts.html trunk/doc/Manual/ManualOutline.php trunk/geo_displaymap_customers.php trunk/geo_displaymap_suppliers.php trunk/geocode.php trunk/geocode_genxml_customers.php trunk/geocode_genxml_suppliers.php trunk/includes/Add_SerialItems.php trunk/includes/ConnectDB_mysql.inc trunk/includes/ConnectDB_mysqli.inc trunk/includes/ConnectDB_postgres.inc trunk/includes/ConstructSQLForUserDefinedSalesReport.inc trunk/includes/CurrenciesArray.php trunk/includes/DefineImportBankTransClass.php trunk/includes/DefineLabelClass.php trunk/includes/DefineOfferClass.php trunk/includes/DefineSerialItems.php trunk/includes/DefineStockAdjustment.php trunk/includes/DefineTenderClass.php trunk/includes/EDIconfig.inc trunk/includes/GLPostings.inc trunk/includes/GLPostingsZero.inc trunk/includes/GetPrice.inc trunk/includes/ImportBankTrans_MT940_SCB.php trunk/includes/InputSerialItemsExisting.php trunk/includes/InputSerialItemsFile.php trunk/includes/LanguageSetup.php trunk/includes/PDFPaymentRun_PymtFooter.php trunk/includes/PDFSalesAnalysis.inc trunk/includes/PDFStarter.php trunk/includes/PDFStockLocTransferHeader.inc trunk/includes/PDFWOPageHeader.inc trunk/includes/SQL_CommonFunctions.inc trunk/includes/SelectOrderItems_IntoCart.inc trunk/includes/smtp.php trunk/index.php trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/Manual/ManualContents.php trunk/locale/de_DE.utf8/Manual/ManualMultilanguage.html trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html trunk/locale/de_DE.utf8/Manual/ManualSecuritySchema.html trunk/locale/de_DE.utf8/Manual/ManualSecuritySchemaorig.html 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.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 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.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po 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.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po 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.po trunk/locale/zh_CN.utf8/Manual/ManualAPIFunctions.php trunk/locale/zh_CN.utf8/Manual/ManualContents.php trunk/locale/zh_CN.utf8/Manual/ManualMultilanguage.html trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html trunk/locale/zh_CN.utf8/Manual/ManualSecuritySchema.html 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/locale/zh_HK.utf8/Manual/ManualMultilanguage.html trunk/locale/zh_HK.utf8/Manual/ManualNewScripts.html trunk/locale/zh_HK.utf8/Manual/ManualSecuritySchema.html trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po trunk/report_runner.php trunk/reportwriter/FormMaker.php trunk/reportwriter/ReportMaker.php trunk/reportwriter/admin/ReportCreator.php Added Paths: ----------- trunk/includes/footer.php trunk/includes/header.php trunk/includes/session.php Removed Paths: ------------- trunk/includes/footer.inc trunk/includes/header.inc trunk/includes/session.inc Modified: trunk/AccountGroups.php =================================================================== --- trunk/AccountGroups.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AccountGroups.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* Defines the groupings of general ledger accounts */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Account Groups'); $ViewTopic= 'GeneralLedger'; $BookMark = 'AccountGroups'; -include('includes/header.inc'); +include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); @@ -352,7 +352,7 @@ $result = DB_query($sql,$ErrMsg,$DbgMsg); if(DB_num_rows($result) == 0) { prnMsg( _('The account group name does not exist in the database'),'error'); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } $myrow = DB_fetch_array($result); @@ -489,5 +489,5 @@ } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/AccountSections.php =================================================================== --- trunk/AccountSections.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AccountSections.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* Defines the sections in the general ledger reports */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Account Sections'); $ViewTopic = 'GeneralLedger'; $BookMark = 'AccountSections'; -include('includes/header.inc'); +include('includes/header.php'); // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE $sql= "SELECT sectionid FROM accountsection WHERE sectionid=1"; @@ -291,5 +291,5 @@ </form>'; } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/AddCustomerContacts.php =================================================================== --- trunk/AddCustomerContacts.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AddCustomerContacts.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* Adds customer contacts */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Customer Contacts'); $ViewTopic = 'AccountsReceivable'; $BookMark = 'AddCustomerContacts'; -include('includes/header.inc'); +include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); @@ -304,5 +304,5 @@ } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/AddCustomerNotes.php =================================================================== --- trunk/AddCustomerNotes.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AddCustomerNotes.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,9 +2,9 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Customer Notes'); -include('includes/header.inc'); +include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); if (isset($_GET['Id'])){ @@ -249,5 +249,5 @@ } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/AddCustomerTypeNotes.php =================================================================== --- trunk/AddCustomerTypeNotes.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AddCustomerTypeNotes.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -1,9 +1,9 @@ <?php /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Customer Type (Group) Notes'); -include('includes/header.inc'); +include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); if (isset($_GET['Id'])){ @@ -225,5 +225,5 @@ } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/AgedControlledInventory.php =================================================================== --- trunk/AgedControlledInventory.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AgedControlledInventory.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id: AgedControlledInventory.php 1 2014-08-08 04:47:42Z agaluski $ */ -include('includes/session.inc'); +include('includes/session.php'); $PricesSecurity = 12;//don't show pricing info unless security token 12 available to user $Today = time(); $Title = _('Aged Controlled Inventory') . ' ' ._('as-of') .' ' . Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' + 0 days')); -include('includes/header.inc'); +include('includes/header.php'); echo '<p class="page_title_text"> <img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') . @@ -91,5 +91,5 @@ echo '<td colspan="3"><b>' . _('Total') . '</b></td><td class="number"><b>' . locale_number_format($TotalQty,2) . '</td><td class="number"><b>' . locale_number_format($TotalVal,2) . '</td><td colspan="2"></td>'; echo '</table>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/AgedDebtors.php =================================================================== --- trunk/AgedDebtors.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AgedDebtors.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,7 +2,7 @@ /* $Id$ */ /* Lists customer account balances in detail or summary in selected currency */ -include('includes/session.inc'); +include('includes/session.php'); if(isset($_POST['PrintPDF']) and isset($_POST['FromCriteria']) @@ -266,13 +266,13 @@ if(DB_error_no() !=0) { $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... '; - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; if($debug==1) { echo '<br />' . $SQL; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -368,13 +368,13 @@ $DetailResult = DB_query($sql,'','',False,False); /*Dont trap errors */ if(DB_error_no() !=0) { $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....'; - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; if($debug==1) { echo '<br />' . _('The SQL that failed was') . '<br />' . $sql; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -432,10 +432,10 @@ if($ListCount == 0) { $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....'; - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('There are no customers with balances meeting the criteria specified to list'),'info'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { $pdf->OutputD($_SESSION['DatabaseName'] . '_' . 'AgedDebtors_' . date('Y-m-d') . '.pdf'); @@ -449,7 +449,7 @@ $ViewTopic = 'ARReports'; $BookMark = 'AgedDebtors'; - include('includes/header.inc'); + include('includes/header.php'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />'; @@ -529,6 +529,6 @@ </div> </form>'; } - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ ?> Modified: trunk/AgedSuppliers.php =================================================================== --- trunk/AgedSuppliers.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AgedSuppliers.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,7 +2,7 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); if (isset($_POST['PrintPDF']) and isset($_POST['FromCriteria']) @@ -106,13 +106,13 @@ if (DB_error_no() !=0) { $Title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ; - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('The Supplier details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; if ($debug==1){ echo '<br />' . $SQL; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -193,13 +193,13 @@ $DetailResult = DB_query($sql,'','',False,False); /*dont trap errors - trapped below*/ if (DB_error_no() !=0) { $Title = _('Aged Supplier Account Analysis - Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; if ($debug==1){ echo '<br />' . _('The SQL that failed was') . '<br />' . $sql; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -261,9 +261,9 @@ if ($ListCount == 0) { $Title = _('Aged Supplier Analysis'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('There are no results so the PDF is empty')); - include('includes/footer.inc'); + include('includes/footer.php'); } else { $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf'); } @@ -271,7 +271,7 @@ } else { /*The option to print PDF was not hit */ $Title = _('Aged Supplier Analysis'); - include('includes/header.inc'); + include('includes/header.php'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />'; @@ -329,7 +329,7 @@ </div> </form>'; } - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ ?> Modified: trunk/AnalysisHorizontalIncome.php =================================================================== --- trunk/AnalysisHorizontalIncome.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AnalysisHorizontalIncome.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -11,7 +11,7 @@ } } -include ('includes/session.inc'); +include ('includes/session.php'); $Title = _('Horizontal Analysis of Statement of Comprehensive Income');// Screen identification. $ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC. $BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document. @@ -23,7 +23,7 @@ $_POST['SelectADifferentPeriod']='Select A Different Period'; } -include('includes/header.inc'); +include('includes/header.php'); if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) { echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/printer.png" title="', // Icon image. @@ -129,7 +129,7 @@ if($NumberOfMonths >12) { echo '<br />'; prnMsg(_('A period up to 12 months in duration can be specified') . ' - ' . _('the system automatically shows a comparative for the same period from the previous year') . ' - ' . _('it cannot do this if a period of more than 12 months is specified') . '. ' . _('Please select an alternative period range'),'error'); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -523,5 +523,5 @@ '</div>'; } echo '</form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/AnalysisHorizontalPosition.php =================================================================== --- trunk/AnalysisHorizontalPosition.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AnalysisHorizontalPosition.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -11,7 +11,7 @@ } } -include ('includes/session.inc'); +include ('includes/session.php'); $Title = _('Horizontal Analysis of Statement of Financial Position');// Screen identification. $ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC. $BookMark = 'AnalysisHorizontalPosition';// Anchor's id in the manual's html document. @@ -21,7 +21,7 @@ if(! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])) { /*Show a form to allow input of criteria for TB to show */ - include('includes/header.inc'); + include('includes/header.php'); echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/printer.png" title="', // Icon image. _('Print Horizontal Analysis of Statement of Financial Position'), '" /> ', // Icon title. @@ -83,7 +83,7 @@ include ('includes/GLPostings.inc'); } else { - include('includes/header.inc'); + include('includes/header.php'); $RetainedEarningsAct = $_SESSION['CompanyRecord']['retainedearnings']; @@ -363,5 +363,5 @@ '</div>'; } echo '</form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/Areas.php =================================================================== --- trunk/Areas.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/Areas.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,12 +2,12 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Sales Area Maintenance'); $ViewTopic= 'CreatingNewSystem'; $BookMark = 'Areas'; -include('includes/header.inc'); +include('includes/header.php'); if (isset($_GET['SelectedArea'])){ @@ -236,5 +236,5 @@ } //end if record deleted no point displaying form to add record -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/AuditTrail.php =================================================================== --- trunk/AuditTrail.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AuditTrail.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$ */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Audit Trail'); -include('includes/header.inc'); +include('includes/header.php'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>'; @@ -224,6 +224,6 @@ } echo '</table>'; } -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/AutomaticTranslationDescriptions.php =================================================================== --- trunk/AutomaticTranslationDescriptions.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/AutomaticTranslationDescriptions.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -1,11 +1,11 @@ <?php /* $Id: AutomaticTranslationDescriptions.php 7037 2014-12-22 14:45:20Z tehonu $ */ -include ('includes/session.inc'); +include ('includes/session.php'); $Title = _('Translate Item Descriptions'); $ViewTopic = 'SpecialUtilities'; // Filename in ManualContents.php's TOC. $BookMark = 'Z_TranslateItemDescriptions'; // Anchor's id in the manual's html document. -include ('includes/header.inc'); +include ('includes/header.php'); include ('includes/GoogleTranslator.php'); @@ -52,7 +52,7 @@ "needsrevision= '1' " . "WHERE stockid='" . $myrow['stockid'] . "' AND (language_id='" . $myrow['language_id'] . "')"; $update = DB_query($sql, $ErrMsg, $DbgMsg, true); - + if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -66,9 +66,9 @@ <td>%s</td> <td>%s</td> <td>%s</td> - </tr>', - $i, - $myrow['stockid'], + </tr>', + $i, + $myrow['stockid'], $myrow['description'], $myrow['language_id'], $TranslatedText @@ -97,9 +97,9 @@ <td>%s</td> <td>%s</td> <td>%s</td> - </tr>', - $i, - $myrow['stockid'], + </tr>', + $i, + $myrow['stockid'], $myrow['longdescription'], $myrow['language_id'], $TranslatedText @@ -120,5 +120,5 @@ } -include ('includes/footer.inc'); +include ('includes/footer.php'); ?> Modified: trunk/BOMExtendedQty.php =================================================================== --- trunk/BOMExtendedQty.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMExtendedQty.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -4,7 +4,7 @@ // BOMExtendedQty.php - Quantity Extended Bill of Materials -include('includes/session.inc'); +include('includes/session.php'); if (isset($_POST['PrintPDF'])) { @@ -152,13 +152,13 @@ if (DB_error_no() !=0) { $Title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg( _('The Quantiy Extended BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error'); echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; if ($debug==1){ echo '<br />' . $sql; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -239,10 +239,10 @@ } if ($ListCount == 0) { $Title = _('Print Indented BOM Listing Error'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('There were no items for the selected assembly'),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { $pdf->OutputD($_SESSION['DatabaseName'] . '_BOM_Extended_Qty_' . date('Y-m-d').'.pdf'); @@ -252,7 +252,7 @@ } else { /*The option to print PDF was not hit so display form */ $Title=_('Quantity Extended BOM Listing'); - include('includes/header.inc'); + include('includes/header.php'); 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"> @@ -291,7 +291,7 @@ </div> </form>'; - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMIndented.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -4,7 +4,7 @@ // BOMIndented.php - Indented Bill of Materials -include('includes/session.inc'); +include('includes/session.php'); if (isset($_POST['PrintPDF'])) { @@ -151,13 +151,13 @@ if (DB_error_no() !=0) { $Title = _('Indented BOM Listing') . ' - ' . _('Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg( _('The Indented BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error'); echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; if ($debug==1){ echo '<br />' . $sql; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -232,10 +232,10 @@ if ($ListCount == 0) { $Title = _('Print Indented BOM Listing Error'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('There were no items for the selected assembly'),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { $pdf->OutputD($_SESSION['DatabaseName'] . '_Bill_Of_Material_Indented_' . date('Y-m-d').'.pdf'); @@ -245,7 +245,7 @@ } else { /*The option to print PDF was not hit so display form */ $Title=_('Indented BOM Listing'); - include('includes/header.inc'); + include('includes/header.php'); 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"> @@ -280,7 +280,7 @@ </div> </form>'; - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ Modified: trunk/BOMIndentedReverse.php =================================================================== --- trunk/BOMIndentedReverse.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMIndentedReverse.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -5,7 +5,7 @@ // BOMIndented.php - Reverse Indented Bill of Materials - From lowest level component to top level // assembly -include('includes/session.inc'); +include('includes/session.php'); if (isset($_POST['PrintPDF'])) { @@ -138,7 +138,7 @@ if (DB_error_no() !=0) { $Title = _('Indented BOM Listing') . ' - ' . _('Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg( _('The Indented BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error'); echo '<br /> <a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; @@ -145,7 +145,7 @@ if ($debug==1){ echo '<br />' . $sql; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -217,10 +217,10 @@ } if ($ListCount == 0) { $Title = _('Print Reverse Indented BOM Listing Error'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('There were no items for the selected component'),'error'); echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf'); @@ -230,7 +230,7 @@ } else { /*The option to print PDF was not hit so display form */ $Title=_('Reverse Indented BOM Listing'); - include('includes/header.inc'); + include('includes/header.php'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />'; @@ -257,7 +257,7 @@ </div> </form>'; - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ Modified: trunk/BOMInquiry.php =================================================================== --- trunk/BOMInquiry.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMInquiry.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,9 +2,9 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Costed Bill Of Material'); -include('includes/header.inc'); +include('includes/header.php'); if (isset($_GET['StockID'])){ $StockID =trim(mb_strtoupper($_GET['StockID'])); @@ -256,5 +256,5 @@ prnMsg(_('Enter a stock item code above') . ', ' . _('to view the costed bill of material for'),'info'); } -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/BOMListing.php =================================================================== --- trunk/BOMListing.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMListing.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,7 +2,7 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); If (isset($_POST['PrintPDF']) AND isset($_POST['FromCriteria']) @@ -40,20 +40,20 @@ if (DB_error_no() !=0) { $Title = _('Bill of Materials Listing') . ' - ' . _('Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error'); echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; if ($debug==1){ echo '<br />' . $SQL; } - include('includes/footer.inc'); + include('includes/footer.php'); exit; } if (DB_num_rows($BOMResult)==0){ $Title = _('Bill of Materials Listing') . ' - ' . _('Problem Report'); - include('includes/header.inc'); + include('includes/header.php'); prnMsg( _('The Bill of Material listing has no bills to report on'),'warn'); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -106,7 +106,7 @@ } else { /*The option to print PDF was not hit */ $Title=_('Bill Of Material Listing'); - include('includes/header.inc'); + include('includes/header.php'); 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'])) { @@ -132,7 +132,7 @@ </div> </form>'; } - include('includes/footer.inc'); + include('includes/footer.php'); } /*end of else not PrintPDF */ Modified: trunk/BOMs.php =================================================================== --- trunk/BOMs.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BOMs.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Multi-Level Bill Of Materials Maintenance'); -include('includes/header.inc'); +include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); function display_children($Parent, $Level, &$BOMTree) { @@ -17,7 +17,7 @@ // retrive all children of parent $c_result = DB_query("SELECT parent, component, - sequence/pow(10,digitals) + sequence/pow(10,digitals) AS sequence FROM bom WHERE parent='" . $Parent. "' @@ -42,7 +42,7 @@ } else { prnMsg(_('The component and the parent is the same'),'error'); echo $row['component'] . '<br/>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } } @@ -99,7 +99,7 @@ stockmaster.decimalplaces FROM bom INNER JOIN stockmaster ON bom.component=stockmaster.stockid - INNER JOIN stockcategory + INNER JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid INNER JOIN locations ON bom.loccode = locations.loccode @@ -309,7 +309,7 @@ $Errors[$i] = 'Quantity'; $i++; } - /* Comment this out to make substittute material can be recorded in the BOM + /* Comment this out to make substittute material can be recorded in the BOM if (filter_number_format($_POST['Quantity'])==0) { $InputError = 1; prnMsg(_('The quantity entered cannot be zero'),'error'); @@ -835,7 +835,7 @@ if (DB_num_rows($result)==0){ prnMsg( _('There are no work centres set up yet') . '. ' . _('Please use the link below to set up work centres') . '.','warn'); echo '<a href="' . $RootPath . '/WorkCentres.php">' . _('Work Centre Maintenance') . '</a></td></tr></table><br />'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -905,7 +905,7 @@ } else { echo '<input type="hidden" name="AutoIssue" value="0" />'; } - + echo '<tr><td>' . _('Remark') . '</td> <td><textarea rows="3" col="20" name="Remark" >' . $_POST['Remark'] . '</textarea></td> </tr>'; @@ -1084,7 +1084,7 @@ return $arrayRewrite; } -include('includes/footer.inc'); +include('includes/footer.php'); function GetDigitals($Sequence) { $SQLNumber = filter_number_format($Sequence); return strlen(substr(strrchr($SQLNumber, "."),1)); Modified: trunk/BackupDatabase.php =================================================================== --- trunk/BackupDatabase.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BackupDatabase.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -3,9 +3,9 @@ $PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Backup webERP Database'); -include('includes/header.inc'); +include('includes/header.php'); if (isset($_GET['BackupFile'])){ $BackupFiles = scandir('companies/' . $_SESSION['DatabaseName'], 0); @@ -57,5 +57,5 @@ prnMsg(_('A backup of the database has been taken and emailed to you'), 'info'); unlink($BackupFile); // would be a security issue to leave it there for all to download/see */ -include('includes/footer.inc'); +include('includes/footer.php'); ?> \ No newline at end of file Modified: trunk/BankAccountUsers.php =================================================================== --- trunk/BankAccountUsers.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BankAccountUsers.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id: BankAccountUsers.php 6946 2014-10-27 07:30:11Z daintree $*/ /* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP) */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Bank Account Users'); $ViewTopic = 'GeneralLedger'; $BookMark = 'BankAccountUsers'; -include('includes/header.inc'); +include('includes/header.php'); echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. '/images/bank.png" title="' . @@ -234,5 +234,5 @@ } // end if user wish to delete } -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/BankAccounts.php =================================================================== --- trunk/BankAccounts.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BankAccounts.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* This script defines the general ledger code for bank accounts and specifies that bank transactions be created for these accounts for the purposes of reconciliation. */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Bank Accounts');// Screen identificator. $ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC. $BookMark = 'BankAccounts';// Anchor's id in the manual's html document. -include('includes/header.inc'); +include('includes/header.php'); echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. '/images/bank.png" title="' . _('Bank') . '" /> ' .// Icon title. @@ -433,5 +433,5 @@ <div class="centre"><input tabindex="9" type="submit" name="submit" value="'. _('Enter Information') .'" /></div> </div> </form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/BankMatching.php =================================================================== --- trunk/BankMatching.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BankMatching.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* This script allows payments and receipts to be matched off against bank statements. */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Bank Matching');// Screen identificator. $ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC. $BookMark = 'BankMatching';// Filename's id in ManualContents.php's TOC. -include('includes/header.inc'); +include('includes/header.php'); if ((isset($_GET['Type']) AND $_GET['Type']=='Receipts') OR (isset($_POST['Type']) AND $_POST['Type']=='Receipts')){ @@ -31,7 +31,7 @@ } else { prnMsg(_('This page must be called with a bank transaction type') . '. ' . _('It should not be called directly'),'error'); - include ('includes/footer.inc'); + include ('includes/footer.php'); exit; } @@ -352,5 +352,5 @@ } echo '</div>'; echo '</form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/BankReconciliation.php =================================================================== --- trunk/BankReconciliation.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/BankReconciliation.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$*/ /* This script displays the bank reconciliation for a selected bank account. */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Bank Reconciliation');;// Screen identificator. $ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC. $BookMark = 'BankAccounts';// Anchor's id in the manual's html document. -include('includes/header.inc'); +include('includes/header.php'); echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; echo '<div>'; @@ -118,7 +118,7 @@ </tr> </table> <p>' . _('Bank Accounts have not yet been defined') . '. ' . _('You must first') . '<a href="' . $RootPath . '/BankAccounts.php">' . _('define the bank accounts') . '</a>' . ' ' . _('and general ledger accounts to be affected') . '.'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { while ($myrow=DB_fetch_array($AccountsResults)){ @@ -397,5 +397,5 @@ } echo '</div>'; echo '</form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/COGSGLPostings.php =================================================================== --- trunk/COGSGLPostings.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/COGSGLPostings.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -1,15 +1,20 @@ <?php - /* $Id$*/ +/* Defines the general ledger account to be used for cost of sales entries */ -include('includes/session.inc'); - +include('includes/session.php'); $Title = _('Cost Of Sales GL Postings Set Up'); -$ViewTopic= 'CreatingNewSystem'; -$BookMark = 'SalesGLPostings'; -include('includes/header.inc'); +$ViewTopic = 'CreatingNewSystem'; +$BookMark = 'COGSGLPostings'; +include('includes/header.php'); +echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/maintenance.png" title="', // Icon image. + $Title, '" /> ', // Icon title. + $Title, '</p> + <br />';// Page title. + if (isset($_POST['SelectedCOGSPostingID'])){ $SelectedCOGSPostingID=$_POST['SelectedCOGSPostingID']; } elseif (isset($_GET['SelectedCOGSPostingID'])){ @@ -16,8 +21,6 @@ $SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID']; } -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />'; - if (isset($_POST['submit'])) { /* actions to take once the user has clicked the submit button @@ -127,7 +130,7 @@ cogsglpostings.area, cogsglpostings.stkcat, cogsglpostings.salestype - FROM cogsglpostings + FROM cogsglpostings ORDER BY cogsglpostings.area, cogsglpostings.stkcat, cogsglpostings.salestype"; @@ -370,5 +373,5 @@ </div> </form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/CollectiveWorkOrderCost.php =================================================================== --- trunk/CollectiveWorkOrderCost.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/CollectiveWorkOrderCost.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -1,11 +1,19 @@ <?php +/* $Id: CollectiveWorkOrderCost.php 6946 2016-05-06 07:30:11Z exsonqu $*/ +/* Multiple work orders cost review */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Search Work Orders'); -include('includes/header.inc'); +$ViewTopic = 'GeneralLedger'; +$BookMark = 'Z_ChangeGLAccountCode'; +include('includes/header.php'); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p> - <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> +echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, + '/images/magnifier.png" title="', // Icon image. + $Title, '" /> ', // Icon title. + $Title, '</p>';// Page title. + +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -49,7 +57,7 @@ <th class="ascending">' . _('Work Order') . '</th> </tr>'; $i = 0; - $TotalCost = 0; + $TotalCost = 0; while ($myrow = DB_fetch_array($result)){ if ($i==0) { echo '<tr class="EvenTableRows">'; @@ -67,19 +75,19 @@ <td class="number">' . locale_number_format($IssuedQty,$myrow['decimalplaces']) . '</td> <td class="number">' . locale_number_format($IssuedCost,2) . '</td> <td>' . $myrow['reference'] . '</td> - </tr>'; + </tr>'; } echo '<tr><td colspan="4"><b>' . _('Total Cost') . '</b></td> <td colspan="2"><b>' .locale_number_format($TotalCost,2) . '</b></td> - </tr></table>'; + </tr></table>'; } else { prnMsg(_('There are no data available'),'error'); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } }//end of the work orders are not empty echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select Other Work Orders') . '</a>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -111,7 +119,7 @@ if (!is_numeric($SelectedWO)){ prnMsg(_('The work order number entered MUST be numeric'),'warn'); unset ($SelectedWO); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } else { echo _('Work Order Number') . ' - ' . $SelectedWO; @@ -206,9 +214,9 @@ echo _('Work Order number') . ': <input type="text" name="WO" autofocus="autofocus" maxlength="8" size="9" /> ' . _('Processing at') . ':<select name="StockLocation"> '; $sql = "SELECT locations.loccode, locationname FROM locations - INNER JOIN locationusers - ON locationusers.loccode=locations.loccode - AND locationusers.userid='" . $_SESSION['UserID'] . "' + INNER JOIN locationusers + ON locationusers.loccode=locations.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE locations.usedforwo = 1"; @@ -264,7 +272,7 @@ </tr> <tr> <td colspan="2">' . _('Start Date From') . ':<input type="text" name="DateFrom" value="' . $_POST['DateFrom'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" /> - + ' . _('Start Date To') . ':<input type="text" name="DateTo" value="' . $_POST['DateTo'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" /> </td> </tr> @@ -365,7 +373,7 @@ if (!empty($_POST['DateTo'])) { $StartDateTo = " AND workorders.startdate<='" . FormatDateForSQL($_POST['DateTo']) . "'"; } - + if (isset($SelectedWO) AND $SelectedWO !='') { $SQL = "SELECT workorders.wo, woitems.stockid, @@ -515,5 +523,5 @@ </form>'; } -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/CompanyPreferences.php =================================================================== --- trunk/CompanyPreferences.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/CompanyPreferences.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,11 +2,11 @@ /* $Id$ */ /* Defines the settings applicable for the company, including name, address, tax authority reference, whether GL integration used etc. */ -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Company Preferences'); $ViewTopic= 'CreatingNewSystem'; $BookMark = 'CompanyParameters'; -include('includes/header.inc'); +include('includes/header.php'); if (isset($Errors)) { unset($Errors); @@ -467,5 +467,5 @@ </div>'; echo '</div></form>'; -include('includes/footer.inc'); +include('includes/footer.php'); ?> Modified: trunk/ConfirmDispatchControlled_Invoice.php =================================================================== --- trunk/ConfirmDispatchControlled_Invoice.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/ConfirmDispatchControlled_Invoice.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -4,11 +4,11 @@ include('includes/DefineCartClass.php'); include('includes/DefineSerialItems.php'); -include('includes/session.inc'); +include('includes/session.php'); $Title = _('Specify Dispatched Controlled Items'); -/* Session started in header.inc for password checking and authorisation level check */ -include('includes/header.inc'); +/* Session started in header.php for password checking and authorisation level check */ +include('includes/header.php'); if (empty($_GET['identifier'])) { @@ -29,7 +29,7 @@ <br />'; prnMsg( _('This page can only be opened if a line item on a sales order to be invoiced has been selected') . '. ' . _('Please do that first'),'error'); echo '</div>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -40,7 +40,7 @@ <br />'; prnMsg( _('This page can only be opened if a sales order and line item has been selected Please do that first'),'error'); echo '</div>'; - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -54,7 +54,7 @@ echo '<div class="centre"><a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">' . _('Back to the Sales Order'). '</a></div>'; echo '<br />'; prnMsg( _('The line item must be defined as controlled to require input of the batch numbers or serial numbers being sold'),'error'); - include('includes/footer.inc'); + include('includes/footer.php'); exit; } @@ -81,6 +81,6 @@ of the item selected for dispatch */ $_SESSION['Items'.$identifier]->LineItems[$LineNo]->QtyDispatched = $TotalQuantity; -include('includes/footer.inc'); +include('includes/footer.php'); exit; ?> Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2017-04-12 15:50:47 UTC (rev 7750) +++ trunk/ConfirmDispatch_Invoice.php 2017-04-13 16:34:26 UTC (rev 7751) @@ -2,15 +2,15 @@ /* $Id$*/ /* Creates sales invoices from entered sales orders based on the quantities dispatched that can be modified */ -/* Session started in session.inc for password checking and authorisation level check */ +/* Session started in session.php for password checking and authorisation level check */ include('includes/DefineCartClass.php'); include('... [truncated message content] |