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
".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'
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)
- $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc='$location'";
+ $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc=".db_escape($location);
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");
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');
if ($location == null)
$loc = _('All');
else
- $loc = $location;
+ $loc = get_location_name($location);
if ($backorder == 0)
$back = _('All Orders');
else
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
- $rep->Header();
+ $rep->NewPage();
$orderno = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
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'])
if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
{
$orderno = 0;
- $rep->Header();
+ $rep->NewPage();
}
}
$rep->Line($rep->row);