Added missing field for bank charges in bank_trans, rewritten bank transaction views...

[fa-stable.git] / gl / bank_account_reconcile.php

diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php
index 81ebc7a0ee06f3b34c552749815ae92d3f7a7098..ae28a325f4bbe275c91f1cad427c998cd480ec75 100644 (file)
--- a/gl/bank_account_reconcile.php
+++ b/gl/bank_account_reconcile.php
@@ -52,8 +52,8 @@ function rec_checkbox($row)
        $value = $row['reconciled'] != '';
 
 // save also in hidden field for testing during 'Reconcile'
-       return checkbox(null, $name, $value, true, _('Reconcile this transaction'))
-               . hidden($hidden, $value, false);
+       return is_closed_trans($row['type'], $row['trans_no']) ? "--" : checkbox(null, $name, $value, true, _('Reconcile this transaction'))
+               . hidden($hidden, $value, false);
 }
 
 function systype_name($dummy, $type)
@@ -85,6 +85,12 @@ function fmt_credit($row)
        return $value>0 ? price_format($value) : '';
 }
 
+function bank_fee($row)
+{
+       $value = -$row["charge"];
+       return $value > 0 ? price_format($value) : '';
+}
+
 function fmt_person($trans)
 {
        return get_counterparty_name($trans["type"], $trans["trans_no"]);
@@ -269,6 +275,7 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
                _("Date") => 'date',
                _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
                _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), 
+               _("Bank fees") => array('align'=>'right','insert'=>true, 'fun'=>'bank_fee'),
            _("Person/Item") => array('fun'=>'fmt_person'), 
                _("Memo") => array('fun'=>'fmt_memo'),
                array('insert'=>true, 'fun'=>'gl_view'),