Merged changes up to 2.3.16 into unstable

[fa-stable.git] / sales / includes / db / cust_trans_db.inc

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 1458b82279ee5d4894dc0646619c9067ed571ea1..88e1bd0598e5bcbe98b8282f2eac22034f886e4c 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -104,7 +104,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
                ship_via=".db_escape($ship_via).", alloc=$AllocAmt,
                dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
-               payment_terms=".db_escape($payment_terms).",
+               payment_terms=".db_escape($payment_terms, true).",
                tax_included=".db_escape($tax_included)."
                prep_amount =".db_escape($prep_amount)."
                WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
@@ -216,19 +216,6 @@ function exists_customer_trans($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
-function get_customer_trans_from_ref($type, $ref)
-{
-       $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)."
-               AND reference=".db_escape($ref);
-
-       $result = db_query($sql, "Cannot retreive a debtor transaction");
-
-       $row = db_fetch_row($result);
-       return $row[0];
-}
-
-//----------------------------------------------------------------------------------------
-
 // retreives the related sales order for a given trans
 
 function get_customer_trans_order($type, $type_no)