Merge pull request #7053 from defrance/patch-15

FIX $forceimgscaleheight instead $forceimgscalewidth
Dolibarr · Jun 25, 2017 · 059e361 · 059e361
2 parents 78ebffe + 03cb850
commit 059e361
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -61,11 +61,11 @@ function addSticker(&$pdf,$outputlangs,$param) {
 	 */
 	function Add_PDF_label(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$photo='')
 	{
-		global $mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
+		global $mysoc, $conf, $langs;
+		global $forceimgscalewidth, $forceimgscaleheight;
 
 		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+		$imgscaleheight=(empty($forceimgscaleheight)?0.5:$forceimgscaleheight);	// Scale of image for height (1=Full height of sticker)
 
 		// We are in a new page, then we must add a page
 		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {