[0000101] Roll back of yeasterday issues

[fa-stable.git] / purchasing / includes / db / supp_payment_db.inc

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index ea9430cac98a0cb17e282833186d82ce53f138bb..48e4c8cb774d4b978a9ec00a3b043bd1f18d263a 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -31,6 +31,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)
@@ -45,10 +47,6 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
                        -$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);