From c6b2d5ee128f8a3b2051a12be87d7346f95ff6f2 Mon Sep 17 00:00:00 2001 From: PaulT Date: Sun, 15 May 2022 17:12:12 -0400 Subject: [PATCH] Fix typo in a LogSeverity option, refactored these options (less code), and other element updates. --- SystemParameters.php | 162 +++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 90 deletions(-) diff --git a/SystemParameters.php b/SystemParameters.php index a9c69b69e..b6698649f 100644 --- a/SystemParameters.php +++ b/SystemParameters.php @@ -25,7 +25,7 @@ //first off validate inputs sensible /* Note: the X_ in the POST variables, the reason for this is to overcome globals=on replacing - the actial system/overidden variables. + the actual system/overridden variables. */ if (mb_strlen($_POST['X_PastDueDays1']) > 3 OR !is_numeric($_POST['X_PastDueDays1']) ) { $InputError = 1; @@ -486,17 +486,17 @@ // Check Credit Limits echo '' . _('Check Credit Limits') . ': ' . _('Credit limits can be checked at order entry to warn only or to stop the order from being entered where it would take a customer account balance over their limit') . ''; // Show_Settled_LastMonth echo '' . _('Show Settled Last Month') . ': ' . _('This setting refers to the format of customer statements. If the invoices and credit notes that have been paid and settled during the course of the current month should be shown then select Yes. Selecting No will only show currently outstanding invoices, credits and payments that have not been allocated') . ''; @@ -523,16 +523,16 @@ // SO_AllowSameItemMultipleTimes echo '' . _('Sales Order Allows Same Item Multiple Times') . ':  '; //'AllowOrderLineItemNarrative' echo ' ' . _('Order Entry allows Line Item Narrative') . ': ' . _('Select whether or not to allow entry of narrative on order line items. This narrative will appear on invoices and packing slips. Useful mainly for service businesses.') . ' '; @@ -564,8 +564,8 @@ //'RequirePickingNote' echo '' . _('A picking note must be produced before an order can be delivered') . ': ' . _('Select whether or not a picking note must be produced before an order can be delivered to a customer.') . ' '; @@ -573,15 +573,15 @@ //UpdateCurrencyRatesDaily echo '' . _('Auto Update Exchange Rates Daily') . ': ' . _('Automatic updates to exchange rates will retrieve the latest daily rates from either the European Central Bank or Google once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . ' '; echo '' . _('Source Exchange Rates From') . ': ' . _('Specify the source to use for exchange rates') . ' '; @@ -589,8 +589,8 @@ //Default Packing Note Format echo '' . _('Format of Packing Slips') . ': ' . _('Choose the format that packing notes should be printed by default') . ' '; @@ -598,8 +598,8 @@ //Default Invoice Format echo '' . _('Invoice Orientation') . ': ' . _('Select the invoice layout') . ' '; @@ -607,17 +607,17 @@ //Default Invoice Quantity echo '' . _('Invoice Quantity Default') . ': - ' . _('This setting controls the default behaviour of invoicing. Setting to 0 defaults the invocie quantity to zero to force entry. Set to outstanding to default the invoice quantity to the balance outstanding, after previous deliveries, on the sales order') . ' + ' . _('This setting controls the default behaviour of invoicing. Setting to 0 defaults the invoice quantity to zero to force entry. Set to outstanding to default the invoice quantity to the balance outstanding, after previous deliveries, on the sales order') . ' '; //Blind packing note echo '' . _('Show company details on packing slips') . ': ' . _('Customer branches can be set by default not to print packing slips with the company logo and address. This is useful for companies that ship to customers customers and to show the source of the shipment would be inappropriate. There is an option on the setup of customer branches to ship blind, this setting is the default applied to all new customer branches') . ' '; @@ -638,23 +638,23 @@ ' . _('Dispatch Cut-Off Time') . ': ' . _('Orders entered after this time will default to be dispatched the following day, this can be over-ridden at the time of sales order entry') . ''; // AllowSalesOfZeroCostItems echo '' . _('Allow Sales Of Zero Cost Items') . ': ' . _('If an item selected at order entry does not have a cost set up then if this parameter is set to No then the order line will not be able to be entered') . ''; // CreditingControlledItems_MustExist echo '' . _('Controlled Items Must Exist For Crediting') . ': ' . _('This parameter relates to the behaviour of the controlled items code. If a serial numbered item has not previously existed then a credit note for it will not be allowed if this is set to Yes') . ''; @@ -693,8 +693,8 @@ // DoFreightCalc echo '' . _('Do Freight Calculation') . ': ' . _('If this is set to Yes then the system will attempt to calculate the freight cost of a dispatch based on the weight and cubic and the data defined for each shipper and their rates for shipping to various locations. The results of this calculation will only be meaningful if the data is entered for the item weight and volume in the stock item setup for all items and the freight costs for each shipper properly maintained.') . ''; @@ -771,21 +771,21 @@ echo '' . _('Standard Cost Decimal Places') . ': ' . _('Decimal Places to be used in Standard Cost') . ''; // NumberOfPeriodsOfStockUsage echo '' . _('Number Of Periods Of StockUsage') . ': ' . _('In stock usage inquiries this determines how many periods of stock usage to show. An average is calculated over this many periods') . ''; // StockUsageShowZeroWithinPeriodRange echo '' . _('Show Zero Counts Within Stock Usage Graph Period Range') . ': ' . _('Show periods having zero counts within Stock Usage Graph. Choosing yes may show a wider period range than expected.') . ' '; @@ -793,8 +793,8 @@ //Show values on GRN echo '' . _('Show order values on GRN') . ': ' . _('Should the value of the purchased stock be shown on the GRN screen') . ' '; @@ -802,16 +802,16 @@ // Check_Qty_Charged_vs_Del_Qty echo '' . _('Check Quantity Charged vs Deliver Qty') . ': ' . _('In entry of AP invoices this determines whether or not to check the quantities received into stock tie up with the quantities invoiced') . ''; // Check_Price_Charged_vs_Order_Price echo '' . _('Check Price Charged vs Order Price') . ': ' . _('In entry of AP invoices this parameter determines whether or not to check invoice prices tie up to ordered prices') . ''; @@ -828,15 +828,15 @@ // PO_AllowSameItemMultipleTimes echo '' . _('Purchase Order Allows Same Item Multiple Times') . ': ' . _('If a purchase order can have the same item on the order several times this parameter should be set to yes') . ''; // AutoAuthorisePO echo '' . _('Automatically authorise purchase orders if user has authority') . ': ' . _('If the user changing an existing purchase order or adding a new puchase order is set up to authorise purchase orders and the order is within their limit, then the purchase order status is automatically set to authorised') . ''; @@ -859,7 +859,7 @@ echo '' . _('Financial Year Ends On') . ': ' . _('Defining the month in which the financial year ends enables the system to provide useful defaults for general ledger reports') . ''; @@ -879,8 +879,8 @@ echo ' ' . _('Show Stockid on images') . ': ' . _('Show the code inside the thumbnail image of the items') . ' '; @@ -975,8 +975,8 @@ // HTTPS_Only echo '' . _('Only allow secure socket connections') . ': ' . _('Force connections to be only over secure sockets - ie encrypted data only') . ' '; @@ -1144,37 +1144,19 @@ //Which messages to log echo '' . _('Log Severity Level') . ':'; echo '' . _('Choose which Status messages to keep in your log file.') . ''; @@ -1186,8 +1168,8 @@ //DefineControlledOnWOEntry echo '' . _('Controlled Items Defined At Work Order Entry') . ': ' . _('When set to yes, controlled items are defined at the time of the work order creation. Otherwise controlled items (serial numbers and batch/roll/lot references) are entered at the time the finished items are received against the work order') . ''; @@ -1237,10 +1219,10 @@ '; if ($_SESSION['QualityLogSamples'] == 0){ - echo ''; + echo ''; echo ''; } elseif ($_SESSION['QualityLogSamples'] == 1){ - echo ''; + echo ''; echo ''; } @@ -1278,10 +1260,10 @@