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 trunk up to version_2_1_4
[fa-stable.git]
/
gl
/
includes
/
db
/
gl_db_banking.inc
diff --git
a/gl/includes/db/gl_db_banking.inc
b/gl/includes/db/gl_db_banking.inc
index bc4c0b5bd5fd6c794999441d18cb49a1f858e78a..e73e1e3ac877aab3f5fa7020f5c95cdba0f50893 100644
(file)
--- a/
gl/includes/db/gl_db_banking.inc
+++ b/
gl/includes/db/gl_db_banking.inc
@@
-1,24
+1,24
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU
Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
-
3
of the License, or (at your option) any later version.
+ Released under the terms of the GNU
General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/
a
gpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
***********************************************************************/
-function add_exchange_variation($trans_type, $trans_no, $date_, $account,
+function add_exchange_variation($trans_type, $trans_no, $date_, $acc
_id, $acc
ount,
$currency, $person_type_id=null, $person_id = "")
{
if (is_company_currency($currency))
return;
if ($date_ == null)
$date_ = Today();
$currency, $person_type_id=null, $person_id = "")
{
if (is_company_currency($currency))
return;
if ($date_ == null)
$date_ = Today();
- $rate = get_exchange_rate_from_home_currency($currency, $date_);
+ $rate = get_exchange_rate_from_home_currency($currency, $date_);
$result = db_query("SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE
$result = db_query("SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE
- bank_act='$acc
ount
' AND trans_date<='".date2sql($date_)."'",
+ bank_act='$acc
_id
' AND trans_date<='".date2sql($date_)."'",
"Transactions for account $account could not be calculated");
$row = db_fetch_row($result);
$foreign_amount = $row[0];
"Transactions for account $account could not be calculated");
$row = db_fetch_row($result);
$foreign_amount = $row[0];
@@
-45,7
+45,7
@@
function add_exchange_variation_all()
$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
$result = db_query($sql, "could not retreive bank accounts");
while ($myrow = db_fetch($result))
$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
$result = db_query($sql, "could not retreive bank accounts");
while ($myrow = db_fetch($result))
- add_exchange_variation(0, $trans_no, null, $myrow['account_code'],
+ add_exchange_variation(0, $trans_no, null, $myrow['
id'], $myrow['
account_code'],
$myrow['currency_code']);
}
//----------------------------------------------------------------------------------
$myrow['currency_code']);
}
//----------------------------------------------------------------------------------
@@
-56,7
+56,7
@@
function add_exchange_variation_all()
//
function add_bank_transfer($from_account, $to_account, $date_,
//
function add_bank_transfer($from_account, $to_account, $date_,
- $amount, $ref, $memo_)
+ $amount, $ref, $memo_
, $charge=0
)
{
begin_transaction();
{
begin_transaction();
@@
-72,16
+72,23
@@
function add_bank_transfer($from_account, $to_account, $date_,
$total = 0;
// do the source account postings
$total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "",
$total = 0;
// do the source account postings
$total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "",
- -
$amount
, $currency);
+ -
($amount + $charge)
, $currency);
add_bank_trans($trans_type, $trans_no, $from_account, $ref,
add_bank_trans($trans_type, $trans_no, $from_account, $ref,
- $date_, -
$amount
,
+ $date_, -
($amount + $charge)
,
payment_person_types::misc(), "", $currency,
"Cannot insert a source bank transaction");
payment_person_types::misc(), "", $currency,
"Cannot insert a source bank transaction");
- add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
+ add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
$from_gl_account,
$currency, payment_person_types::misc(), "");
$currency, payment_person_types::misc(), "");
+ if ($charge != 0)
+ {
+ /* Now Debit bank charge account with charges */
+ $charge_act = get_company_pref('bank_charge_act');
+ $total += add_gl_trans($trans_type, $trans_no, $date_,
+ $charge_act, 0, 0, "", $charge, $currency);
+ }
// do the destination account postings
$total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "",
$amount, $currency);
// do the destination account postings
$total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "",
$amount, $currency);
@@
-93,12
+100,13
@@
function add_bank_transfer($from_account, $to_account, $date_,
$date_, $amount, payment_person_types::misc(), "",
$currency, "Cannot insert a destination bank transaction");
$date_, $amount, payment_person_types::misc(), "",
$currency, "Cannot insert a destination bank transaction");
- add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
+ add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
$from_gl_account,
$currency, payment_person_types::misc(), "");
add_comments($trans_type, $trans_no, $date_, $memo_);
$currency, payment_person_types::misc(), "");
add_comments($trans_type, $trans_no, $date_, $memo_);
- references::save_last($ref, $trans_type);
+ references::save($trans_type, $trans_no, $ref);
+ add_audit_trail($trans_type, $trans_no, $date_);
commit_transaction();
commit_transaction();
@@
-190,12
+198,12
@@
function add_bank_transaction($trans_type, $from_account, $items, $date_,
if ($is_bank_to)
{
if ($is_bank_to)
{
- add_bank_trans($trans_type, $trans_no, $
gl_item->code_id
, $ref,
+ add_bank_trans($trans_type, $trans_no, $
is_bank_to
, $ref,
$date_, $gl_item->amount,
$person_type_id, $person_id, $currency,
"Cannot insert a destination bank transaction");
if ($do_exchange_variance)
$date_, $gl_item->amount,
$person_type_id, $person_id, $currency,
"Cannot insert a destination bank transaction");
if ($do_exchange_variance)
- add_exchange_variation($trans_type, $trans_no, $date_, $gl_item->code_id,
+ add_exchange_variation($trans_type, $trans_no, $date_, $
is_bank_to, $
gl_item->code_id,
$currency, $person_type_id, $person_id);
}
// store tax details if the gl account is a tax account
$currency, $person_type_id, $person_id);
}
// store tax details if the gl account is a tax account
@@
-203,7
+211,7
@@
function add_bank_transaction($trans_type, $from_account, $items, $date_,
$amount = $gl_item->amount;
$ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
$amount = $gl_item->amount;
$ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
- add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, $amount,
+ add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no,
-
$amount,
$ex_rate, $date_, $memo_);
}
$ex_rate, $date_, $memo_);
}
@@
-212,12
+220,13
@@
function add_bank_transaction($trans_type, $from_account, $items, $date_,
-$total, null, $person_type_id, $person_id);
if ($do_exchange_variance)
-$total, null, $person_type_id, $person_id);
if ($do_exchange_variance)
- add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
+ add_exchange_variation($trans_type, $trans_no, $date_, $from_account,
$bank_gl_account,
$currency, $person_type_id, $person_id);
add_comments($trans_type, $trans_no, $date_, $memo_);
$currency, $person_type_id, $person_id);
add_comments($trans_type, $trans_no, $date_, $memo_);
- references::save_last($ref, $trans_type);
+ references::save($trans_type, $trans_no, $ref);
+ add_audit_trail($trans_type, $trans_no, $date_);
commit_transaction();
commit_transaction();