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

[fa-stable.git] / reporting / rep111.php

diff --git a/reporting/rep111.php b/reporting/rep111.php
index ecf9fc19f10a62b02ca29e4c6ad238142794ff24..a75e44efba87be64833c4e934250f110bf903828 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -144,7 +144,6 @@ function print_sales_quotations()
                        $rep->TextColLines(1, 5, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
-               $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $doctype = ST_SALESQUOTE;
@@ -152,10 +151,13 @@ function print_sales_quotations()
                $rep->TextCol(3, 6, _("Sub-total"), -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                $rep->NewLine();
-               $rep->TextCol(3, 6, _("Shipping"), -2);
-               $rep->TextCol(6, 7,     $DisplayFreight, -2);
-               $rep->NewLine();
-
+               if ($myrow['ov_freight'] != 0.0)
+               {
+                       $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+                       $rep->TextCol(3, 6, _("Shipping"), -2);
+                       $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                       $rep->NewLine();
+               }       
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
                if ($myrow['tax_included'] == 0) {
                        $rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);