Fixed warnings related to empty item/customer/supplier selector in search modes.

[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 f49b6c071d64981d405b0d342a04924bc578959a..aa9490afc707e048723376ab87c05c1704a1fff1 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -110,6 +110,48 @@ function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
 }
 
 
+//----------------------------------------------------------------------------------------
+
+function get_supp_payment_before($supplier_id, $date)
+{
+       $sql = "SELECT "
+       . TB_PREF . "supp_trans.trans_no,"
+       . TB_PREF . "supp_trans.type,"
+       . TB_PREF . "supp_trans.supplier_id,"
+       . TB_PREF . "supp_trans.tran_date,"
+       . TB_PREF . "supp_trans.ov_amount,"
+       . TB_PREF . "bank_trans.ref AS bank_ref,"
+       . TB_PREF . "bank_trans.amount AS bank_amount,"
+       . TB_PREF . "bank_accounts.id AS bank_id,"
+       . TB_PREF . "bank_accounts.bank_name,"
+       . TB_PREF . "bank_accounts.bank_account_name,"
+       . TB_PREF . "bank_accounts.bank_curr_code "
+       . "FROM "
+       . TB_PREF . "supp_trans,"
+       . TB_PREF . "bank_trans,"
+       . TB_PREF . "bank_accounts "
+       . "WHERE "
+       . TB_PREF . "supp_trans.supplier_id='" . $supplier_id . "' "
+       . "AND " . TB_PREF . "supp_trans.tran_date<'" . $date . "' "
+       . "AND " . TB_PREF . "supp_trans.type=" . ST_SUPPAYMENT . " "
+       . "AND " . TB_PREF . "supp_trans.trans_no=" . TB_PREF . "bank_trans.trans_no "
+       . "AND " . TB_PREF . "supp_trans.type=" . TB_PREF . "bank_trans.type "
+       . "AND " . TB_PREF . "bank_accounts.id=" . TB_PREF . "bank_trans.bank_act "
+       . "ORDER BY "
+       . TB_PREF . "supp_trans.tran_date DESC "
+       . "LIMIT 1 "
+       ;
+
+       $result = db_query($sql, "Cannot retreive a previous supplier payment");
+
+       if (db_num_rows($result) == 0)
+       {
+               return false;
+       }
+
+       return db_fetch($result);
+}
+
 //----------------------------------------------------------------------------------------
 
 function exists_supp_trans($type, $type_no)
@@ -182,14 +224,16 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        trans.tran_date, 
                trans.due_date,
                supplier.curr_code, 
-       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount,
+
+       IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
+       OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+               (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc) Balance,
                trans.alloc AS Allocated,
                ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
        (ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount) - trans.alloc <= ".FLOAT_COMP_DELTA.") AS Settled
        FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
        WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.tran_date >= '$date_after'
-       AND trans.tran_date <= '$date_to'
                AND trans.ov_amount != 0";      // exclude voided transactions
 
        $sql2 = "SELECT ".ST_SUPPRECEIVE." as type, 
@@ -200,15 +244,23 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        delivery_date as tran_date, 
                '' as due_date,
                supplier.curr_code, 
+               0 as Balance, 
        '' 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'";
+       AND trans.purch_order_no = po.order_no";
+
+       if ($filter == '2')
+               $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc>".FLOAT_COMP_DELTA;
+       else {
+               $sql .= " AND trans.tran_date >= '$date_after'
+                       AND trans.tran_date <= '$date_to'";
+               $sql2 .= " 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);
@@ -218,7 +270,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        {
                        $sql = $sql2;
        } 
-       elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
+       elseif (!isset($filter) || $filter == ALL_TEXT) {
                $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
        }
 
@@ -228,10 +280,6 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                {
                        $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
                } 
-               elseif (($filter == '2')) 
-               {
-                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-               } 
                elseif ($filter == '3') 
                {
                        $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";