Merged changes in main trunk up to 2.0.6 (see CHANGELOG)

[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 38b1d440f4c4dcf1279df993aa06a73ce243ee4b..5d9b382b1fc95469c9cd50add5c38feba7f2b684 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,46 +1,59 @@
 <?php
 
-function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
-       $amount, $discount, $ref, $memo_)
+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);
 
-       $supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_);
-       $supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_);
+       if ($rate == 0)
+       {
+               $supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_);
+               $supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_);
+       }
+       else
+       {
+               $supp_amount = round($amount / $rate, user_price_dec());
+               $supp_discount = round($discount / $rate, user_price_dec());
+       }
+       
 
        // it's a supplier payment
        $trans_type = 22;
 
        /* Create a supp_trans entry for the supplier payment */
        $payment_id = add_supp_trans($trans_type, $supplier_id, $date_, $date_,
-               $ref, "", -$supp_amount, 0, -$supp_discount);
+               $ref, "", -$supp_amount, 0, -$supp_discount, "", $rate);
 
        // 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,
-               $supp_amount + $supp_discount, $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)
        {
-               add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
-                       -$supp_discount, $supplier_id);
+               $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,
-                       -$supp_amount, $supplier_id);
+               $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_, $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");