X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=273e7c421d4b0c477f653bc78f39a0b144aea029;hb=534d4b6a6b5e771f3b61e0fc65afd856760a6408;hp=a75e44efba87be64833c4e934250f110bf903828;hpb=43ad91751a494b2572eb64441248aa3a87f0141e;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index a75e44ef..273e7c42 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -111,6 +111,8 @@ function print_sales_quotations()
 			$rep->TextCol(0, 1,	$myrow2['stk_code'], -2);
 			$oldrow = $rep->row;
 			$rep->TextColLines(1, 2, $myrow2['description'], -2);
+			if (!empty($SysPrefs->prefs['long_description_invoice']) && !empty($myrow2['long_description']))
+				$rep->TextColLines(1, 2, $myrow2['long_description'], -2);
 			$newrow = $rep->row;
 			$rep->row = $oldrow;
 			if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
@@ -141,7 +143,7 @@ function print_sales_quotations()
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
-			$rep->TextColLines(1, 5, $myrow['comments'], -2);
+			$rep->TextColLines(1, 3, $myrow['comments'], -2);
 		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 
@@ -151,7 +153,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);
@@ -183,7 +185,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);