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

[<dai...@us...>]

Revision: 5605
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5605&view=rev
Author:   daintree
Date:     2012-08-21 07:48:47 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
allow change to assembly even though purchase orders exist

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

Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php	2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/Stocks.php	2012-08-21 07:48:47 UTC (rev 5605)
@@ -292,9 +292,13 @@
 				if ($_POST['MBFlag']=='K' OR $_POST['MBFlag']=='A' OR $_POST['MBFlag']=='D') {
 
 					$sql = "SELECT quantityord-quantityrecd
-							FROM purchorderdetails
+							FROM purchorderdetails INNER JOIN purchorders
+							ON purchorders.orderno=purchorderdetails.orderno
 							WHERE itemcode = '".$StockID."'
-							AND completed=0";
+							AND purchorderdetails.completed=0
+							AND purchorders.status<>'Cancelled'
+							AND purchorders.status<>'Completed'
+							AND purchorders.status<>'Rejected'";
 
 					$result = DB_query($sql,$db);
 					$ChkPurchOrds = DB_fetch_row($result);

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/doc/Change.log	2012-08-21 07:48:47 UTC (rev 5605)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
 20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes  
 20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
 30/7/2012 Exson: fixed that the shipper will change sometime when modify the PO by modify file PO_ReadInOrder.inc. Reported by Craig. 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.