projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed syntax typo.
[fa-stable.git]
/
reporting
/
rep105.php
diff --git
a/reporting/rep105.php
b/reporting/rep105.php
index d19c438c81e6962d0d47121dabdfa2cfe4eae873..d4916ca8428ca7849173749af2ea9c1fa5a7cbda 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'
@@
-79,19
+81,13
@@
function print_order_status_list()
$comments = $_POST['PARAM_5'];
$destination = $_POST['PARAM_6'];
if ($destination)
$comments = $_POST['PARAM_5'];
$destination = $_POST['PARAM_6'];
if ($destination)
- {
include_once($path_to_root . "/reporting/includes/excel_report.inc");
include_once($path_to_root . "/reporting/includes/excel_report.inc");
- $filename = "OrderStatusListing.xml";
- }
else
else
- {
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- $filename = "OrderStatusListing.pdf";
- }
- if ($category ==
reserved_words::get_all_numeric()
)
+ if ($category ==
ALL_NUMERIC
)
$category = 0;
$category = 0;
- if ($location ==
reserved_words::get_all()
)
+ if ($location ==
ALL_TEXT
)
$location = null;
if ($category == 0)
$cat = _('All');
$location = null;
if ($category == 0)
$cat = _('All');
@@
-125,7
+121,7
@@
function print_order_status_list()
$cols2 = $cols;
$aligns2 = $aligns;
$cols2 = $cols;
$aligns2 = $aligns;
- $rep = new FrontReport(_('Order Status Listing'),
$filename
, user_pagesize());
+ $rep = new FrontReport(_('Order Status Listing'),
"OrderStatusListing"
, user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);