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

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

diff --git a/reporting/rep113.php b/reporting/rep113.php
index b1f931909a37759368c192a35bdfc3bd1db341ea..742738ab86a531159e3b6d3c6b192fdcdbcc05df 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -138,7 +138,6 @@ function print_credits()
                }
 
                $DisplaySubTot = number_format2($SubTotal,$dec);
-               $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $doctype = ST_CUSTCREDIT;
@@ -146,7 +145,14 @@ function print_credits()
                $rep->TextCol(3, 6, _("Sub-total"), -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                $rep->NewLine();
-               $rep->TextCol(3, 6, _("Shipping"), -2);
+               if ($myrow['ov_freight'] != 0.0)
+               {
+                       $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
+                       $rep->TextCol(3, 6, _("Shipping"), -2);
+                       $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                       $rep->NewLine();
+               }       
+               $rep->TextCol(3, 6, _("Shipping"), -2);
                $rep->TextCol(6, 7,     $DisplayFreight, -2);
                $rep->NewLine();
                $tax_items = get_trans_tax_details(ST_CUSTCREDIT, $i);