X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=baabf0fed5623c83f2fe7ec010981226ba25d745;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=8b92dd1c59e15bcedb5607820b39300426d756fa;hpb=49fa30e88e27b311edaca3ae3789d62e4629eb39;p=fa-stable.git

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index 8b92dd1c..baabf0fe 100644
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -24,18 +24,21 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 	hook_db_prewrite($args, ST_CUSTPAYMENT);
 
 	$company_record = get_company_prefs();
-
-	$payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
-		$date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, "", 0, $rate);
-
-	$bank_gl_account = get_bank_gl_account($bank_account);
-
+	
+	//Chaitanya : 13_OCT_2011 : Voiding Tasks first
+	//Reason : After modifying the customer trans, it was getting voided later
 	if ($trans_no != 0) {
 	  delete_comments(ST_CUSTPAYMENT, $trans_no);
 	  void_bank_trans(ST_CUSTPAYMENT, $trans_no, true);
 	  void_gl_trans(ST_CUSTPAYMENT, $trans_no, true);
 	  void_cust_allocations(ST_CUSTPAYMENT, $trans_no, $date_);
 	}
+
+	$payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
+		$date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, "", 0, $rate);
+   
+	$bank_gl_account = get_bank_gl_account($bank_account);
+
 	$total = 0;
 	/* Bank account entry first */
 	$total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
@@ -69,7 +72,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 
 	if ($charge != 0)	{
 		/* Now Debit bank charge account with charges */
-		$charge_act = get_company_pref('bank_charge_act');
+		$charge_act = get_bank_charge_account($bank_account);
 		$total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
 			$charge_act, 0, 0, $charge, $customer_id,
 			"Cannot insert a GL transaction for the payment bank charge debit", $rate);