[0000095] Inbalance double entry on Documents

[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 5e5b400d952746786509494d52649ab3546fbe4b..ce85db523f6c3cdd9187d188e385e223ef6d05f5 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -15,8 +15,8 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $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());
        }
        
 
@@ -31,22 +31,22 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
 
     $supplier_accounts = get_supplier_accounts($supplier_id);
 
-       add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
-               $supp_amount + $supp_discount, $supplier_id, "", $rate);
-
+       $total = 0;
        // 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_account, 0, 0,
+               $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_account, 0, 0,
                        -$supp_amount, $supplier_id, "", $rate);
        }
 
+       add_gl_trans($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, "",
+               -$total, null, 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(),