From: <ex...@us...> - 2016-07-27 07:19:18
|
Revision: 7574 http://sourceforge.net/p/web-erp/reponame/7574 Author: exsonqu Date: 2016-07-27 07:19:16 +0000 (Wed, 27 Jul 2016) Log Message: ----------- 27/07/16 Exson: Fixed the divided by zero error when discount is 100% in SelectOrderItems.php. Modified Paths: -------------- trunk/SelectOrderItems.php trunk/doc/Change.log Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2016-07-27 07:03:27 UTC (rev 7573) +++ trunk/SelectOrderItems.php 2016-07-27 07:19:16 UTC (rev 7574) @@ -1025,7 +1025,11 @@ /*There is a new price being input for the line item */ $Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]); + if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error $_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100); + } else { + $_POST['GPPercent_' . $OrderLine->LineNumber] = 0; + } } elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) { /* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-07-27 07:03:27 UTC (rev 7573) +++ trunk/doc/Change.log 2016-07-27 07:19:16 UTC (rev 7574) @@ -1,5 +1,6 @@ webERP Change Log +27/07/16 Exson: Fixed the divided by zero error when discount is 100% in SelectOrderItems.php. 27/07/16 Exson: Add error proof to avoid a blank credit note issued without any items credited or freight charge input in Credit_Invoice.php. 25/07/16 Exson: Add InternalStockRequestInquiry.php script. 22/07/16 Exson: Make items search limited to the sales orders and if search result is 1 show the result immediately in SelectSalesOrder.php |