From: <ex...@us...> - 2014-05-26 10:33:06
|
Revision: 6732 http://sourceforge.net/p/web-erp/reponame/6732 Author: exsonqu Date: 2014-05-26 10:33:02 +0000 (Mon, 26 May 2014) Log Message: ----------- 26/05/14 Thumb: Fixed discount modifier missing bug in SelectOrderItems.php. Modified Paths: -------------- trunk/SelectOrderItems.php Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2014-05-26 07:16:23 UTC (rev 6731) +++ trunk/SelectOrderItems.php 2014-05-26 10:33:02 UTC (rev 6732) @@ -1022,7 +1022,7 @@ /*There is a new price being input for the line item */ $Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]); - $_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); + $_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); } 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 */ @@ -1883,4 +1883,4 @@ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg); return $result; } -?> \ No newline at end of file +?> |