projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing field for bank charges in bank_trans, rewritten bank transaction views...
[fa-stable.git]
/
gl
/
includes
/
db
/
gl_db_bank_accounts.inc
diff --git
a/gl/includes/db/gl_db_bank_accounts.inc
b/gl/includes/db/gl_db_bank_accounts.inc
index 01feb5d1f165f5230858df4ec889940ee72851ca..12238c4044472a40bb8aeda56394895143630d05 100644
(file)
--- a/
gl/includes/db/gl_db_bank_accounts.inc
+++ b/
gl/includes/db/gl_db_bank_accounts.inc
@@
-308,7
+308,7
@@
function get_ending_reconciled($bank_account, $bank_date)
function get_sql_for_bank_account_reconcile($bank_account, $date)
{
$sql = "SELECT bt.type, trans_no, ref, trans_date,
function get_sql_for_bank_account_reconcile($bank_account, $date)
{
$sql = "SELECT bt.type, trans_no, ref, trans_date,
- amount, person_id, person_type_id, reconciled, bt.id, c.memo_
+ amount,
charge,
person_id, person_type_id, reconciled, bt.id, c.memo_
FROM ".TB_PREF."bank_trans bt
LEFT JOIN ".TB_PREF."comments c ON c.type = bt.type AND c.id = bt.trans_no
WHERE bank_act = ".db_escape($bank_account) . "
FROM ".TB_PREF."bank_trans bt
LEFT JOIN ".TB_PREF."comments c ON c.type = bt.type AND c.id = bt.trans_no
WHERE bank_act = ".db_escape($bank_account) . "