X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=a73bc8ad237fab478412f22e8298a1439412ba42;hb=2cb57633d2f3e27b0c2b2e7448564f467e21e1fd;hp=15ec358461e68cf139c0df01b10c7750a7969b1e;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index 15ec3584..a73bc8ad 100644
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,32 +1,44 @@
 <?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_, $ref, $amount, $discount, $memo_, $rate=0)
+	$date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
 {
+	global $Refs;
+
 	begin_transaction();
 
 	$company_record = get_company_prefs();
 
-	$payment_no = write_customer_trans(12, $trans_no, $customer_id, $branch_id, 
+	$payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
 		$date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, 0, "", 0, $rate);
 
 	$bank_gl_account = get_bank_gl_account($bank_account);
 
 	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_);
 	}
-
+	$total = 0;
 	/* Bank account entry first */
-	add_gl_trans_customer(12, $payment_no, $date_,
-		$bank_gl_account, 0, 0, $amount,  $customer_id,
+	$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);
 
@@ -39,27 +51,36 @@ 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", $rate);
+	/* 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", $rate);
 	}
 
+	if ($charge != 0)	{
+		/* Now Debit bank charge account with charges */
+		$charge_act = get_company_pref('bank_charge_act');
+		$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_, $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);
 
 	commit_transaction();