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

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index b5755857..f7e56866 100644
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,63 +1,89 @@
 <?php
-
-function add_customer_payment($customer_id, $branch_id, $bank_account, $date_, $receipt_type, $ref, 
-	$amount, $discount, $memo_)
+/**********************************************************************
+    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, $charge=0)
 {
+	global $Refs;
+
 	begin_transaction();
-   
+
 	$company_record = get_company_prefs();
-   
-	$payment_no = add_customer_trans(systypes::cust_payment(), $customer_id, $branch_id, $date_, 
-    	$ref, -($amount), -($discount));          	     	
-        	
+
+	$payment_no = write_customer_trans(12, $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_);
+	}
+	$total = 0;
 	/* Bank account entry first */
-	add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
-		$bank_account, 0, 0, $amount,  $customer_id,
-		"Cannot insert a GL transaction for the bank account debit");
-							
-	if ($branch_id != reserved_words::get_any_numeric()) 
-	{
+	$total += add_gl_trans_customer(12, $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 != ANY_NUMERIC) {
+
 		$branch_data = get_branch_accounts($branch_id);
 
 		$debtors_account = $branch_data["receivables_account"];
-		$discount_account = $branch_data["payment_discount_account"];		
-		
-	} 
-	else 
-	{
+		$discount_account = $branch_data["payment_discount_account"];
+
+	} else {
 		$debtors_account = $company_record["debtors_act"];
 		$discount_account = $company_record["default_prompt_payment_act"];
 	}
-	
-	if (($discount + $amount) != 0)
-	{
-		/* Now Credit Debtors account with receipts + discounts */
-		add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
-			$debtors_account, 0, 0, -($discount + $amount), $customer_id,
-			"Cannot insert a GL transaction for the debtors account credit");		
-	}    	
-	
-	if ($discount != 0)
-	{
+
+	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);
+	}
+	if ($discount != 0)	{
 		/* Now Debit discount account with discounts allowed*/
-		add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
+		$total += add_gl_trans_customer(12, $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_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, PT_CUSTOMER, $customer_id);	
+
 	/*now enter the bank_trans entry */
-	add_bank_trans(systypes::cust_payment(), $payment_no, $bank_account, $ref, 
-		$date_, $receipt_type, $amount, payment_person_types::customer(), $customer_id,
-		get_customer_currency($customer_id));	 
-						
-	add_comments(systypes::cust_payment(), $payment_no, $date_, $memo_);						
-						
-	add_forms_for_sys_type(systypes::cust_payment(), $payment_no, payment_person_types::customer(), $customer_id);	
-	
-	references::save_last($ref, systypes::cust_payment());					  
+	add_bank_trans(12, $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_);
+
+	$Refs->save(12, $payment_no, $ref);
 
 	commit_transaction();
-	
+
 	return $payment_no;
 }
 
@@ -66,13 +92,13 @@ function add_customer_payment($customer_id, $branch_id, $bank_account, $date_, $
 function void_customer_payment($type, $type_no)
 {
 	begin_transaction();
-	
+
 	void_bank_trans($type, $type_no, true);
 	void_gl_trans($type, $type_no, true);
 	void_cust_allocations($type, $type_no);
 	void_customer_trans($type, $type_no);
-	
-	commit_transaction();			
+
+	commit_transaction();
 }