X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_dispatch.php;h=69f1534e01067a2c9cf2d3c8b6f136bc92187fd2;hb=8eb8e44cb90ab144f0849d1ecd2153175b619786;hp=260212853ebb3e0d84aee3d4fd4ad9d9a12205e6;hpb=805b766842402a275c6bd0526df5278af03138ed;p=fa-stable.git

diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 26021285..69f1534e 100644
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_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, 600);
 page(_($help_context = "View Sales Dispatch"), true, false, "", $js);
 
@@ -89,7 +89,7 @@ label_cells(_("Our Order No"),
 end_row();
 start_row();
 label_cells(_("Customer Order Ref."), $sales_order["customer_ref"], "class='tableheader2'");
-label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
+label_cells(_("Shipping"), $myrow["shipping"], "class='tableheader2'");
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
 end_row();
 start_row();
@@ -149,12 +149,12 @@ if (db_num_rows($result) > 0)
 }
 else
 	display_note(_("There are no line items on this dispatch."), 1, 2);
-
 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_CUSTDELIVERY, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);
 
@@ -168,4 +168,3 @@ is_voided_display(ST_CUSTDELIVERY, $trans_id, _("This dispatch has been voided."
 
 end_page(true, false, false, ST_CUSTDELIVERY, $trans_id);
 
-?>
\ No newline at end of file