- if ($_POST['supplier_id'] != ALL_TEXT)
- $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
- if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+
+ $sql2 = "SELECT ".ST_SUPPRECEIVE." as type,
+ trans.id as trans_no,
+ trans.reference,
+ supplier.supp_name,
+ po.requisition_no AS supp_reference,
+ delivery_date as tran_date,
+ '' as due_date,
+ supplier.curr_code,
+ '' AS TotalAmount,
+ '' AS Allocated,
+ 0 as OverDue,
+ 1 as Settled
+ FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
+ WHERE supplier.supplier_id = trans.supplier_id
+ AND trans.purch_order_no = po.order_no
+ AND trans.delivery_date >= '$date_after'
+ AND trans.delivery_date <= '$date_to'";
+
+ if ($supplier_id != ALL_TEXT) {
+ $sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
+ $sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id);
+ }
+ if (($filter == '6'))
+ {
+ $sql = $sql2;
+ }
+ elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
+ $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
+ }
+
+ if (isset($filter) && $filter != ALL_TEXT)