projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main CVS up to 2.1.5
[fa-stable.git]
/
gl
/
includes
/
db
/
gl_db_bank_trans.inc
diff --git
a/gl/includes/db/gl_db_bank_trans.inc
b/gl/includes/db/gl_db_bank_trans.inc
index de2ce4862920f121b5d256b89b5c79c63855f6d9..c9f550c82419aff60614b087b662a0f417447075 100644
(file)
--- a/
gl/includes/db/gl_db_bank_trans.inc
+++ b/
gl/includes/db/gl_db_bank_trans.inc
@@
-16,7
+16,7
@@
// $date_ is display date (non-sql)
function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
// $date_ is display date (non-sql)
function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
- $amount, $person_type_id, $person_id, $currency="", $err_msg="")
+ $amount, $person_type_id, $person_id, $currency="", $err_msg=""
, $rate=0
)
{
$sqlDate = date2sql($date_);
{
$sqlDate = date2sql($date_);
@@
-24,7
+24,10
@@
function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
if ($currency != "")
{
$bank_account_currency = get_bank_account_currency($bank_act);
if ($currency != "")
{
$bank_account_currency = get_bank_account_currency($bank_act);
- $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+ if ($rate == 0)
+ $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+ else
+ $to_bank_currency = 1 / $rate;
$amount_bank = ($amount / $to_bank_currency);
}
else
$amount_bank = ($amount / $to_bank_currency);
}
else