Fixes #749

Files changed in commit:
PDFAck.php
PDFQuotation.php

Author: timschofield

PDFAck.php

@@ -65,8 +65,7 @@
 				ON salesorders.fromstkloc=locations.loccode
 			INNER JOIN currencies
 				ON debtorsmaster.currcode=currencies.currabrev
-				AND salesorders.orderno='" . $_GET['AcknowledgementNo'] . "'";
-
+			WHERE salesorders.orderno='" . $_GET['AcknowledgementNo'] . "'";
 $Result = DB_query($SQL, $ErrMsg);
 
 if (DB_num_rows($Result) == 0) {

PDFQuotation.php

@@ -52,6 +52,7 @@
 				salesorders.deladd5,
 				salesorders.deladd6,
 				debtorsmaster.name,
+				debtorsmaster.debtorno,
 				debtorsmaster.currcode,
 				debtorsmaster.address1,
 				debtorsmaster.address2,
@@ -174,11 +175,13 @@
 	$SubTot =  $MyRow2['unitprice']*$MyRow2['quantity']*(1-$MyRow2['discountpercent']);
 	$TaxProv = $MyRow['taxprovinceid'];
 	$TaxCat = $MyRow2['taxcatid'];
+	$DebtorNo = $MyRow['debtorno'];
 	$Branch = $MyRow['branchcode'];
 	$SQL3 = "SELECT taxgrouptaxes.taxauthid
 				FROM taxgrouptaxes INNER JOIN custbranch
 				ON taxgrouptaxes.taxgroupid=custbranch.taxgroupid
-				WHERE custbranch.branchcode='" .$Branch ."'";
+				WHERE custbranch.debtorno='" . $DebtorNo . "'
+				AND custbranch.branchcode='" . $Branch . "'";
 	$Result3=DB_query($SQL3, $ErrMsg);
 	$TaxAuth = 0;
 	while ($MyRow3=DB_fetch_array($Result3)){
@@ -267,4 +270,4 @@
 $DomPDF->render();
 
 // Output the generated PDF to Browser
-$DomPDF->stream($PdfFileName, array("Attachment" => false));
+$DomPDF->stream($PdfFileName, array("Attachment" => false));