X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_deposit_view.php;h=88d315aa1743038d198db0e4a11113e69c1e5533;hb=d859c6081f650d22eba97b13a298b681148d0d6d;hp=4a7da98bd06708addf277ea0b40a5b224da00dd1;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 4a7da98b..88d315aa 100644
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -38,7 +38,7 @@ $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;
 }
@@ -48,17 +48,17 @@ 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'");
@@ -69,6 +69,11 @@ 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");
+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();
@@ -91,9 +96,9 @@ else
 
 	display_heading2(_("Items for this Deposit"));
 	if ($show_currencies)
-		display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
+		display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
-    start_table("$table_style width=80%");
+    start_table(TABLESTYLE, "width=80%");
     $dim = get_company_pref('use_dimension');
     if ($dim == 2)
         $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2",
@@ -122,19 +127,19 @@ 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);
 
-	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);
+end_page(true, false, false, ST_BANKDEPOSIT, $trans_no);
 ?>
\ No newline at end of file