Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

[fa-stable.git] / gl / view / gl_deposit_view.php

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 949282b5699b717060da0ac729ffa613418de734..88b9a2f23e415e0ebb0d7e068be7ce46eb47ac4b 100644 (file)
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -68,7 +68,7 @@ label_cells(_("Amount"), number_format2($to_trans['amount'], user_price_dec()),
 label_cells(_("Date"), sql2date($to_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("From"), payment_person_name($to_trans['person_type_id'], $to_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("From"), get_counterparty_name(ST_BANKDEPOSIT, $trans_no), "class='tableheader2'", "colspan=$colspan1");
 label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -122,14 +122,14 @@ else
                 label_cell(get_dimension_string($item['dimension_id'], true));
             if ($dim > 1)
                 label_cell(get_dimension_string($item['dimension2_id'], true));
-            amount_cell($item["amount"]);
+            amount_cell(-$item["amount"]);
                label_cell($item["memo_"]);
                end_row();
                $total_amount += $item["amount"];
                }
        }
 
-       label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right");
+       label_row(_("Total"), number_format2(-$total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right");
 
        end_table(1);