Supplier transactions now show supplier reference for PO Deliveries.

[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 ddbdc9e7d9808be9db0d55428de84c6c90bdbf22..7a67cba433b58ccacf15e3eb4f69cd0702ef111a 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -55,7 +55,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
        $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total,
                ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS curr_code ";
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code,
@@ -65,7 +65,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 
        $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
@@ -77,7 +77,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
        if ($trans_type > 0)
                $sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)."
@@ -190,7 +190,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                trans.id as trans_no,
                trans.reference, 
                supplier.supp_name, 
-               '' as supp_reference,
+               po.requisition_no AS supp_reference,
        delivery_date as tran_date, 
                '' as due_date,
                supplier.curr_code, 
@@ -198,8 +198,9 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                '' AS Allocated,
                0 as OverDue,
        1 as Settled
-       FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier
+       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'";