Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[4213] trunk
|
From: <tim...@us...> - 2010-12-22 14:33:31
|
Revision: 4213
http://web-erp.svn.sourceforge.net/web-erp/?rev=4213&view=rev
Author: tim_schofield
Date: 2010-12-22 14:33:20 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
$Message
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.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/CounterSales.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.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/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EDIProcessOrders.php
trunk/EDISendInvoices.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/FixedAssetList.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Labels.php
trunk/Locations.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailInventoryValuation.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFReceipt.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransListing.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_SelectOSPurchOrder.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/PricesByCost.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTransPortrait.php
trunk/PrintSalesOrder_generic.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReportBug.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesAnalysis_UserDefined.php
trunk/SalesCategories.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.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/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.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/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.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_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CopyBOM.php
trunk/Z_CreateChartDetails.php
trunk/Z_CreateCompany.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_DescribeTable.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_UploadForm.php
trunk/Z_UploadResult.php
trunk/Z_index.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/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/AccountGroups.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.23 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/AccountSections.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.7 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/AgedDebtors.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
/* $Revision: 1.20 $ */
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/AgedSuppliers.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
/* $Revision: 1.13 $ */
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
If (isset($_POST['PrintPDF'])
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/AuditTrail.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id$ */
-$PageSecurity=15;
+//$PageSecurity=15;
include('includes/session.inc');
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BOMExtendedQty.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -5,7 +5,7 @@
/* $Revision: 1.8 $ */
// BOMExtendedQty.php - Quantiy Extended Bill of Materials
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BOMIndented.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -5,7 +5,7 @@
/* $Revision: 1.5 $ */
// BOMIndented.php - Indented Bill of Materials
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BOMIndentedReverse.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -6,7 +6,7 @@
// BOMIndented.php - Reverse Indented Bill of Materials - From lowest level component to top level
// assembly
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BOMListing.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
/* $Revision: 1.14 $ */
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BOMs.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.37 $ */
/* $Id$*/
-$PageSecurity = 9;
+//$PageSecurity = 9;
include('includes/session.inc');
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BankAccounts.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.21 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BankMatching.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.23 $ */
/* $Id$*/
-$PageSecurity = 7;
+//$PageSecurity = 7;
include("includes/session.inc");
$title = _('Bank Account Matching');
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/BankReconciliation.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.15 $ */
/* $Id$*/
-$PageSecurity = 7;
+//$PageSecurity = 7;
include ('includes/session.inc');
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/COGSGLPostings.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.15 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CompanyPreferences.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.18 $ */
/* $Id$*/
-$PageSecurity =10;
+//$PageSecurity =10;
include('includes/session.inc');
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Specify Dispatched Controlled Items');
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ConfirmDispatch_Invoice.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -6,7 +6,7 @@
/* Session started in session.inc for password checking and authorisation level check */
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Confirm Dispatches and Invoice An Order');
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ContractBOM.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id: $ */
-$PageSecurity = 6;
+//$PageSecurity = 6;
include('includes/DefineContractClass.php');
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ContractCosting.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id: ContractCosting.php 3692 2010-08-15 09:22:08Z daintree $*/
-$PageSecurity = 6;
+//$PageSecurity = 6;
include('includes/DefineContractClass.php');
include('includes/session.inc');
$title = _('Contract Costing');
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ContractOtherReqts.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id: $ */
-$PageSecurity = 4;
+//$PageSecurity = 4;
include('includes/DefineContractClass.php');
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/Contracts.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id: Contracts.php 3692 2010-08-15 09:22:08Z daintree $ */
-$PageSecurity = 6;
+//$PageSecurity = 6;
include('includes/DefineContractClass.php');
include('includes/session.inc');
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CounterSales.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id: SelectOrderItems.php 3453 2010-05-06 06:39:52Z lindsayh $*/
include('includes/DefineCartClass.php');
-$PageSecurity = 1;
+//$PageSecurity = 1;
/* Session started in session.inc for password checking and authorisation level check
config.php is in turn included in session.inc*/
@@ -83,7 +83,7 @@
include('includes/footer.inc');
exit;
}
-
+
$CashSaleCustomer = explode('-',$myrow['cashsalecustomer']);
$_SESSION['Items'.$identifier]->Branch = $CashSaleCustomer[1];
Modified: trunk/CreditItemsControlled.php
===================================================================
--- trunk/CreditItemsControlled.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CreditItemsControlled.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$*/
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Specify Credited Controlled Items');
@@ -28,7 +28,7 @@
$LineNo = $_GET['LineNo'];
} elseif (isset($_POST['LineNo'])){
$LineNo = $_POST['LineNo'];
-} else {
+} else {
echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Select Credit Items'). '</a><br><br>';
prnMsg( _('This page can only be opened if a Line Item on a credit note has been selected.') . ' ' . _('Please do that first'), 'error');
echo '</div>';
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CreditStatus.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.16 $ */
/* $Id$*/
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Credit Status Code Maintenance');
include('includes/header.inc');
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustEDISetup.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.11 $ */
/* $Id$*/
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Customer EDI Set Up');
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustLoginSetup.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.2 $ */
/* $Id$*/
-$PageSecurity = 15;
+//$PageSecurity = 15;
include('includes/session.inc');
$title = _('Customer Login Configuration');
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerAllocations.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -10,7 +10,7 @@
*/
include('includes/DefineCustAllocsClass.php');
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Customer Receipt') . '/' . _('Credit Note Allocations');
include('includes/header.inc');
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerBranches.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.53 $ */
/* $Id$*/
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Customer Branches');
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -5,7 +5,7 @@
include('includes/SQL_CommonFunctions.inc');
-$PageSecurity = 1;
+//$PageSecurity = 1;
include('includes/session.inc');
$title = _('Customer Inquiry');
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerReceipt.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -5,7 +5,7 @@
include('includes/DefineReceiptClass.php');
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Receipt Entry');
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerTransInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.17 $ */
/* $Id$*/
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Customer Transactions Inquiry');
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/CustomerTypes.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.6 $ */
/* $Id$*/
-$PageSecurity = 15;
+//$PageSecurity = 15;
include('includes/session.inc');
$title = _('Customer Types') . ' / ' . _('Maintenance');
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/Customers.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$ */
/* $Revision: 1.44 $ */
-$PageSecurity = 3;
+//$PageSecurity = 3;
include('includes/session.inc');
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DailyBankTransactions.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,6 +1,6 @@
<?php
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('Daily Banking Inquiry');
include('includes/header.inc');
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DailySalesInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.00$ */
/* $Id$*/
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Daily Sales Inquiry');
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DebtorsAtPeriodEnd.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,5 +1,5 @@
<?php
-$PageSecurity = 2;
+//$PageSecurity = 2;
/* $Id$*/
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DeliveryDetails.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -11,7 +11,7 @@
/* Session started in header.inc for password checking the session will contain the details of the order from the Cart class object. The details of the order come from SelectOrderItems.php */
-$PageSecurity=1;
+//$PageSecurity=1;
include('includes/session.inc');
$title = _('Order Delivery Details');
include('includes/header.inc');
Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DiscountCategories.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.10 $ */
/* $Id$*/
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/DiscountMatrix.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.9 $ */
/* $Id$*/
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Discount Matrix Maintenance');
include('includes/header.inc');
Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/EDIMessageFormat.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.10 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
$title = _('EDI Message Format');
Modified: trunk/EDIProcessOrders.php
===================================================================
--- trunk/EDIProcessOrders.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/EDIProcessOrders.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.20 $ */
/* $Id$*/
-$PageSecurity =11;
+//$PageSecurity =11;
include ('includes/session.inc');
@@ -459,18 +459,18 @@
break;
case 'SN':
/*Store Number - get the branch details from the store number - snag here too cos need to ensure got the Customer detail first before try looking up its branches */
- $BranchResult = DB_query("SELECT branchcode,
- brname,
+ $BranchResult = DB_query("SELECT branchcode,
+ brname,
braddress1,
- braddress2,
- braddress3,
- braddress4,
- braddress5,
- braddress6,
- contactname,
- defaultlocation,
- phoneno,
- email
+ braddress2,
+ braddress3,
+ braddress4,
+ braddress5,
+ braddress6,
+ contactname,
+ defaultlocation,
+ phoneno,
+ email
FROM custbranch INNER JOIN debtorsmaster ON custbranch.debtorno = custbranch.debtorno WHERE custbranchcode='" . $NAD_C082[0] . "' AND custbranch.debtorno='" . $Order->DebtorNo . "' AND debtorsmaster.ediorders=1",$db);
if (DB_num_rows($BranchResult)!=1){
$EmailText .= "\n" . _('The Store number was specified as') . ' ' . $NAD_C082[0] . ' ' . _('Unfortunately there are either no branches of customer code') . ' ' . $Order->DebtorNo . ' ' ._('or several that match this store number') . '. ' . _('This order could not be processed further');
Modified: trunk/EDISendInvoices.php
===================================================================
--- trunk/EDISendInvoices.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/EDISendInvoices.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Revision: 1.11 $ */
/* $Id$*/
-$PageSecurity =15;
+//$PageSecurity =15;
include ('includes/session.inc');
include ('includes/header.inc');
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/EmailConfirmation.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -101,7 +101,7 @@
include('includes/footer.inc');
exit;
}//packing slip has been printed.
- $MailSubject = "Order Confirmation-Sales Order " . $_GET['TransNo'] . " - Your PO " .
+ $MailSubject = "Order Confirmation-Sales Order " . $_GET['TransNo'] . " - Your PO " .
$myrow['customerref'] ;
}
@@ -111,39 +111,39 @@
)
LETS GO */
-$MailMessage = "<html><head><title>Email Confirmation</title></head><body>" .
- "<Table cellpadding='2' cellspacing='2'><tr>" .
+$MailMessage = "<html><head><title>Email Confirmation</title></head><body>" .
+ "<Table cellpadding='2' cellspacing='2'><tr>" .
"<td align='center' colspan='4'><H1>" . $_SESSION['CompanyRecord']['coyname'] . "</H1>" ;
$MailMessage = $MailMessage . "</td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$_SESSION['CompanyRecord']['regoffice1'] . "</td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$_SESSION['CompanyRecord']['regoffice4'] . ",";
-$MailMessage = $MailMessage . "<b>" .
+$MailMessage = $MailMessage . "<b>" .
$_SESSION['CompanyRecord']['regoffice5'] . "</td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
- $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+ $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' .
$_SESSION['CompanyRecord']['fax'] . "</td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$_SESSION['CompanyRecord']['email'] . "<br><br><br></td></tr>";
-$MailMessage = $MailMessage . "<Table><tr><td align='center' colspan='4'>
+$MailMessage = $MailMessage . "<Table><tr><td align='center' colspan='4'>
<h2> Order Acknowledgement</h2></td></tr>";
-$MailMessage = $MailMessage . "<tr><td align='center' colspan='4'> <b>Order Number " .
+$MailMessage = $MailMessage . "<tr><td align='center' colspan='4'> <b>Order Number " .
$_GET['TransNo'] . "</b><br><br><br></td></tr>";
$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>Delivered To:</b></td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$myrow['deliverto'] . "</td></tr>";
-$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
+$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$myrow['deladd1'] . "</td></tr>";
If(strlen(trim($myrow['deladd2'])))
{
$MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd2'] . "</td></tr>";
- $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] .
+ $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] .
' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. "<br><br><br></td></tr>";
}
else
{
- $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . ' ' .
+ $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . ' ' .
$myrow['deladd4'] . ' ' . $myrow['deladd5'] . "<br><br><br></td></tr>";
}
$MailMessage = $MailMessage . "</table><table border='1' width='50%'><tr>";
@@ -156,10 +156,10 @@
<td>Due Date</td></tr>";
- $sql = "SELECT salesorderdetails.stkcode,
- stockmaster.description,
- salesorderdetails.quantity,
- salesorderdetails.qtyinvoiced,
+ $sql = "SELECT salesorderdetails.stkcode,
+ stockmaster.description,
+ salesorderdetails.quantity,
+ salesorderdetails.qtyinvoiced,
salesorderdetails.unitprice,
salesorderdetails.narrative,
salesorderdetails.poline,
@@ -188,15 +188,15 @@
else
{
$ItemDue[$i] = date('M d, Y',strtotime($myrow2['itemdue']));
- }
+ }
$MailMessage = $MailMessage . "<tr>";
if($_REQUEST['POLine'] == 1){
$MailMessage = $MailMessage . "<td align='right'>" . $POLine[$i] . "</td>";
}
$MailMessage = $MailMessage . "<td>" . $myrow2['stkcode'] .
- "</td><td>" .
- $myrow2['description'] . "</td><td align='right'>" .
- $DisplayQty . "</td><td align='center'>" . $ItemDue[$i] .
+ "</td><td>" .
+ $myrow2['description'] . "</td><td align='right'>" .
+ $DisplayQty . "</td><td align='center'>" . $ItemDue[$i] .
"</td></tr>";
$i = $i + 1;
@@ -236,23 +236,23 @@
<td colspan='2' nowrap width="50%"> <b><?=$myrow['deliverto']?></td>
</tr>
<tr>
- <td colspan='2' nowrap width="50%">
+ <td colspan='2' nowrap width="50%">
<b><?=$_SESSION['CompanyRecord']['regoffice4']?>,
<?=$_SESSION['CompanyRecord']['regoffice5']?> </b>
</td>
<td colspan='2' nowrap width="50%"> <b><?=$myrow['deladd1']?></td>
</tr>
<tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['telephone']?>
+ <td colspan='2' nowrap width="50%">
+ <b><?=$_SESSION['CompanyRecord']['telephone']?>
Fax:<?=$_SESSION['CompanyRecord']['fax']?></b>
</td>
<td nowrap width="50%"><b><?=$myrow['deladd2']?></td>
</tr>
<tr>
- <td colspan='2' nowrap width="50%">
+ <td colspan='2' nowrap width="50%">
<b><?=$_SESSION['CompanyRecord']['email']?><br><br><br>
- </td>
+ </td>
<td nowrap width="50%">
<b><?=$myrow['deladd3']?> <?=$myrow['deladd4'] ?> <?=$myrow['deladd5']?><br><br><br>
</td>
@@ -262,11 +262,11 @@
<tr>
<?
if($_REQUEST['POLine'] == 1){
-?>
+?>
<td align="center">PO Line</td>
<?
}
-?>
+?>
<td align="center">Stock Code</td>
<td align="center">Description</td>
<td align="center">Quantity Ordered</td>
@@ -279,11 +279,11 @@
<tr>
<?
if($_REQUEST['POLine']){
-?>
+?>
<td align='right'><?=$POLine[$j]?></td>
<?
}
-?>
+?>
<td><?=$StkCode[$j]?></td>
<td><?=$DscCode[$j]?></td>
<td align="right"><?=$QtyCode[$j]?></td>
@@ -291,7 +291,7 @@
</tr>
<?
}
-?>
+?>
</table>
</body>
</html>
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/EmailCustTrans.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.8 $ */
/* $Id$*/
-$PageSecurity = 2;
+//$PageSecurity = 2;
include ('includes/session.inc');
include ('includes/SQL_CommonFunctions.inc');
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/ExchangeRateTrend.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.3 $ */
/* $Id$*/
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
$title = _('View Currency Trends');
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FTP_RadioBeacon.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
/*Variables required to configure this script must be set in config.php */
-$PageSecurity = 2;
+//$PageSecurity = 2;
include('includes/session.inc');
$title=_('FTP order to Radio Beacon');
include('includes/header.inc');
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/Factors.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,6 +1,6 @@
<?php
-$PageSecurity = 5;
+//$PageSecurity = 5;
include('includes/session.inc');
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetCategories.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.1 $ */
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
@@ -108,7 +108,7 @@
$ErrMsg = _('Could not insert the new fixed asset category') . $_POST['CategoryDescription'] . _('because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('A new fixed asset category record has been added for') . ' ' . $_POST['CategoryDescription'],'success');
-
+
}
//run the SQL from either of the above possibilites
@@ -226,7 +226,7 @@
$_POST['DepnAct'] = $myrow['depnact'];
$_POST['DisposalAct'] = $myrow['disposalact'];
$_POST['AccumDepnAct'] = $myrow['accumdepnact'];
-
+
echo '<input type=hidden name="SelectedCategory" value="' . $SelectedCategory . '">';
echo '<input type=hidden name="CategoryID" value="' . $_POST['CategoryID'] . '">';
echo '<table class=selection><tr><td>' . _('Category Code') . ':</td><td>' . $_POST['CategoryID'] . '</td></tr>';
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetDepreciation.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -4,7 +4,7 @@
include('includes/DefineJournalClass.php');
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
$title = _('Depreciation Journal Entry');
@@ -13,11 +13,11 @@
/*Get the last period depreciation (depn is transtype =44) was posted for */
-$result = DB_query('SELECT periods.lastdate_in_period,
- max(fixedassettrans.periodno)
- FROM fixedassettrans INNER JOIN periods
- ON fixedassettrans.periodno=periods.periodno
- WHERE transtype=44
+$result = DB_query('SELECT periods.lastdate_in_period,
+ max(fixedassettrans.periodno)
+ FROM fixedassettrans INNER JOIN periods
+ ON fixedassettrans.periodno=periods.periodno
+ WHERE transtype=44
GROUP BY periods.lastdate_in_period',$db);
$LastDepnRun = DB_fetch_row($result);
@@ -27,13 +27,13 @@
$AllowUserEnteredProcessDate = true;
if ($LastDepnRun[1]==0 AND $LastDepnRun[0]==NULL) { //then depn has never been run yet?
-
+
/*in this case default depreciation calc to the last day of last month - and allow user to select a period */
if (!isset($_POST['ProcessDate'])) {
$_POST['ProcessDate'] = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0,date('m'),0,date('Y')));
}
-
-} else { //depn calc has been run previously
+
+} else { //depn calc has been run previously
$AllowUserEnteredProcessDate = false;
$_POST['ProcessDate'] = DateAdd(ConvertSQLDate($LastDepnRun[0]),'m',1);
}
@@ -157,9 +157,9 @@
$TotalCost +=$AssetRow['cost'];
$TotalAccumDepn +=$AssetRow['accumdepn'];
$TotalDepn +=$NewDepreciation;
-
+
if (isset($_POST['CommitDepreciation']) AND $NewDepreciation !=0 AND $InputError==false){
-
+
//debit depreciation expense
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -167,7 +167,7 @@
periodno,
account,
narrative,
- amount)
+ amount)
VALUES (44,
'" . $TransNo . "',
'" . FormatDateForSQL($_POST['ProcessDate']) . "',
@@ -184,7 +184,7 @@
periodno,
account,
narrative,
- amount)
+ amount)
VALUES (44,
'" . $TransNo . "',
'" . FormatDateForSQL($_POST['ProcessDate']) . "',
@@ -193,7 +193,7 @@
'" . $AssetRow['assetid'] . "',
'" . -$NewDepreciation ."')";
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
//insert the fixedassettrans record
$SQL = "INSERT INTO fixedassettrans (assetid,
transtype,
@@ -214,7 +214,7 @@
$ErrMsg = _('Cannot insert a fixed asset transaction entry for the depreciation because');
$DbgMsg = _('The SQL that failed to insert the fixed asset transaction record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
/*now update the accum depn in fixedassets */
$SQL = "UPDATE fixedassets SET accumdepn = accumdepn + " . $NewDepreciation . "
WHERE assetid = '" . $AssetRow['assetid'] . "'";
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetItems.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$ */
/* $Revision: 1.3 $ */
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Fixed Assets');
@@ -87,14 +87,14 @@
$Errors[$i] = 'LongDescription';
$i++;
}
-
+
if (strlen($_POST['BarCode']) >20) {
$InputError = 1;
prnMsg(_('The barcode must be 20 characters or less long'),'error');
$Errors[$i] = 'BarCode';
$i++;
}
-
+
if (trim($_POST['AssetCategoryID'])==''){
$InputError = 1;
prnMsg(_('There are no asset categories defined. All assets must belong to a valid category,'),'error');
@@ -110,25 +110,25 @@
if ($_POST['DepnRate']>0 AND $_POST['DepnRate']<1){
prnMsg(_('Numbers less than 1 are interpreted as less than 1%. The depreciation rate should be entered as a number between 0 and 100'),'warn');
}
-
-
+
+
if ($InputError !=1){
-
+
if ($_POST['submit']==_('Update')) { /*so its an existing one */
/*Start a transaction to do the whole lot inside */
$result = DB_Txn_Begin($db);
-
+
/*Need to check if changing the balance sheet codes - as will need to do journals for the cost and accum depn of the asset to the new category */
$result = DB_query("SELECT assetcategoryid, cost, accumdepn, costact, accumdepnact FROM fixedassets INNER JOIN fixedassetcategories WHERE assetid='" . $AssetID . "'",$db);
$OldDetails = DB_fetch_array($result);
if ($OldDetails['assetcategoryid'] !=$_POST['AssetCategoryID'] AND $OldDetails['cost']!=0){
-
+
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
/* Get the new account codes for the new asset category */
$result = DB_query("SELECT costact, accumdepnact FROM fixedassetcategories WHERE categoryid='" . $_POST['AssetCategoryID'] . "'",$db);
$NewAccounts = DB_fetch_array($result);
-
+
$TransNo = GetNextTransNo( 42, $db); /* transaction type is asset category change */
//credit cost for the old category
@@ -150,7 +150,7 @@
$ErrMsg = _('Cannot insert a GL entry for the change of asset category because');
$DbgMsg = _('The SQL that failed to insert the cost GL Trans record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
//debit cost for the new category
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -190,7 +190,7 @@
$ErrMsg = _('Cannot insert a GL entry for the change of asset category because');
$DbgMsg = _('The SQL that failed to insert the cost GL Trans record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
//credit accum depn for the new category
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -252,7 +252,7 @@
$ErrMsg = _('The asset could not be added because');
$DbgMsg = _('The SQL that was used to add the asset failed was');
$result = DB_query($sql,$db, $ErrMsg, $DbgMsg);
-
+
if (DB_error_no($db) ==0) {
$NewAssetID = DB_Last_Insert_ID($db,'fixedassets', 'assetid');
prnMsg( _('The new asset has been added to the database with an asset code of:') . ' ' . $NewAssetID,'success');
@@ -277,12 +277,12 @@
$CancelDelete = 0;
//what validation is required before allowing deletion of assets .... maybe there should be no deletion option?
- $result = DB_query('SELECT cost,
- accumdepn,
- accumdepnact,
- costact
- FROM fixedassets INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ $result = DB_query('SELECT cost,
+ accumdepn,
+ accumdepnact,
+ costact
+ FROM fixedassets INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
WHERE assetid="' . $AssetID . '"', $db);
$AssetRow = DB_fetch_array($result);
$NBV = $AssetRow['cost'] -$AssetRow['accumdepn'];
@@ -302,7 +302,7 @@
}
if ($CancelDelete==0) {
$result = DB_Txn_Begin($db);
-
+
/*Need to remove cost and accumulate depreciation from cost and accumdepn accounts */
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
$TransNo = GetNextTransNo( 43, $db); /* transaction type is asset deletion - (and remove cost/acc5umdepn from GL) */
@@ -326,7 +326,7 @@
$ErrMsg = _('Cannot insert a GL entry for the deletion of the asset because');
$DbgMsg = _('The SQL that failed to insert the cost GL Trans record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
//debit accumdepn for the depreciation removed on deletion of this asset
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -346,10 +346,10 @@
$ErrMsg = _('Cannot insert a GL entry for the reversal of accumulated depreciation on deletion of the asset because');
$DbgMsg = _('The SQL that failed to insert the cost GL Trans record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
+
} //end if cost > 0
-
-
+
+
$sql="DELETE FROM fixedassets WHERE assetid='" . $AssetID . "'";
$result=DB_query($sql,$db, _('Could not delete the asset record'),'',true);
@@ -381,7 +381,7 @@
$New = 1;
echo '<input type="hidden" name="New" value="">'. "\n";
-
+
} elseif ($InputError!=1) { // Must be modifying an existing item and no changes made yet - need to lookup the details
$sql = "SELECT assetid,
@@ -409,7 +409,7 @@
$_POST['DepnType'] = $AssetRow['depntype'];
$_POST['BarCode'] = $AssetRow['barcode'];
$_POST['DepnRate'] = $AssetRow['depnrate'];
-
+
echo '<tr><td>' . _('Asset Code') . ':</td><td>'.$AssetID.'</td></tr>'. "\n";
echo '<input type="Hidden" name="AssetID" value='.$AssetID.'>'. "\n";
@@ -452,13 +452,13 @@
$AssetImgLink = _('No Image');
}
}
-
+
if ($AssetImgLink!=_('No Image')) {
echo '<td>' . _('Image') . '<br>'.$AssetImgLink . '</td></tr>';
} else {
echo '</td></tr>';
}
-
+
// EOR Add Image upload for New Item - by Ori
} //only show the add image if the asset already exists - otherwise AssetID will not be set - and the image needs the AssetID to save
@@ -546,7 +546,7 @@
echo '<div class=centre><br><input type="Submit" name="submit" value="' . _('Insert New Fixed Asset') . '">';
} else {
-
+
echo '<br><div class=centre><input type="submit" name="submit" value="' . _('Update') . '"></div>';
prnMsg( _('Only click the Delete button if you are sure you wish to delete the asset. Only assets with a zero book value can be deleted'), 'warn', _('WARNING'));
echo '<br><div class=centre><input type="Submit" name="delete" value="' . _('Delete This Asset') . '" onclick="return confirm(\'' . _('Are You Sure? Only assets with a zero book value can be deleted.') . '\');"></div>';
Modified: trunk/FixedAssetList.php
===================================================================
--- trunk/FixedAssetList.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetList.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,5 +1,5 @@
<?php
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Fixed Asset Properties List');
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetLocations.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,6 +1,6 @@
<?php
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Fixed Asset Locations');
@@ -60,7 +60,7 @@
// if you are not updating then you want to delete but lets be sure first.
if (isset($_POST['delete'])) {
$InputError=0;
-
+
$sql="SELECT COUNT(locationid) FROM fixedassetlocations WHERE parentlocationid='" . $_POST['LocationID']."'";
$result = DB_query($sql,$db);
$myrow=DB_fetch_row($result);
@@ -99,7 +99,7 @@
$parentresult=DB_query($parentsql, $db);
$parentrow=DB_fetch_array($parentresult);
echo '<td>'.$parentrow['locationdescription'].'</td>';
- echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?' . SID.'SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>';
+ echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?' . SID.'SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>';
}
echo '</table><br>';
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetRegister.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,5 +1,5 @@
<?php
-$PageSecurity = 11;
+//$PageSecurity = 11;
include ('includes/session.inc');
$title = _('Fixed Asset Register');
$csv_output = '';
@@ -58,7 +58,7 @@
$CategoryRow=DB_fetch_array($CategoryResult);
$AssetCategory=$CategoryRow['categorydescription'];
}
-
+
if ($_POST['AssetID']=='%') {
$AssetDescription =_('All');
} else {
@@ -96,7 +96,7 @@
$TotalDepn = 0;
$TotalDisposals = 0;
$TotalNBV = 0;
-
+
while ($myrow = DB_fetch_array($result)) {
/*
* $Ancestors = array();
@@ -198,7 +198,7 @@
$LeftOvers = $pdf->addTextWrap($XPos + 550, $YPos, 70, $FontSize, number_format($TotalCostCfwd, 0), 'right');
$LeftOvers = $pdf->addTextWrap($XPos + 620, $YPos, 70, $FontSize, number_format($TotalDepnCfwd, 0), 'right');
$LeftOvers = $pdf->addTextWrap($XPos + 690, $YPos, 70, $FontSize, number_format($TotalNBV, 0), 'right');
-
+
$pdf->Output($_SESSION['DatabaseName'] . '_Asset Register_' . date('Y-m-d') . '.pdf', 'I');
exit;
} elseif (isset($_POST['csv'])) {
@@ -230,7 +230,7 @@
} else {
include ('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
-
+
$result = DB_query('SELECT categoryid,categorydescription FROM fixedassetcategories', $db);
echo '<form name="RegisterForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><table class=selection>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -306,18 +306,18 @@
$line_height;
$AssetDescription;
$AssetCategory;
-
+
if ($PageNumber>1){
$pdf->newPage();
}
-
+
$FontSize=10;
$YPos= $Page_Height-$Top_Margin;
$XPos=0;
$pdf->addJpegFromFile($_SESSION['LogoFile'] ,$XPos+20,$YPos-50,0,60);
-
-
-
+
+
+
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos,240,$FontSize,$_SESSION['CompanyRecord']['coyname']);
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos-($line_height*1),240,$FontSize, _('Asset Category ').' ' . $AssetCategory );
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos-($line_height*2),240,$FontSize, _('Asset Location ').' ' . $_POST['AssetLocation'] );
@@ -325,21 +325,21 @@
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos-($line_height*4),240,$FontSize, _('From').': ' . $_POST['FromDate']);
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos-($line_height*5),240,$FontSize, _('To').': ' . $_POST['ToDate']);
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-240,$YPos-($line_height*7),240,$FontSize, _('Page'). ' ' . $PageNumber);
-
+
$YPos -= 60;
-
+
$YPos -=2*$line_height;
//Note, this is ok for multilang as this is the value of a Select, text in option is different
-
+
$YPos -=(2*$line_height);
-
+
/*Draw a rectangle to put the headings in */
$YTopLeft=$YPos+$line_height;
$pdf->line($Left_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos+$line_height);
$pdf->line($Left_Margin, $YPos+$line_height,$Left_Margin, $YPos- $line_height);
$pdf->line($Left_Margin, $YPos- $line_height,$Page_Width-$Right_Margin, $YPos- $line_height);
$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos- $line_height);
-
+
/*set up the headings */
$FontSize=10;
$XPos = $Left_Margin+1;
@@ -356,15 +356,15 @@
$LeftOvers = $pdf->addTextWrap($XPos+620,$YPos,70,$FontSize, _('Depn C/Fwd'), 'centre');
$LeftOvers = $pdf->addTextWrap($XPos+690,$YPos,70,$FontSize, _('Net Book Value'), 'centre');
//$LeftOvers = $pdf->addTextWrap($XPos+760,$YPos,70,$FontSize, _('Disposal Proceeds'), 'centre');
-
+
$pdf->line($Left_Margin, $YTopLeft,$Page_Width-$Right_Margin, $YTopLeft);
$pdf->line($Left_Margin, $YTopLeft,$Left_Margin, $Bottom_Margin);
$pdf->line($Left_Margin, $Bottom_Margin,$Page_Width-$Right_Margin, $Bottom_Margin);
$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin,$Page_Width-$Right_Margin, $YTopLeft);
-
+
$FontSize=8;
$YPos -= (1.5 * $line_height);
-
+
$PageNumber++;
}
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FixedAssetTransfer.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -1,6 +1,6 @@
<?php
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
@@ -103,9 +103,9 @@
$_POST['SerialNumber']='%';
}
$sql= 'SELECT fixedassets.assetid,
- fixedassets.cost,
- fixedassets.accumdepn,
- fixedassets.description,
+ fixedassets.cost,
+ fixedassets.accumdepn,
+ fixedassets.description,
fixedassets.depntype,
fixedassets.serialno,
fixedassets.barcode,
@@ -129,12 +129,12 @@
<th>' . _('Current Location') . '</th>
<th>' . _('Move To :') . '</th>
</tr>';
-
+
$locationsql='SELECT locationid, locationdescription from fixedassetlocations';
$LocationResult=DB_query($locationsql, $db);
-
+
while ($myrow=DB_fetch_array($Result)) {
-
+
echo '<tr><td>'.$myrow['assetid'].'</td>
<td>'.$myrow['description'].'</td>
<td>'.$myrow['serialno'].'</td>
Modified: trunk/FreightCosts.php
===================================================================
--- trunk/FreightCosts.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/FreightCosts.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$*/
/* $Revision: 1.14 $ */
-$PageSecurity = 11;
+//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Freight Costs Set Up');
include('includes/header.inc');
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLAccountCSV.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id: $*/
/* $Revision: 1.00 $ */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('General Ledger Account Report');
include('includes/header.inc');
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLAccountInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$*/
/* $Revision: 1.28 $ */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('General Ledger Account Inquiry');
include('includes/header.inc');
Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLAccountReport.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id: $*/
/* $Revision: 1.00 $ */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
if (isset($_POST['Period'])){
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLAccounts.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Revision: 1.21 $ */
/* $Id$*/
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
$title = _('Chart of Accounts Maintenance');
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLBalanceSheet.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -6,7 +6,7 @@
/*Through deviousness and cunning, this system allows shows the balance sheets as at the end of any period selected - so first off need to show the input of criteria screen while the user is selecting the period end of the balance date meanwhile the system is posting any unposted transactions */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('Balance Sheet');
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLCodesInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$*/
/* $Revision: 1.9 $ */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('GL Codes Inquiry');
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLJournal.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -5,7 +5,7 @@
include('includes/DefineJournalClass.php');
-$PageSecurity = 10;
+//$PageSecurity = 10;
include('includes/session.inc');
$title = _('Journal Entry');
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLProfit_Loss.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id$*/
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('Profit and Loss');
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLTagProfit_Loss.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -2,7 +2,7 @@
/* $Id$*/
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('Income and Expenditure by Tag');
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLTransInquiry.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -3,7 +3,7 @@
/* $Id$*/
/* $Revision: 1.16 $ */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('General Ledger Transaction Inquiry');
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLTrialBalance.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -8,7 +8,7 @@
while the user is selecting the criteria the system is posting any unposted transactions */
-$PageSecurity = 8;
+//$PageSecurity = 8;
include ('includes/session.inc');
$title = _('Trial Balance');
Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php 2010-12-22 14:22:35 UTC (rev 4212)
+++ trunk/GLTrialBalance_csv.php 2010-12-22 14:33:20 UTC (rev 4213)
@@ -6,10 +6,10 @@
and shows the balance sheets as at the end of the period selected - so first off need to show the input of criteria screen
while the user is selecting the criteria the system is posting any unposted transactions */
-/*Needs to have FromPeriod and ToPeriod sent with URL
+/*Needs to have FromPeriod and ToPeriod sent with URL
* also need to work on authentication with username and password sent too*/
-$PageSecurity = 8;
+//$PageSecurity = 8;
$AllowAnyone =true;
//$_POST['UserNameEntryField'] = $_GET['Identifier'];
//$_POST['Password'] = $_GET['Identifier...
[truncated message content] |
