X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=b91a279558873c141331c55c30c21a5222c9ae57;hb=e2f475311cfe6efc1aae1b08da1eadaa00744991;hp=5e403c51c79de6858bdf1246c5e436b9fc340d1b;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 5e403c51..b91a2795 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -78,7 +78,7 @@ function get_customer_trans_version($type, $trans_no) {
 // date_ is display date (non-sql)
 function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	$date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
-	$sales_type=0, $order_no=0, $trans_link=0, $ship_via="", $due_date=null,
+	$sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
 	$AllocAmt=0)
 {
 
@@ -86,7 +86,10 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	$rate = get_exchange_rate_from_home_currency($curr, $date_);
 
 	$SQLDate = date2sql($date_);
-	$SQLDueDate = date2sql($due_date);
+	if ($due_date == "")
+		$SQLDueDate = "000-00-00";
+	else
+		$SQLDueDate = date2sql($due_date);
 
 	if ($trans_no==0) {
 	$trans_no = get_next_trans_no($trans_type);
@@ -99,18 +102,20 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 		order_, ov_amount, ov_discount,
 		ov_gst, ov_freight, ov_freight_tax,
 		rate, ship_via, alloc, trans_link
-		) VALUES ($trans_no, $trans_type, '$debtor_no', '$BranchNo',
-		'$SQLDate', '$SQLDueDate', '$reference',
-		'$sales_type', $order_no, $Total, $discount, $Tax, $Freight,
-		$FreightTax, $rate, '$ship_via', $AllocAmt, $trans_link)";
+		) VALUES ($trans_no, $trans_type,
+		".db_escape($debtor_no).", ".db_escape($BranchNo).",
+		'$SQLDate', '$SQLDueDate', ".db_escape($reference).",
+		".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
+		".db_escape($Freight).",
+		$FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).")";
 	} else {	// may be optional argument should stay unchanged ?
 	$sql = "UPDATE ".TB_PREF."debtor_trans SET
-		debtor_no='$debtor_no' , branch_code='$BranchNo',
+		debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
 		tran_date='$SQLDate', due_date='$SQLDueDate',
-		reference='$reference', tpe='$sales_type', order_=$order_no,
-		ov_amount=$Total, ov_discount=$discount, ov_gst=$Tax,
-		ov_freight=$Freight, ov_freight_tax=$FreightTax, rate=$rate,
-		ship_via='$ship_via', alloc=$AllocAmt, trans_link=$trans_link
+		reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=$order_no,
+		ov_amount=$Total, ov_discount=".db_escape($discount).", ov_gst=$Tax,
+		ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
+		ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link=$trans_link
 		WHERE trans_no=$trans_no AND type=$trans_type";
 	}
 	db_query($sql, "The debtor transaction record could not be inserted");
@@ -124,7 +129,7 @@ function get_customer_trans($trans_id, $trans_type)
 {
 	$sql = "SELECT ".TB_PREF."debtor_trans.*,
 		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-		".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email,
+		".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email AS email2,
 		".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.tax_id, ".TB_PREF."debtors_master.payment_terms ";
 
 	if ($trans_type == systypes::cust_payment()) {
@@ -190,7 +195,10 @@ function get_customer_trans($trans_id, $trans_type)
 		exit;
 	}
 
-	return db_fetch($result);
+	//return db_fetch($result);
+	$row = db_fetch($result);
+	$row['email'] = $row['email2'];
+	return $row;
 }
 
 //----------------------------------------------------------------------------------------