X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=a90a305890181c490d4c7f11575b9193b9d14939;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=b82ab8889b818689efd006f2e7c4f6308d391b56;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index b82ab888..a90a3058 100644
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,53 +1,81 @@
 <?php
-
-function add_supp_payment($supplier_id, $date_, $bank_account,
-	$amount, $discount, $ref, $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>.
+***********************************************************************/
+function write_supp_payment($trans_no, $supplier_id, $bank_account,
+	$date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0)
 {
-	begin_transaction();
-
-   	$supplier_currency = get_supplier_currency($supplier_id);
-    $bank_account_currency = get_bank_account_currency($bank_account);
-	$bank_gl_account = get_bank_gl_account($bank_account);
-
-	$supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_);
-	$supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_);
+	global $Refs;
 
-	// it's a supplier payment
-	$trans_type = 22;
+	begin_transaction();
+	$args = func_get_args(); while (count($args) < 10) $args[] = 0;
+	$args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_',
+		 'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args);
+	$args->trans_no = 0;
+	hook_db_prewrite( $args, ST_SUPPAYMENT);
+
+	if ($trans_no != 0) {
+	  delete_comments(ST_SUPPAYMENT, $trans_no);
+	  void_bank_trans(ST_SUPPAYMENT, $trans_no, true);
+	  void_gl_trans(ST_SUPPAYMENT, $trans_no, true);
+	  void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_);
+	}
 
 	/* Create a supp_trans entry for the supplier payment */
-	$payment_id = add_supp_trans($trans_type, $supplier_id, $date_, $date_,
+	$payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_,
 		$ref, "", -$supp_amount, 0, -$supp_discount);
 
 	// Now debit creditors account with payment + discount
 
+	$total = 0;
     $supplier_accounts = get_supplier_accounts($supplier_id);
-
-	add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
+	$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
 		$supp_amount + $supp_discount, $supplier_id);
 
 	// Now credit discount received account with discounts
 	if ($supp_discount != 0)
 	{
-		add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
+		$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
 			-$supp_discount, $supplier_id);
 	}
 
-	if ($supp_amount != 0)
+	$bank = get_bank_account($bank_account);
+
+	if ($bank_charge != 0)
+	{
+		$charge_act = get_company_pref('bank_charge_act');
+		$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, 0, 0, '',
+			$bank_charge, $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id);
+	}
+
+	$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '',
+		-($bank_amount + $bank_charge), $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id);
+
+	/*Post a balance post if $total != 0 due to variance in AP and bank posted values*/
+	if ($total != 0)
 	{
-		add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
-			-$supp_amount, $supplier_id);
+		$variance_act = get_company_pref('exchange_diff_act');
+		add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, 0, 0, '',
+			-$total, null, PT_SUPPLIER,  $supplier_id);
 	}
 
    /*now enter the bank_trans entry */
-	add_bank_trans($trans_type, $payment_id, $bank_account, $ref,
-		$date_, -($amount), payment_person_types::supplier(),
-		$supplier_id, $bank_account_currency,
-		"Could not add the supplier payment bank transaction");
+	add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref,
+		$date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id);
+
+	add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_);
 
-	add_comments($trans_type, $payment_id, $date_, $memo_);
+	$Refs->save(ST_SUPPAYMENT, $payment_id, $ref);
 
-	references::save_last($ref, $trans_type);
+	$args->trans_no = $payment_id;
+	hook_db_postwrite($args, ST_SUPPAYMENT);
 
 	commit_transaction();
 
@@ -59,6 +87,7 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 function void_supp_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);