X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=d347dbbfb2903069b45aadfc5e461f95aa274c8e;hb=0ad69edb5561aac03a5af49286c37b3350307719;hp=dde04fe7cd687e39135359df141a45e6fade34a7;hpb=5928cc0bb4164cfd1dfc77f279f6b12d7806294f;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index dde04fe7..d347dbbf 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -99,12 +99,12 @@ 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, 
+		) 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($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
 		".db_escape($Freight).",
-		$FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link);
+		$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=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
@@ -126,7 +126,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()) {
@@ -192,7 +192,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;
 }
 
 //----------------------------------------------------------------------------------------