Merged all main trunk bugfixes up to release 2.0.5

[fa-stable.git] / gl / includes / db / gl_db_trans.inc

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index d44e8eac04578de6928b2d56425ea5ec5f81a4bc..30750bbbd4fb4042b1cf0276b402fef7e19a2109 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -8,13 +8,18 @@
 // if $currency is not set, then defaults to no conversion
 
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
-       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="")
+       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="", $rate=0)
 {
        global $use_audit_trail;
 
        $date = date2sql($date_);
        if ($currency != null)
-               $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+       {
+               if ($rate == 0)
+                       $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+               else
+                       $amount_in_home_currency = round($amount * $rate,  user_price_dec());
+       }               
        else
                $amount_in_home_currency = $amount;
        if ($dimension == null || $dimension < 0)