X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=1db74b7c8869b2f9b92fdf05de06a89376284179;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=45c5ab999e4be66466387c6dc2a6c6786ade4d60;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git diff --git a/reporting/rep111.php b/reporting/rep111.php index 45c5ab99..1db74b7c 100644 --- a/reporting/rep111.php +++ b/reporting/rep111.php @@ -128,7 +128,6 @@ function print_sales_quotations() $image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg"; if (file_exists($image)) { - //$rep->NewLine(); if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin) $rep->NewPage(); $rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height); @@ -136,17 +135,15 @@ function print_sales_quotations() $rep->NewLine(); } } - //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) $rep->NewPage(); } 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_SALESQUOTE; @@ -154,10 +151,13 @@ function print_sales_quotations() $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); @@ -183,7 +183,7 @@ function print_sales_quotations() 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);