Fixed problems with excel report generation.

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 6e0307ea80e9df2b482e4df80715df2bc9f4daf1..58b1509fd7eaa54065c88147318892b6770649ed 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -75,7 +75,7 @@ function print_invoices()
                        $sign = 1;
                        $myrow = get_customer_trans($i, ST_SALESINVOICE);
 
-                       if($customer != ALL_TEXT && $myrow['debtor_no'] != $customer) {
+                       if ($customer && $myrow['debtor_no'] != $customer) {
                                continue;
                        }
                        if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
@@ -145,7 +145,6 @@ function print_invoices()
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
-                       $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $doctype = ST_SALESINVOICE;
@@ -153,9 +152,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, $i);
                        $first = true;
                while ($tax_item = db_fetch($tax_items))