Fixed amibiguity in few text messages to make translations easier, updated gettext...

[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 7a67cba433b58ccacf15e3eb4f69cd0702ef111a..417f97b4c2330194d271a4cef1cf0f576d25281b 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -50,7 +50,7 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
 
 //-------------------------------------------------------------------------------------------------------------
 
-function get_supp_trans($trans_no, $trans_type=-1)
+function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
 {
        $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 ";
@@ -74,7 +74,10 @@ function get_supp_trans($trans_no, $trans_type=-1)
        $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=".db_escape($trans_no)."
                AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id";
 
-       if ($trans_type > 0)
+       if (isset($supplier_id))
+               $sql .= " AND ".TB_PREF."supp_trans.supplier_id=".db_escape($supplier_id);
+
+       if ($trans_type > -1)
                $sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
 
        if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
@@ -100,10 +103,10 @@ function get_supp_trans($trans_no, $trans_type=-1)
        display_db_error("duplicate supplier transactions found for given params", $sql, true);
        exit;
     }
-
     return db_fetch($result);
 }
 
+
 //----------------------------------------------------------------------------------------
 
 function exists_supp_trans($type, $type_no)
@@ -213,7 +216,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                        $sql = $sql2;
        } 
        elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
-               $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+               $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
        }
 
        if (isset($filter) && $filter != ALL_TEXT)
@@ -243,4 +246,3 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        }
        return $sql;
 }
-?>
\ No newline at end of file