Included dimension(s) in Bank Deposit/Payment View and correct signs.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7f3d3d8acdfecf94a84ba03aa4dcfbb17058ffa9..34cf6aaadfb6a547db02bc695bbc8a69231d9aab 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+04-Nov-2009 Tom Hallman/Joe Hunt
+! Included dimension(s) in Bank Deposit/Payment View and correct signs.
+$ /gl/view/gl_deposit_view.php
+  /gl/view/gl_payment_view.php
+  
 04-Nov-2009 Janusz Dobrowolski
 # Fixed bug introduced during security update and merged from main trunk.
 $ /admin/db/printers_db.inc

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 034d98ccd935037b8e7d25d847744f86ccb0f16f..4a7da98bd06708addf277ea0b40a5b224da00dd1 100644 (file)
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -94,8 +94,16 @@ else
                display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
 
     start_table("$table_style width=80%");
-    $th = array(_("Account Code"), _("Account Description"),
-       _("Amount"), _("Memo"));
+    $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,14 +118,18 @@ 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);
 

diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php
index 582f2930d21606c94f2d31f1989b9eb11cf32ad1..44dd2948a5d45ff78380775f26b9c1c5e2571ad1 100644 (file)
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -62,7 +62,7 @@ start_row();
 label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'");
 if ($show_currencies)
        label_cells(_("Currency"), $from_trans['bank_curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right");
+label_cells(_("Amount"), number_format2($from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right");
 label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
@@ -93,12 +93,20 @@ else
 
     echo "<br>";
     start_table("$table_style width=80%");
-    $th = array(_("Account Code"), _("Account Description"),
-       _("Amount"), _("Memo"));
+    $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
-       $totalAmount = 0;
+       $total_amount = 0;
 
     while ($item = db_fetch($items))
     {
@@ -109,14 +117,18 @@ else
 
                label_cell($item["account"]);
                label_cell($item["account_name"]);
+            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();
-               $totalAmount += $item["amount"];
+               $total_amount += $item["amount"];
                }
        }
 
-       label_row(_("Total"), number_format2($totalAmount, 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);