Merged changes from stable branch up to 2.3.12

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9eaa6135ddbbd77efb66008e826ade3701470377..adf663288317479f0cee4a0238776d6114a370f5 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -499,9 +499,10 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
        label_cell(sql2date($alloc_row['tran_date']));
        $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
        $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
+       if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+               $alloc_row['Total'] = -$alloc_row['Total'];
        amount_cell($alloc_row['Total']);
-       //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']);
-       amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+               amount_cell($alloc_row['Total'] - $alloc_row['amt']);
        amount_cell($alloc_row['amt']);
        end_row();