Fixing tax_included in gl_items.

[fa-stable.git] / purchasing / includes / db / supp_trans_db.inc

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index a2265bb91d01672426961cd7c9d751eeba01eb72..50ad5803c9e7a797718bf099f1a02728ecb1862e 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -12,7 +12,7 @@
 //-------------------------------------------------------------------------------------------------------------
 
 function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-       $amount, $amount_tax, $discount, $err_msg="", $rate=0)
+       $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0)
 {
        $date = date2sql($date_);
        if ($due_date == "")
@@ -29,11 +29,11 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 
 
        $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date,
-               reference, supp_reference, ov_amount, ov_gst, rate, ov_discount) ";
+               reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included) ";
        $sql .= "VALUES (".db_escape($trans_no).", ".db_escape($type)
        .", ".db_escape($supplier_id).", '$date', '$due_date',
                ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount)
-               .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).")";
+               .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
 
        if ($err_msg == "")
                $err_msg = "Cannot insert a supplier transaction record";
@@ -216,8 +216,36 @@ function get_sql_for_supplier_inquiry()
        AND trans.tran_date >= '$date_after'
        AND trans.tran_date <= '$date_to'
                AND trans.ov_amount != 0";      // exclude voided transactions
-       if ($_POST['supplier_id'] != ALL_TEXT)
+
+       $sql2 = "SELECT ".ST_SUPPRECEIVE." as type, 
+               trans.id as trans_no,
+               trans.reference, 
+               supplier.supp_name, 
+               '' 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
+       WHERE supplier.supplier_id = trans.supplier_id
+       AND trans.delivery_date >= '$date_after'
+       AND trans.delivery_date <= '$date_to'";
+
+       if ($_POST['supplier_id'] != ALL_TEXT) {
                $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+               $sql2 .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+       }
+       if (($_POST['filterType'] == '6')) 
+       {
+                       $sql = $sql2;
+       } 
+       elseif (!isset($_POST['filterType']) || $_POST['filterType'] == ALL_TEXT || $_POST['filterType'] == '6') {
+               $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+       }
+
        if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
        {
                if (($_POST['filterType'] == '1'))