From 6006026189083cacf850d552303d8458060b5c46 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 31 Dec 2015 00:42:31 +0100 Subject: [PATCH] Fixed regressions in reports after last merge. --- reporting/rep109.php | 2 +- reporting/rep111.php | 2 +- reporting/rep113.php | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/reporting/rep109.php b/reporting/rep109.php index e5a92199..8660e09a 100644 --- 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 a75e44ef..241d7edd 100644 --- 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 742738ab..468fdffb 100644 --- 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)) -- 2.30.2