projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes to changed access system, activated js confirm dialogs.
[fa-stable.git]
/
reporting
/
rep105.php
diff --git
a/reporting/rep105.php
b/reporting/rep105.php
index bc367e6aaa08019ba5be4c27ee42cd9484dbeff5..3af56221bb43ea155ef02ca1734dbca32e5ea938 100644
(file)
--- 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>.
***********************************************************************/
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
// ----------------------------------------------------------------
// $ 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
".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'
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'