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

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index a125995dce7b5a04d4818f0eadbc441cdca21de0..1e9cc1487d4ad7afd419be68184aa649071a3d13 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -188,14 +188,12 @@ function print_invoices()
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
-                       $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
                        // set to start of summary line:
                $rep->row = $summary_start_row;
                        if (isset($prepayments))
                        {
                                // Partial invoices table
-                               //$rep->NewLine();
                                $rep->TextCol(0, 3,_("Prepayments invoiced to this order up to day:"));
                                $rep->TextCol(0, 3,     str_pad('', 150, '_'));
                                $rep->cols[2] -= 20;
@@ -234,9 +232,13 @@ function print_invoices()
                        $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($sign*$myrow["ov_freight"],$dec);
+                               $rep->TextCol(3, 6, _("Shipping"), -2);
+                               $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                               $rep->NewLine();
+                       }       
                        $tax_items = get_trans_tax_details(ST_SALESINVOICE, $row['trans_no']);
                        $first = true;
                while ($tax_item = db_fetch($tax_items))