Password reset mail could take several hours. After fix only a couple of seconds...

[fa-stable.git] / sales / view / view_dispatch.php

diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index d089282b3a95d282272bd2f9d850fee599be11fa..8c1b031332ee13c4c50f6321c65019f8388f6071 100644 (file)
--- 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);
 
@@ -149,10 +149,11 @@ if (db_num_rows($result) > 0)
 }
 else
        display_note(_("There are no line items on this dispatch."), 1, 2);
-
-$display_freight = price_format($myrow["ov_freight"]);
-
-label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+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);
@@ -167,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