X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_deposit_view.php;h=26da4d4fd9c496847cfb4c1be350028c80dd3bfe;hb=67abd2b071302a327df63fb949963f0b45d62196;hp=034d98ccd935037b8e7d25d847744f86ccb0f16f;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 034d98cc..26da4d4f 100644
--- 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,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