X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=1db74b7c8869b2f9b92fdf05de06a89376284179;hb=f31eca3e9d68d964324ebb7da93eccb38dff6484;hp=02c398153d77e29f1af1424a66956a69d9dbc233;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 02c39815..1db74b7c 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -31,7 +31,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-	global $path_to_root, $print_as_quote, $SysPrefs, $pic_height;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -48,8 +48,8 @@ function print_sales_quotations()
 	$dec = user_price_dec();
 
 	$pictures = $SysPrefs->print_item_images_on_quote();
-	// If you want a larger image, then increase $pic_height f.i.
-	// $pic_height += 25;
+	// If you want a larger image, then increase pic_height f.i.
+	// $SysPrefs->pic_height += 25;
 	
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -68,6 +68,9 @@ function print_sales_quotations()
 	for ($i = $from; $i <= $to; $i++)
 	{
 		$myrow = get_sales_order_header($i, ST_SALESQUOTE);
+		if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+			continue;
+		}
 		$baccount = get_default_bank_account($myrow['curr_code']);
 		$params['bankaccount'] = $baccount['id'];
 		$branch = get_branch($myrow["branch_code"]);
@@ -79,14 +82,13 @@ function print_sales_quotations()
 			else	
 				$rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
 		}
-		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
 
 		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
-		//$rep->headerFunc = 'Header2';
+		$rep->SetHeaderType('Header2');
 		$rep->NewPage();
 
 		$result = get_sales_order_details($i, ST_SALESQUOTE);
@@ -126,25 +128,22 @@ function print_sales_quotations()
 				$image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
 				if (file_exists($image))
 				{
-					//$rep->NewLine();
-					if ($rep->row - $pic_height < $rep->bottomMargin)
+					if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 						$rep->NewPage();
-					$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-					$rep->row -= $pic_height;
+					$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+					$rep->row -= $SysPrefs->pic_height;
 					$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;
@@ -152,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);
@@ -181,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);
@@ -224,4 +226,3 @@ function print_sales_quotations()
 		$rep->End();
 }
 
-?>
\ No newline at end of file