[Web-erp-svn] SF.net SVN: web-erp:[7881] trunk

[<tu...@us...>]

Revision: 7881
          http://sourceforge.net/p/web-erp/reponame/7881
Author:   turbopt
Date:     2017-12-13 20:17:22 +0000 (Wed, 13 Dec 2017)
Log Message:
-----------
PDFQALabel.php: Overlapping in the PDF when printing non-controlled items. (Reported in forums by Paul Becker)

Modified Paths:
--------------
    trunk/PDFQALabel.php
    trunk/doc/Change.log

Modified: trunk/PDFQALabel.php
===================================================================
--- trunk/PDFQALabel.php	2017-12-13 19:58:15 UTC (rev 7880)
+++ trunk/PDFQALabel.php	2017-12-13 20:17:22 UTC (rev 7881)
@@ -91,6 +91,9 @@
 
 		} //controlled item*/
 		else {
+			if ($PageNumber>1){
+				$pdf->newPage();
+			}
 			$pdf->addJpegFromFile($_SESSION['LogoFile'] ,$FormDesign->logo->x,$Page_Height-$FormDesign->logo->y,$FormDesign->logo->width,$FormDesign->logo->height);
 			$LeftOvers = $pdf->addText($FormDesign->ItemNbr->x,$Page_Height-$FormDesign->ItemNbr->y,$FormDesign->ItemNbr->FontSize,'Item: ' . $myrow['itemcode']);
 			$LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
@@ -99,9 +102,6 @@
 			//$LeftOvers = $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $myrow['serialno']);
 			$LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
 			$LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
-			if ($PageNumber>1){
-				$pdf->newPage();
-			}
 			$PageNumber++;
 		} //else not controlled
 	} //end of loop around GRNs to print

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-12-13 19:58:15 UTC (rev 7880)
+++ trunk/doc/Change.log	2017-12-13 20:17:22 UTC (rev 7881)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+11/13/17 PaulT: PDFQALabel.php: Overlapping in the PDF when printing non-controlled items. (Reported in forums by Paul Becker)
 11/13/17 PaulT: CustomerReceipt.php: Add identifier to URL for delete link. (Reported in forums by Paul Becker)
 11/13/17 PaulT: QATests.php: Correct wrong attribute name in two option tags. (Reported in forums by Paul Becker)
 11/12/17 PaulT: PHP 7 constructor compatibility change to phplot.php. (Reported in forums by rjonesbsink)