X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_credit.php;h=7c2442e5f3c024a57d22cdad4289f33e4f9dbcb2;hb=7284bb420bdad4306e195fa06ca971bd66333d20;hp=5c360eed4ec0e3f1d223f993f451ccf37935f491;hpb=805b766842402a275c6bd0526df5278af03138ed;p=fa-stable.git

diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index 5c360eed..7c2442e5 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Credit Note"), true, false, "", $js);
 
@@ -71,7 +71,7 @@ label_cells(_("Currency"), $myrow["curr_code"], "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
-label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
+label_cells(_("Shipping"), $myrow["shipping"], "class='tableheader2'");
 end_row();
 comments_display_row(ST_CUSTCREDIT, $trans_id);
 end_table();
@@ -134,12 +134,12 @@ $display_total = price_format($credit_total);
 if ($sub_total != 0)
 	label_row(_("Sub Total"), $display_sub_tot, "colspan=6 align=right",
 		"nowrap align=right width='15%'");
-
 if ($myrow["ov_freight"] != 0.0)
 {
 	$display_freight = price_format($myrow["ov_freight"]);
 	label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
 }
+
 $tax_items = get_trans_tax_details(ST_CUSTCREDIT, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);
 
@@ -157,4 +157,3 @@ if (!$voided)
 
 end_page(true, false, false, ST_CUSTCREDIT, $trans_id);
 
-?>
\ No newline at end of file