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

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 2b3cd451..bf28fe60 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -43,7 +43,7 @@ function get_customer_trans_version($type, $trans_no) {
 	$sql .= implode(' OR ', $trans_no) . ')';
 
 	$res = db_query($sql, 'document version retreival');
-
+	
 	$vers = array();
 	while($mysql=db_fetch($res)) {
 		$vers[$mysql['trans_no']] = $mysql['version'];
@@ -72,8 +72,10 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	if ($trans_type == ST_BANKPAYMENT)
 		$Total = -$Total;
 
-	if ($new) {
-	$trans_no = get_next_trans_no($trans_type);
+    if ($new || !exists_customer_trans($trans_type, $trans_no))
+    {
+        if ($new)
+        $trans_no = get_next_trans_no($trans_type);
 
 	$sql = "INSERT INTO ".TB_PREF."debtor_trans (
 		trans_no, type,
@@ -91,7 +93,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 		".db_escape($Freight).",
 		$FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt,
 		".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
-		.db_escape($payment_terms).")";
+		.db_escape($payment_terms, true).")";
 	} 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).",
@@ -122,7 +124,8 @@ function get_customer_trans($trans_id, $trans_type)
 
 	if ($trans_type == ST_CUSTPAYMENT) {
 		// it's a payment so also get the bank account
-		$sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
+		// 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 ";
 	}
 
@@ -160,6 +163,7 @@ function get_customer_trans($trans_id, $trans_type)
 		// 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
+			AND ".TB_PREF."bank_trans.amount != 0
 			AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
 	}
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
@@ -202,6 +206,19 @@ 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)
@@ -315,7 +332,7 @@ function get_sql_for_customer_inquiry()
    	{
    		if ($_POST['filterType'] == '1')
    		{
-   			$sql .= " AND (trans.type = ".ST_SALESINVOICE." OR trans.type = ".ST_BANKPAYMENT.") ";
+   			$sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
    		}
    		elseif ($_POST['filterType'] == '2')
    		{
@@ -324,7 +341,7 @@ function get_sql_for_customer_inquiry()
    		elseif ($_POST['filterType'] == '3')
    		{
 			$sql .= " AND (trans.type = " . ST_CUSTPAYMENT 
-					." OR trans.type = ".ST_BANKDEPOSIT.") ";
+					." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") ";
    		}
    		elseif ($_POST['filterType'] == '4')
    		{