From: <dai...@us...> - 2017-05-16 05:38:52
|
Revision: 7762 http://sourceforge.net/p/web-erp/reponame/7762 Author: daintree Date: 2017-05-16 05:38:49 +0000 (Tue, 16 May 2017) Log Message: ----------- Andy Couling fix SQL in PO_Items.php Modified Paths: -------------- trunk/PO_Items.php trunk/doc/Change.log Modified: trunk/PO_Items.php =================================================================== --- trunk/PO_Items.php 2017-05-14 23:58:40 UTC (rev 7761) +++ trunk/PO_Items.php 2017-05-16 05:38:49 UTC (rev 7762) @@ -735,12 +735,12 @@ $DisplayLineTotal = locale_number_format($LineTotal,$_SESSION['PO'.$identifier]->CurrDecimalPlaces); // Note if the price is greater than 1 use 2 decimal place, if the price is a fraction of 1, use 4 decimal places // This should help display where item-price is a fraction - if ($POLine->Price > 1) { + if ($POLine->Price > 100000) { $DisplayPrice = locale_number_format($POLine->Price,$_SESSION['PO'.$identifier]->CurrDecimalPlaces); $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),$_SESSION['PO'.$identifier]->CurrDecimalPlaces); } else { - $DisplayPrice = locale_number_format($POLine->Price,4); - $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),4),4); + $DisplayPrice = locale_number_format($POLine->Price,5); + $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),5),5); } if ($k==1){ @@ -1091,7 +1091,7 @@ $Offset = $ListPageMax; } - $sql = $sql . "LIMIT " . $_SESSION['DisplayRecordsMax']." OFFSET " . strval($_SESSION['DisplayRecordsMax']*$Offset); + $sql = $sql . " LIMIT " . $_SESSION['DisplayRecordsMax']." OFFSET " . strval($_SESSION['DisplayRecordsMax']*$Offset); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-05-14 23:58:40 UTC (rev 7761) +++ trunk/doc/Change.log 2017-05-16 05:38:49 UTC (rev 7762) @@ -1,5 +1,6 @@ webERP Change Log +16/5/17 Andrew Couling: SQL correction in PO_Items.php. Line 1094. 7/5/17 Andy Couling/Janb: Fixes to MRP scripts SQL to get table names per forum post http://www.weberp.org/forum/showthread.php?tid=2448 13/4/17 RChacon: Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php and includes/session.php. 09/4/17 RChacon: In UserSettings.php, add options to turn off/on page help and field help. In WWW_Users.php, improve code and documentation. |