Merged changes from mai trunk up to 2.3.1

[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 034d98ccd935037b8e7d25d847744f86ccb0f16f..949282b5699b717060da0ac729ffa613418de734 100644 (file)
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -48,7 +48,7 @@ echo "<center>";
 display_heading(_("GL Deposit") . " #$trans_no");
 
 echo "<br>";
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 
 if ($show_currencies)
 {
@@ -93,9 +93,17 @@ else
        if ($show_currencies)
                display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
 
-    start_table("$table_style width=80%");
-    $th = array(_("Account Code"), _("Account Description"),
-       _("Amount"), _("Memo"));
+    start_table(TABLESTYLE, "width=80%");
+    $dim = get_company_pref('use_dimension');
+    if ($dim == 2)
+        $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2",
+            _("Amount"), _("Memo"));
+    else if ($dim == 1)
+        $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
+            _("Amount"), _("Memo"));
+    else
+        $th = array(_("Account Code"), _("Account Description"),
+            _("Amount"), _("Memo"));
     table_header($th);
 
     $k = 0; //row colour counter
@@ -110,19 +118,23 @@ else
 
                label_cell($item["account"]);
                label_cell($item["account_name"]);
-            amount_cell(abs($item["amount"]));
+            if ($dim >= 1)
+                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"]);
                label_cell($item["memo_"]);
                end_row();
-               $total_amount += abs($item["amount"]);
+               $total_amount += $item["amount"];
                }
        }
 
-       label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=2 align=right", "align=right");
+       label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right");
 
        end_table(1);
 
        display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['amount']);
 }
 
-end_page(true);
+end_page(true, false, false, ST_BANKDEPOSIT, $trans_no);
 ?>
\ No newline at end of file