X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_deposit_view.php;h=007026ff6005f1ba13aa84d409a4310757147e20;hb=523b8c69689f9ceb978b422b3e65a7eb9c089b6f;hp=02a3f7e00b733beb2d30608dd2b07f81211bd105;hpb=7c93a1da25dfede4c7eb13ea1709be9c041f5ae0;p=fa-stable.git

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 02a3f7e0..007026ff 100644
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -1,11 +1,20 @@
 <?php
-
-$page_security = 1;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_BANKTRANSVIEW';
+$path_to_root = "../..";
 
 include($path_to_root . "/includes/session.inc");
 
-page(_("View Bank Deposit"), true);
+page(_($help_context = "View Bank Deposit"), true);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -18,7 +27,7 @@ if (isset($_GET["trans_no"]))
 }
 
 // get the pay-to bank payment info
-$result = get_bank_trans(systypes::bank_deposit(), $trans_no);
+$result = get_bank_trans(ST_BANKDEPOSIT, $trans_no);
 
 if (db_num_rows($result) != 1)
 	display_db_error("duplicate payment bank transaction found", "");
@@ -29,27 +38,30 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($to_trans['bank_curr_code'] != $company_currency)
+if ($to_trans['bank_curr_code'] != $to_trans['settle_curr'])
 {
 	$show_currencies = true;
 }
 
+if (!empty($SysPrefs->prefs['company_logo_on_views']))
+	company_logo_on_view();
+
 echo "<center>";
 
 display_heading(_("GL Deposit") . " #$trans_no");
 
 echo "<br>";
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width='80%'");
 
 if ($show_currencies)
 {
-	$colspan1 = 5;
-	$colspan2 = 8;
+	$colspan1 = 1;
+	$colspan2 = 7;
 }
 else
 {
 	$colspan1 = 3;
-	$colspan2 = 6;
+	$colspan2 = 5;
 }
 start_row();
 label_cells(_("To Bank Account"), $to_trans['bank_account_name'], "class='tableheader2'");
@@ -59,19 +71,24 @@ 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_types::person_name($to_trans['person_type_id'], $to_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
-label_cells(_("Deposit Type"), $to_trans['BankTransType'], "class='tableheader2'");
+label_cells(_("From"), get_counterparty_name(ST_BANKDEPOSIT, $to_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1");
+if ($show_currencies)
+{
+	label_cells(_("Settle currency"), $to_trans['settle_curr'], "class='tableheader2'");
+	label_cells(_("Settled amount"),  number_format2($to_trans['settled_amount'], user_price_dec()), "class='tableheader2'");
+}
+label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Reference"), $to_trans['ref'], "class='tableheader2'", "colspan=$colspan2");
 end_row();
-comments_display_row(systypes::bank_deposit(), $trans_no);
+comments_display_row(ST_BANKDEPOSIT, $trans_no);
 
 end_table(1);
 
-is_voided_display(systypes::bank_deposit(), $trans_no, _("This deposit has been voided."));
+is_voided_display(ST_BANKDEPOSIT, $trans_no, _("This deposit has been voided."));
 
-$items = get_gl_trans(systypes::bank_deposit(), $trans_no);
+$items = get_gl_trans(ST_BANKDEPOSIT, $trans_no);
 
 if (db_num_rows($items) == 0)
 {
@@ -82,11 +99,19 @@ else
 
 	display_heading2(_("Items for this Deposit"));
 	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"));
+		display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
+
+    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"));
+    elseif ($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
@@ -101,19 +126,22 @@ 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']);
+	display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['settled_amount']);
 }
 
-end_page(true);
-?>
\ No newline at end of file
+end_page(true, false, false, ST_BANKDEPOSIT, $trans_no);