X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=ba6c86ce17d7fdee6c2996d43b0f6b3a121ddb31;hb=c82cbc67f22454e4afd30e53c40043b54a732be3;hp=53df06f61a8b42d9a89a16c016124bd3bdaec212;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git diff --git a/reporting/rep109.php b/reporting/rep109.php index 53df06f6..ba6c86ce 100644 --- a/reporting/rep109.php +++ b/reporting/rep109.php @@ -144,10 +144,9 @@ function print_sales_orders() if ($myrow['comments'] != "") { $rep->NewLine(); - $rep->TextColLines(1, 5, $myrow['comments'], -2); + $rep->TextColLines(1, 3, $myrow['comments'], -2); } $DisplaySubTot = number_format2($SubTotal,$dec); - $DisplayFreight = number_format2($myrow["freight_cost"],$dec); $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $doctype = ST_SALESORDER; @@ -155,10 +154,13 @@ function print_sales_orders() $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['freight_cost'] != 0.0) + { + $DisplayFreight = number_format2($myrow["freight_cost"],$dec); + $rep->TextCol(3, 6, _("Shipping"), -2); + $rep->TextCol(6, 7, $DisplayFreight, -2); + $rep->NewLine(); + } $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec); if ($myrow['tax_included'] == 0) { $rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2); @@ -184,7 +186,7 @@ function print_sales_orders() if ($first) { $rep->TextCol(3, 6, _("Total Tax Excluded"), -2); - $rep->TextCol(6, 7, number_format2($sign*$tax_item['net_amount'], $dec), -2); + $rep->TextCol(6, 7, number_format2($tax_item['net_amount'], $dec), -2); $rep->NewLine(); } $rep->TextCol(3, 6, $tax_type_name, -2);