X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=efb6b25f97fa0139177d3e57309fd140de6474a1;hb=8d564a2cbca92c71738d933813ac4985e15488e4;hp=bf28fe604863b255ec56bd2ab67e3237bc4e1f90;hpb=f75695448532371e64f0d3033b88389a62d41da3;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index bf28fe60..efb6b25f 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -103,7 +103,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)."
 		WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
 	}
 	db_query($sql, "The debtor transaction record could not be inserted");
@@ -116,17 +116,22 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 function get_customer_trans($trans_id, $trans_type)
 {
+	global $go_debug;
+
 	$sql = "SELECT trans.*,"
 		."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
 		."cust.name AS DebtorName, cust.address, "
 		."cust.curr_code, "
-		."cust.tax_id ";
+		."cust.tax_id, "
+		."com.memo_";
 
-	if ($trans_type == ST_CUSTPAYMENT) {
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
 		// Chaitanya : Added bank_act to support Customer Payment Edit
 		$sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
-			".TB_PREF."bank_accounts.account_type AS BankTransType ";
+			".TB_PREF."bank_accounts.account_type AS BankTransType,
+			".TB_PREF."bank_accounts.bank_curr_code,
+			".TB_PREF."bank_trans.amount as bank_amount";
 	}
 
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
@@ -140,17 +145,19 @@ function get_customer_trans($trans_id, $trans_type)
 		.TB_PREF."tax_groups.id AS tax_group_id ";
 	}
 
-	$sql .= " FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master cust";
+	$sql .= " FROM ".TB_PREF."debtor_trans trans
+					LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+					LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
+					".TB_PREF."debtors_master cust";
 
-	if ($trans_type == ST_CUSTPAYMENT) {
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
 		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
 	}
 
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
 		// it's an invoice so also get the shipper, salestypes
-		$sql .= ", ".TB_PREF."shippers, "
-		.TB_PREF."sales_types, "
+		$sql .= ", ".TB_PREF."sales_types, "
 		.TB_PREF."cust_branch branch, "
 		.TB_PREF."tax_groups ";
 	}
@@ -159,7 +166,7 @@ function get_customer_trans($trans_id, $trans_type)
 		AND trans.type=".db_escape($trans_type)."
 		AND trans.debtor_no=cust.debtor_no";
 
-	if ($trans_type == ST_CUSTPAYMENT) {
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
 		$sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
 			AND ".TB_PREF."bank_trans.type=$trans_type
@@ -168,8 +175,7 @@ function get_customer_trans($trans_id, $trans_type)
 	}
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
 		// it's an invoice so also get the shipper
-		$sql .= " AND ".TB_PREF."shippers.shipper_id=trans.ship_via
-			AND ".TB_PREF."sales_types.id = trans.tpe
+		$sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
 			AND branch.branch_code = trans.branch_code
 			AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
 	}
@@ -178,12 +184,15 @@ function get_customer_trans($trans_id, $trans_type)
 
 	if (db_num_rows($result) == 0) {
 		// can't return nothing
+		if($go_debug)
+			display_backtrace();
 		display_db_error("no debtor trans found for given params", $sql, true);
 		exit;
 	}
-
 	if (db_num_rows($result) > 1) {
 		// can't return multiple
+		if($go_debug)
+			display_backtrace();
 		display_db_error("duplicate debtor transactions found for given params", $sql, true);
 		exit;
 	}
@@ -206,19 +215,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)