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

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

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index db9ab1031c86ca9a91826d99bb76ed20ca020687..2c53b622a5a6cfc0a18866d0dfeff999ec405c2b 100644 (file)
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -153,10 +153,12 @@ if (db_num_rows($result) > 0)
 else
        display_note(_("There are no line items on this invoice."), 1, 2);
 
-$display_freight = price_format($myrow["ov_freight"]);
-
 /*Print out the invoice text entered */
-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_SALESINVOICE, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);