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

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

Revision: 7917
          http://sourceforge.net/p/web-erp/reponame/7917
Author:   turbopt
Date:     2018-01-15 22:41:51 +0000 (Mon, 15 Jan 2018)
Log Message:
-----------
CustomerPurchases.php: Adds Units and Discount columns and other minor changes so that it more closely matches output from OrderDetails.php. (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-12 22:59:06 UTC (rev 7916)
+++ trunk/CustomerPurchases.php	2018-01-15 22:41:51 UTC (rev 7917)
@@ -37,6 +37,7 @@
 
 $SQL = "SELECT stockmoves.stockid,
 			stockmaster.description,
+			stockmaster.units,
 			systypes.typename,
 			transno,
 			locations.locationname,
@@ -84,9 +85,11 @@
 				<th>' . _('Transaction No.') . '</th>
 				<th>' . _('From Location') . '</th>
 				<th>' . _('Branch Code') . '</th>
+				<th>' . _('Quantity') . '</th>
+				<th>' . _('Unit') . '</th>
 				<th>' . _('Price') . '</th>
-				<th>' . _('Quantity') . '</th>
-				<th>' . _('Amount of Sale') . '</th>
+				<th>' . _('Discount') . '</th>
+				<th>' . _('Total') . '</th>
 				<th>' . _('Reference') . '</th>
 				<th>' . _('Narrative') . '</th>
 			</tr>';
@@ -100,8 +103,10 @@
 				<td class="number">' . $StockMovesRow['transno'] . '</td>
 				<td>' . $StockMovesRow['locationname'] . '</td>
 				<td>' . $StockMovesRow['branchcode'] . '</td>
+				<td class="number">' . -$StockMovesRow['qty'] . '</td>
+				<td>' . $StockMovesRow['units'] . '</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['discountpercent'] * 100),2) . '%' . '</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>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2018-01-12 22:59:06 UTC (rev 7916)
+++ trunk/doc/Change.log	2018-01-15 22:41:51 UTC (rev 7917)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+15/1/18  Paul Becker (PaulT commit): CustomerPurchases.php: Adds Units and Discount columns and other minor changes so that it more closely matches output from OrderDetails.php. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8040)
 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)