X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=35e93db48334a2d3181b052ee88708a1a807fdd5;hb=f338f2d7ea4c0de20a53b83be6442d792735e5e1;hp=ea9430cac98a0cb17e282833186d82ce53f138bb;hpb=ba13d6373cb634abf30fb7e691b17485f3dd2917;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index ea9430ca..35e93db4 100644
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,12 +1,22 @@
 <?php
-
-function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
+/**********************************************************************
+    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 add_supp_payment($supplier_id, $date_, $bank_account,
 	$amount, $discount, $ref, $memo_, $rate=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);
 
 	if ($rate == 0)
 	{
@@ -31,6 +41,8 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
 
 	$total = 0;
     $supplier_accounts = get_supplier_accounts($supplier_id);
+	$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
+		$supp_amount + $supp_discount, $supplier_id, "", $rate);
 
 	// Now credit discount received account with discounts
 	if ($supp_discount != 0)
@@ -41,20 +53,16 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
 
 	if ($supp_amount != 0)
 	{
-		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_account, 0, 0,
+		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
 			-$supp_amount, $supplier_id, "", $rate);
 	}
 
-	$total += add_gl_trans($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, "", 
-		-$total, null, payment_person_types::supplier(), $supplier_id, 
-		"The general ledger transaction for the control total could not be added");
-
 	/*Post a balance post if $total != 0 */
 	add_gl_balance($trans_type, $payment_id, $date_, -$total, payment_person_types::supplier(), $supplier_id);	
 
    /*now enter the bank_trans entry */
 	add_bank_trans($trans_type, $payment_id, $bank_account, $ref,
-		$date_, $payment_type, -($amount), payment_person_types::supplier(),
+		$date_, -($amount), payment_person_types::supplier(),
 		$supplier_id, $bank_account_currency,
 		"Could not add the supplier payment bank transaction");