X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=f7e56866f8950b6974621530008867d1ec002c1e;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=d8049b318fef1b3742ea501d04b2113ceb8a6eab;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index d8049b31..f7e56866 100644
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,20 +1,22 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    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_, $ref, $amount, $discount, $memo_, $rate=0)
+	$date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
 {
+	global $Refs;
+
 	begin_transaction();
 
 	$company_record = get_company_prefs();
@@ -33,10 +35,10 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 	$total = 0;
 	/* Bank account entry first */
 	$total += add_gl_trans_customer(12, $payment_no, $date_,
-		$bank_gl_account, 0, 0, $amount,  $customer_id,
+		$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);
 
@@ -49,10 +51,10 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 	}
 
 	if (($discount + $amount) != 0)	{
-		/* Now Credit Debtors account with receipts + discounts */
-		$total += 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", $rate);
+	/* Now Credit Debtors account with receipts + discounts */
+	$total += 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", $rate);
 	}
 	if ($discount != 0)	{
 		/* Now Debit discount account with discounts allowed*/
@@ -61,17 +63,24 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 			"Cannot insert a GL transaction for the payment discount debit", $rate);
 	}
 
+	if ($charge != 0)	{
+		/* Now Debit bank charge account with charges */
+		$charge_act = get_company_pref('bank_charge_act');
+		$total += add_gl_trans_customer(12, $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(12, $payment_no, $date_, -$total, payment_person_types::customer(), $customer_id);	
+	add_gl_balance(12, $payment_no, $date_, -$total, PT_CUSTOMER, $customer_id);	
 
 	/*now enter the bank_trans entry */
 	add_bank_trans(12, $payment_no, $bank_account, $ref,
-		$date_, $amount, payment_person_types::customer(), $customer_id,
-		get_customer_currency($customer_id));
+		$date_, $amount - $charge, PT_CUSTOMER, $customer_id,
+		get_customer_currency($customer_id), "", $rate);
 
 	add_comments(12, $payment_no, $date_, $memo_);
 
-	references::save_last($ref, 12);
+	$Refs->save(12, $payment_no, $ref);
 
 	commit_transaction();