projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow reuse of references previously used on voided documents.
[fa-stable.git]
/
reporting
/
rep105.php
diff --git
a/reporting/rep105.php
b/reporting/rep105.php
index dd535b9858b4b23cb993b9c05ffd636349b1a58b..ad6e6ce4628f9b8d270c949b20613b1c2366f59f 100644
(file)
--- a/
reporting/rep105.php
+++ b/
reporting/rep105.php
@@
-57,11
+57,11
@@
function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0)
WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
AND ".TB_PREF."sales_orders.ord_date <='$todate'";
if ($category > 0)
WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
AND ".TB_PREF."sales_orders.ord_date <='$todate'";
if ($category > 0)
- $sql .= " AND ".TB_PREF."stock_master.category_id=
$category"
;
+ $sql .= " AND ".TB_PREF."stock_master.category_id=
".db_escape($category)
;
if ($location != null)
if ($location != null)
- $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc=
'$location'"
;
+ $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc=
".db_escape($location)
;
if ($backorder)
if ($backorder)
- $sql .= "AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
+ $sql .= "
AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
$sql .= " ORDER BY ".TB_PREF."sales_orders.order_no";
return db_query($sql, "Error getting order details");
$sql .= " ORDER BY ".TB_PREF."sales_orders.order_no";
return db_query($sql, "Error getting order details");
@@
-96,7
+96,7
@@
function print_order_status_list()
if ($location == null)
$loc = _('All');
else
if ($location == null)
$loc = _('All');
else
- $loc =
$location
;
+ $loc =
get_location_name($location)
;
if ($backorder == 0)
$back = _('All Orders');
else
if ($backorder == 0)
$back = _('All Orders');
else
@@
-125,7
+125,7
@@
function print_order_status_list()
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
- $rep->
Header
();
+ $rep->
NewPage
();
$orderno = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
$orderno = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
@@
-135,7
+135,7
@@
function print_order_status_list()
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
- $rep->
Header
();
+ $rep->
NewPage
();
}
$rep->NewLine(0, 2, false, $orderno);
if ($orderno != $myrow['order_no'])
}
$rep->NewLine(0, 2, false, $orderno);
if ($orderno != $myrow['order_no'])
@@
-171,7
+171,7
@@
function print_order_status_list()
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
- $rep->
Header
();
+ $rep->
NewPage
();
}
}
$rep->Line($rep->row);
}
}
$rep->Line($rep->row);