Moving bugfixes from 2.3 to 2.4 and updated install languages for Denmark and Sweden.

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

diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 300c67f4d39140026a3b21fa49345281eae450aa..8c1b031332ee13c4c50f6321c65019f8388f6071 100644 (file)
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -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);