X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep105.php;h=3af56221bb43ea155ef02ca1734dbca32e5ea938;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=bc367e6aaa08019ba5be4c27ee42cd9484dbeff5;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git

diff --git a/reporting/rep105.php b/reporting/rep105.php
index bc367e6a..3af56221 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 = 30)
             	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'