Fixed regressions in reports after last merge.

diff --git a/reporting/rep109.php b/reporting/rep109.php
index e5a92199682db4d12e371b83179d96fdc3ed03e0..8660e09a554a79765f290d47e771e92142f6dbb8 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -154,7 +154,7 @@ function print_sales_orders()
                $rep->TextCol(3, 6, _("Sub-total"), -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                $rep->NewLine();
-               if ($myrow['ov_freight'] != 0.0)
+               if ($myrow['freight_cost'] != 0.0)
                {
                        $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
                        $rep->TextCol(3, 6, _("Shipping"), -2);

diff --git a/reporting/rep111.php b/reporting/rep111.php
index a75e44efba87be64833c4e934250f110bf903828..241d7edd9883a62b925288ea8369d59002cf7027 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -151,7 +151,7 @@ function print_sales_quotations()
                $rep->TextCol(3, 6, _("Sub-total"), -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                $rep->NewLine();
-               if ($myrow['ov_freight'] != 0.0)
+               if ($myrow['freight_cost'] != 0.0)
                {
                        $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
                        $rep->TextCol(3, 6, _("Shipping"), -2);

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 742738ab86a531159e3b6d3c6b192fdcdbcc05df..468fdffb455622599d028e639d1ae41d089d4873 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -151,10 +151,7 @@ function print_credits()
                        $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);
                $first = true;
                while ($tax_item = db_fetch($tax_items))