Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0

Dolibarr · Nov 12, 2024 · f4b2269 · f4b2269
2 parents 0eee1ad + 723c827
commit f4b2269
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
@@ -2216,7 +2216,11 @@
 										}
 									}
 
-									if (!$thumbshown) {
+									if (!$thumbshown && $fileinfo['extension'] == 'pdf' && !empty($filepdf) && !empty($relativepath) && !empty($fileinfo['filename'])) {
+										$formFile = new FormFile($db);
+										$imgpreview = $formFile->showPreview([], $modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0);
+										print $imgpreview;
+									} elseif (!$thumbshown) {
 										print img_mime($ecmfilesstatic->filename);
 									}
 								}

diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
@@ -780,7 +780,7 @@
 			$special_code = 3;
 		}
 
-		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+		$remise_percent = price2num(GETPOST('remise_percent'), '', 2) ?: 0;
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');