From 9748e7965d509b96170b4dc044347a797b995956 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 24 Aug 2010 13:39:35 +0000
Subject: [PATCH] Removed old headerfunc in rep111.php (Sales Quotation)

---
 CHANGELOG.txt        |  4 ++++
 reporting/rep111.php | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9e948fce..ca9ea2dd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+24-Aug-2010 Joe Hunt
+# Removed old headerfunc in rep111.php (Sales Quotation)
+$ /reporting/rep111.php
+
 23-Aug-2010 Janusz Dobrowolski
 + Added german translation for install wizard (thanks to iscongroup) 
 $ /install/isession.inc
diff --git a/reporting/rep111.php b/reporting/rep111.php
index 69fac428..00e0dcb7 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -30,7 +30,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-	global $path_to_root, $print_as_quote;
+	global $path_to_root, $print_as_quote, $print_invoice_no;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -76,13 +76,16 @@ function print_sales_quotations()
 			$rep->SetHeaderType('Header2');
 			$rep->currency = $cur;
 			$rep->Font();
-			$rep->filename = "SalesQuotation" . $i . ".pdf";
+			if ($print_invoice_no == 1)
+				$rep->filename = "SalesQuotation" . $i . ".pdf";
+			else	
+				$rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
 			$rep->Info($params, $cols, null, $aligns);
 		}
 		$rep->title = _("SALES QUOTATION");
 		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
-		$rep->headerFunc = 'Header2';
+		//$rep->headerFunc = 'Header2';
 		$rep->NewPage();
 
 		$result = get_sales_order_details($i, ST_SALESQUOTE);
@@ -156,8 +159,9 @@ function print_sales_quotations()
 					$myrow['contact_email'] = $myrow['master_email'];
 				$myrow['DebtorName'] = $branch['br_name'];
 			}
-			//$myrow['reference'] = $i;
-			$rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
+			if ($print_invoice_no == 1)
+				$myrow['reference'] = $i;
+			$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
 		}
 	}
 	if ($email == 0)
-- 
2.30.2