X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep105.php;h=6b391a63c3c4c512274f0d6ac5dc2ee31a072bef;hb=6f8094c63f914fce9fcfd02780c452d712a2dba3;hp=e3cd6de775a3becf785c7271ad8335b34e357954;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/reporting/rep105.php b/reporting/rep105.php
index e3cd6de7..6b391a63 100644
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_SALESBULKREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -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');
@@ -94,7 +96,7 @@ function print_order_status_list()
 	if ($location == null)
 		$loc = _('All');
 	else
-		$loc = $location;
+		$loc = get_location_name($location);
 	if ($backorder == 0)
 		$back = _('All Orders');
 	else