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

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index d15deb80..35e93db4 100644
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,5 +1,14 @@
 <?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>.
+***********************************************************************/
 function add_supp_payment($supplier_id, $date_, $bank_account,
 	$amount, $discount, $ref, $memo_, $rate=0)
 {
@@ -16,8 +25,8 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 	}
 	else
 	{
-		$supp_amount = $amount / $rate;
-		$supp_discount = $discount / $rate;
+		$supp_amount = round($amount / $rate, user_price_dec());
+		$supp_discount = round($discount / $rate, user_price_dec());
 	}
 	
 
@@ -30,24 +39,27 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 
 	// 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($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)
 	{
-		add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
+		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
 			-$supp_discount, $supplier_id, "", $rate);
 	}
 
 	if ($supp_amount != 0)
 	{
-		add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
+		$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
 			-$supp_amount, $supplier_id, "", $rate);
 	}
 
+	/*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_, -($amount), payment_person_types::supplier(),