CHANGELOG.txt

[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 7790798696ba0ab77b8a5491e1693bf8fd7fad89..d87e1a9379585205520df1dfbbf0874c845c37a4 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -43,7 +43,8 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
                $err_msg = "Cannot insert a supplier transaction record";
 
        db_query($sql, $err_msg);
-       add_audit_trail($type, $trans_no, $date_);
+       if ($type != ST_JOURNAL && $type != ST_BANKDEPOSIT && $type != ST_BANKPAYMENT) 
+               add_audit_trail($type, $trans_no, $date_);
 
        return $trans_no;
 }
@@ -131,7 +132,7 @@ function get_supp_payment_before($supplier_id, $date)
        . TB_PREF . "bank_trans,"
        . TB_PREF . "bank_accounts "
        . "WHERE "
-       . TB_PREF . "supp_trans.supplier_id=" . $supplier_id . " "
+       . 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 "
@@ -258,6 +259,8 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        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) {
@@ -286,6 +289,10 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                {
                        $sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
                }
+               elseif (($filter == '7')) 
+               {
+                       $sql .= " AND trans.type = ".ST_JOURNAL."  ";
+               }
 
                if (($filter == '2') || ($filter == '5')) 
                {