X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=d7c3ccea27eb27ad65410df4492fc16d53d599a0;hb=f20f229779b9db77c3f978fac90dfcb571bd551c;hp=0df5603275455789c522ef23147122abf4200b61;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index 0df56032..d7c3ccea 100644
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,16 +1,16 @@
 <?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>.
 ***********************************************************************/
 function add_supp_payment($supplier_id, $date_, $bank_account,
-	$amount, $discount, $ref, $memo_, $rate=0)
+	$amount, $discount, $ref, $memo_, $rate=0, $charge=0)
 {
 	begin_transaction();
 
@@ -22,11 +22,13 @@ function add_supp_payment($supplier_id, $date_, $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_);
+		$supp_charge = exchange_from_to($charge, $bank_account_currency, $supplier_currency, $date_);
 	}
 	else
 	{
 		$supp_amount = round($amount / $rate, user_price_dec());
 		$supp_discount = round($discount / $rate, user_price_dec());
+		$supp_charge = round($charge / $rate, user_price_dec());
 	}
 	
 
@@ -51,10 +53,17 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 			-$supp_discount, $supplier_id, "", $rate);
 	}
 
+	if ($supp_charge != 0)
+	{
+		$charge_act = get_company_pref('bank_charge_act');
+		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $charge_act, 0, 0,
+			$supp_charge, $supplier_id, "", $rate);
+	}
+
 	if ($supp_amount != 0)
 	{
 		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
-			-$supp_amount, $supplier_id, "", $rate);
+			-($supp_amount + $supp_charge), $supplier_id, "", $rate);
 	}
 
 	/*Post a balance post if $total != 0 */
@@ -68,7 +77,7 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 
 	add_comments($trans_type, $payment_id, $date_, $memo_);
 
-	references::save_last($ref, $trans_type);
+	references::save($trans_type, $payment_id, $ref);
 
 	commit_transaction();