X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_payment_view.php;h=25f9668bae12f804765dcc09a6afe8df569f6a06;hb=c82cbc67f22454e4afd30e53c40043b54a732be3;hp=44dd2948a5d45ff78380775f26b9c1c5e2571ad1;hpb=73899a6781658c9752e6b3a95a44045bac13c799;p=fa-stable.git

diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php
index 44dd2948..25f9668b 100644
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -38,7 +38,7 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($from_trans['bank_curr_code'] != $company_currency)
+if ($from_trans['bank_curr_code'] != $from_trans['settle_curr'])
 {
 	$show_currencies = true;
 }
@@ -46,27 +46,32 @@ if ($from_trans['bank_curr_code'] != $company_currency)
 display_heading(_("GL Payment") . " #$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(_("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();
-label_cells(_("Pay To"), payment_person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $from_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1");
+if ($show_currencies)
+{
+	label_cells(_("Settle currency"), $from_trans['settle_curr'], "class='tableheader2'");
+	label_cells(_("Settled amount"), number_format2($from_trans['settled_amount'], user_price_dec()), "class='tableheader2'");
+}
 label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -89,15 +94,15 @@ else
 
 	display_heading2(_("Items for this Payment"));
 	if ($show_currencies)
-		display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
+		display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
     echo "<br>";
-    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",
             _("Amount"), _("Memo"));
-    else if ($dim == 1)
+    elseif ($dim == 1)
         $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
             _("Amount"), _("Memo"));
     else
@@ -133,8 +138,7 @@ else
 	end_table(1);
 
 	if (!$voided)
-		display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, -$from_trans['amount']);
+		display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, $from_trans['settled_amount']);
 }
 
-end_page(true);
-?>
\ No newline at end of file
+end_page(true, false, false, ST_BANKPAYMENT, $trans_no);