From 90eac5027753e503680c1c29d78eadfd94a73875 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 4 Mar 2011 18:37:24 +0000
Subject: [PATCH] Fix: view multi page

---
 htdocs/comm/propal/apercu.php | 7 +++----
 htdocs/lib/files.lib.php      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index b71c3a908ad..d8259edcaea 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -128,9 +128,8 @@ if ($id > 0 || ! empty($ref))
 		$relativepathdetail = "${objectref}/${objectref}-detail.pdf";
 		
 		// Chemin vers png apercus
-		$relativepathimage = "${objectref}/${objectref}.pdf.png";
 		$fileimage = $file.".png";          // Si PDF d'1 page
-		$fileimagebis = $file.".png.0";     // Si PDF de plus d'1 page
+		$fileimagebis = $file."-0.png";     // Si PDF de plus d'1 page
 		
 		$var=true;
 		
@@ -201,11 +200,11 @@ if (file_exists($fileimage))
 // Si fichier png PDF de plus d'1 page trouve
 elseif (file_exists($fileimagebis))
 {
-	$multiple = $relativepathimage . ".";
+	$multiple = $relativepath . "-";
 
 	for ($i = 0; $i < 20; $i++)
 	{
-		$preview = $multiple.$i;
+		$preview = $multiple.$i.'.png';
 
 		if (file_exists($dir_output.$preview))
 		{
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 3afb3bec0f6..d6a47bc4448 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -661,7 +661,7 @@ function dol_convert_file($file,$ext='png')
 		$ret = $image->setImageFormat($ext);
 		if ($ret)
 		{
-			$ret = $image->writeImage( $file . "." . $ext );
+			$ret = $image->writeImages( $file . "." . $ext, true );
 			if (! $ret) return -3;
 		}
 		else