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

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

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 6014aeaf50b9a27eef7918a97731256b4b97f14f..5aa606d91f06744b0ca9fb450478f9a3c5c4fddf 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -242,8 +242,9 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
        end_row();
 }
 
-label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
-       "align=right colspan=6", "nowrap align=right", 1);
+if ($_SESSION['View']->freight_cost != 0.0)
+       label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
+               "align=right colspan=6", "nowrap align=right", 1);
 
 $sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;