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

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index 74054b06..baabf0fe 100644
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,30 +1,51 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 /*
   Write/update customer payment.
 */
 function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account,
-	$date_, $receipt_type, $ref, $amount, $discount, $memo_)
+	$date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
 {
+	global $Refs;
+
 	begin_transaction();
+	$args = func_get_args(); while (count($args) < 11) $args[] = 0;
+	$args = (object)array_combine(array('trans_no', 'customer_id', 'branch_id', 'bank_account', 
+		'date_', 'ref', 'amount', 'discount', 'memo_','rate','charge'), $args);
+	hook_db_prewrite($args, ST_CUSTPAYMENT);
 
 	$company_record = get_company_prefs();
-
-	$payment_no = write_customer_trans(12, $trans_no,
-	    $customer_id, $branch_id, $date_, $ref, $amount, $discount);
-
+	
+	//Chaitanya : 13_OCT_2011 : Voiding Tasks first
+	//Reason : After modifying the customer trans, it was getting voided later
 	if ($trans_no != 0) {
-	  delete_comments(12, $trans_no);
-	  void_bank_trans(12, $trans_no, true);
-	  void_gl_trans(12, $trans_no, true);
-	  void_cust_allocations(12, $trans_no, $date_);
+	  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 */
-	add_gl_trans_customer(12, $payment_no, $date_,
-		$bank_account, 0, 0, $amount,  $customer_id,
-		"Cannot insert a GL transaction for the bank account debit");
+	$total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
+		$bank_gl_account, 0, 0, $amount - $charge,  $customer_id,
+		"Cannot insert a GL transaction for the bank account debit", $rate);
 
-	if ($branch_id != reserved_words::get_any_numeric()) {
+	if ($branch_id != ANY_NUMERIC) {
 
 		$branch_data = get_branch_accounts($branch_id);
 
@@ -37,28 +58,39 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 	}
 
 	if (($discount + $amount) != 0)	{
-		/* Now Credit Debtors account with receipts + discounts */
-		add_gl_trans_customer(12, $payment_no, $date_,
-			$debtors_account, 0, 0, -($discount + $amount), $customer_id,
-			"Cannot insert a GL transaction for the debtors account credit");
+	/* Now Credit Debtors account with receipts + discounts */
+	$total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
+		$debtors_account, 0, 0, -($discount + $amount), $customer_id,
+		"Cannot insert a GL transaction for the debtors account credit", $rate);
 	}
-
 	if ($discount != 0)	{
 		/* Now Debit discount account with discounts allowed*/
-		add_gl_trans_customer(12, $payment_no, $date_,
+		$total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
 			$discount_account, 0, 0, $discount, $customer_id,
-			"Cannot insert a GL transaction for the payment discount debit");
+			"Cannot insert a GL transaction for the payment discount debit", $rate);
+	}
+
+	if ($charge != 0)	{
+		/* Now Debit bank charge account with charges */
+		$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);
 	}
+	/*Post a balance post if $total != 0 */
+	add_gl_balance(ST_CUSTPAYMENT, $payment_no, $date_, -$total, PT_CUSTOMER, $customer_id);	
 
 	/*now enter the bank_trans entry */
-	add_bank_trans(12, $payment_no, $bank_account, $ref,
-		$date_, $receipt_type, $amount, payment_person_types::customer(), $customer_id,
-		get_customer_currency($customer_id));
+	add_bank_trans(ST_CUSTPAYMENT, $payment_no, $bank_account, $ref,
+		$date_, $amount - $charge, PT_CUSTOMER, $customer_id,
+		get_customer_currency($customer_id), "", $rate);
 
-	add_comments(12, $payment_no, $date_, $memo_);
+	add_comments(ST_CUSTPAYMENT, $payment_no, $date_, $memo_);
 
-	references::save_last($ref, 12);
+	$Refs->save(ST_CUSTPAYMENT, $payment_no, $ref);
 
+	$args->trans_no = $payment_no;
+	hook_db_postwrite($args, ST_CUSTPAYMENT);
 	commit_transaction();
 
 	return $payment_no;
@@ -70,6 +102,7 @@ function void_customer_payment($type, $type_no)
 {
 	begin_transaction();
 
+	hook_db_prevoid($type, $type_no);
 	void_bank_trans($type, $type_no, true);
 	void_gl_trans($type, $type_no, true);
 	void_cust_allocations($type, $type_no);