X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep105.php;h=4b6a086cc55b00166070f36d650eeac56d3425d0;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=3af56221bb43ea155ef02ca1734dbca32e5ea938;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git diff --git a/reporting/rep105.php b/reporting/rep105.php index 3af56221..4b6a086c 100644 --- a/reporting/rep105.php +++ b/reporting/rep105.php @@ -51,17 +51,17 @@ function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0) INNER JOIN ".TB_PREF."sales_order_details 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) + 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"); @@ -85,9 +85,9 @@ function print_order_status_list() 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');