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

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

Revision: 7921
          http://sourceforge.net/p/web-erp/reponame/7921
Author:   turbopt
Date:     2018-01-25 17:27:43 +0000 (Thu, 25 Jan 2018)
Log Message:
-----------
ReorderLevel.php: Exclude completed orders from on order counts. (Reported in forums by briantmg: http://www.weberp.org/forum/showthread.php?tid=8060)

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

Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php	2018-01-24 23:28:23 UTC (rev 7920)
+++ trunk/ReorderLevel.php	2018-01-25 17:27:43 UTC (rev 7921)
@@ -83,12 +83,13 @@
 		$OnOrderSQL = "SELECT SUM(quantityord-quantityrecd) AS quantityonorder
 								FROM purchorders
 								LEFT JOIN purchorderdetails
-								ON purchorders.orderno=purchorderdetails.orderno
-								WHERE purchorders.status !='Cancelled'
-								AND purchorders.status !='Rejected'
-								AND purchorders.status !='Pending'
-								AND purchorderdetails.itemcode='".$myrow['stockid']."'
-								      AND purchorders.intostocklocation='".$myrow['loccode']."'";
+									ON purchorders.orderno=purchorderdetails.orderno
+								WHERE purchorders.status != 'Cancelled'
+									AND purchorders.status != 'Rejected'
+									AND purchorders.status != 'Pending'
+									AND purchorders.status != 'Completed'
+									AND purchorderdetails.itemcode='".$myrow['stockid']."'
+									AND purchorders.intostocklocation='".$myrow['loccode']."'";
 		$OnOrderResult = DB_query($OnOrderSQL);
 		$OnOrderRow = DB_fetch_array($OnOrderResult);
 		// Parameters for addTextWrap are defined in /includes/class.pdf.php

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2018-01-24 23:28:23 UTC (rev 7920)
+++ trunk/doc/Change.log	2018-01-25 17:27:43 UTC (rev 7921)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+24/1/18  Briantmg (PaulT commit): ReorderLevel.php: Exclude completed orders from on order counts. (Reported in forums by briantmg: http://www.weberp.org/forum/showthread.php?tid=8060)
 24/1/18  Paul Becker/PaulT (PaulT commit): SelectOrderItems.php: Paul B. Fix stock table columns NOT sorting on this page / PaulT. Use existing CSS to replace two style attributes. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8057&pid=13987#pid13987)
 24/1/18  Andy Couling (PaulT commit): SupplierInvoice.php, CounterSales.php: Replace two other hard-coded styles with existing CSS class. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8057)
 24/1/18  Paul Becker/PaulT (PaulT commit): SelectOrderItems.php: Paul B. Remove stray value output / PaulT. Replace hard-coded style with existing CSS class. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8057)