[Web-erp-svn] SF.net SVN: web-erp:[7190] trunk/SelectSalesOrder.php

[<ex...@us...>]

Revision: 7190
          http://sourceforge.net/p/web-erp/reponame/7190
Author:   exsonqu
Date:     2015-03-07 02:14:54 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.

Modified Paths:
--------------
    trunk/SelectSalesOrder.php

Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php	2015-03-05 23:49:01 UTC (rev 7189)
+++ trunk/SelectSalesOrder.php	2015-03-07 02:14:54 UTC (rev 7190)
@@ -496,11 +496,11 @@
 		echo '</select></td>
 			<td><select name="Quotations">';
 
-		if ($_GET['Quotations']=='Quotes_Only'){
+		if (isset($_GET['Quotations']) AND $_GET['Quotations']=='Quotes_Only'){
 			$_POST['Quotations']='Quotes_Only';
 		}
 
-		if ($_POST['Quotations']=='Quotes_Only'){
+		if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Quotes_Only'){
 			echo '<option selected="selected" value="Quotes_Only">' . _('Quotations Only') . '</option>';
 			echo '<option value="Orders_Only">' . _('Orders Only')  . '</option>';
 		} else {
@@ -613,7 +613,7 @@
 					salesorders.deliverto,
 					salesorders.printedpackingslip,
 					salesorders.poplaced,
-					SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
+					SUM(salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
 				FROM salesorders INNER JOIN salesorderdetails
 					ON salesorders.orderno = salesorderdetails.orderno
 					INNER JOIN debtorsmaster
@@ -915,4 +915,4 @@
 	return $StockItemsResult;
 
 }
-?>
\ No newline at end of file
+?>