X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep105.php;h=dd535b9858b4b23cb993b9c05ffd636349b1a58b;hb=fa600790f955f0a95856ea4c2327d1230e35c083;hp=63a804d685a6f0a0ceb7be7b9c85bae54c9dd4c8;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/reporting/rep105.php b/reporting/rep105.php
index 63a804d6..dd535b98 100644
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -49,7 +49,9 @@ function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0)
                 ".TB_PREF."sales_order_details.qty_sent
             FROM ".TB_PREF."sales_orders
             	INNER JOIN ".TB_PREF."sales_order_details
-            	    ON ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
+            	    ON (".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
+            	    AND ".TB_PREF."sales_orders.trans_type = ".TB_PREF."sales_order_details.trans_type
+            	    AND ".TB_PREF."sales_orders.trans_type = ".ST_SALESORDER.")
             	INNER JOIN ".TB_PREF."stock_master
             	    ON ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id
             WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
@@ -83,9 +85,9 @@ function print_order_status_list()
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-	if ($category == reserved_words::get_all_numeric())
+	if ($category == ALL_NUMERIC)
 		$category = 0;
-	if ($location == reserved_words::get_all())
+	if ($location == ALL_TEXT)
 		$location = null;
 	if ($category == 0)
 		$cat = _('All');