[Web-erp-svn] SF.net SVN: web-erp:[7916] trunk

[<tu...@us...>]

Revision: 7916
          http://sourceforge.net/p/web-erp/reponame/7916
Author:   turbopt
Date:     2018-01-12 22:59:06 +0000 (Fri, 12 Jan 2018)
Log Message:
-----------
CustomerPurchases.php: Fix script to show actual Price and actual Amount of Sale based upon discount. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8040)

Modified Paths:
--------------
    trunk/CustomerPurchases.php
    trunk/doc/Change.log

Modified: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php	2018-01-11 08:08:07 UTC (rev 7915)
+++ trunk/CustomerPurchases.php	2018-01-12 22:59:06 UTC (rev 7916)
@@ -45,6 +45,7 @@
 			price,
 			reference,
 			qty,
+			discountpercent,
 			narrative
 		FROM stockmoves
 		INNER JOIN stockmaster
@@ -99,9 +100,9 @@
 				<td class="number">' . $StockMovesRow['transno'] . '</td>
 				<td>' . $StockMovesRow['locationname'] . '</td>
 				<td>' . $StockMovesRow['branchcode'] . '</td>
-				<td class="number">' . locale_number_format($StockMovesRow['price'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format($StockMovesRow['price'] * (1 - $StockMovesRow['discountpercent']), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
 				<td class="number">' . locale_number_format(-$StockMovesRow['qty'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
-				<td class="number">' . locale_number_format((-$StockMovesRow['qty'] * $StockMovesRow['price']), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format((-$StockMovesRow['qty'] * $StockMovesRow['price'] * (1 - $StockMovesRow['discountpercent'])), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
 				<td class="number">' . $StockMovesRow['reference'] . '</td>
 				<td>' . $StockMovesRow['narrative'] . '</td>
 			</tr>';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2018-01-11 08:08:07 UTC (rev 7915)
+++ trunk/doc/Change.log	2018-01-12 22:59:06 UTC (rev 7916)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+12/1/18  Paul Becker (PaulT commit): CustomerPurchases.php: Fix script to show actual Price and actual Amount of Sale based upon discount. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8040)
 9/1/18   PaulT: Payments.php: Remove my debug/test echo line from the previous commit.
 9/1/18   Paul Becker (PaulT commit): Payments.php: Show bank balance at payments. Know that balance display/output is protected by a similar security check manner as protected information at the dashboard. (Reported in forums: http://weberp.org/forum/showthread.php?tid=8017)
 9/1/18   Paul Becker (PaulT commit): Z_MakeNewCompany.php, default.sql, demo.sql: Remove doubled underscore in EDI_Sent reference. (Reported in forums: http://weberp.org/forum/showthread.php?tid=7920)