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

[fa-stable.git] / includes / ui / ui_view.inc

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 40c4966a06a34d7a62237cbfb134f2668c8fa8b1..c12f3e10ec1041a9f1e4d8d224e4b5786adc9a3b 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -550,7 +550,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
     start_table(TABLESTYLE, "width='80%'");
 
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
-       _("Left to Allocate"), _("This Allocation"));
+       _("Left to Allocate"), _("Discount"), _("This Payment"), _("Allocated"));
        table_header($th);
     $k = $total_allocated = 0;
 
@@ -565,19 +565,21 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
        $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
        amount_cell(abs($alloc_row['Total']));
                amount_cell(abs($alloc_row['Total']) - $alloc_row['alloc']);
+       amount_cell($alloc_row['discount']);
+       amount_cell($alloc_row['amt']-$alloc_row['discount']);
        amount_cell($alloc_row['amt']);
        end_row();
 
        $total_allocated += $alloc_row['amt'];
     }
     start_row();
-       label_cell(_("Total Allocated:"), "align=right colspan=5");
+       label_cell(_("Total Allocated:"), "align=right colspan=7");
        amount_cell($total_allocated);
        end_row();
        if ($show_summary)
        {
                start_row();
-           label_cell(_("Left to Allocate:"), "align=right colspan=5");
+           label_cell(_("Left to Allocate:"), "align=right colspan=7");
            $total = round2($total, user_price_dec());
        amount_cell($total - $total_allocated);
        end_row();