[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-cvs] dolibarr/htdocs comm/propalapercu.php commande/...
|
From: |
Regis Houssin |
|
Subject: |
[Dolibarr-cvs] dolibarr/htdocs comm/propalapercu.php commande/... |
|
Date: |
Fri, 09 Jun 2006 15:47:20 +0000 |
CVSROOT: /cvsroot/dolibarr
Module name: dolibarr
Changes by: Regis Houssin <hregis> 06/06/09 15:47:20
Modified files:
htdocs/comm/propal: apercu.php
htdocs/commande: apercu.php
htdocs/compta/facture: apercu.php
Log message:
Affichage de tous les aperçus
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/comm/propal/apercu.php?cvsroot=dolibarr&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/commande/apercu.php?cvsroot=dolibarr&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/compta/facture/apercu.php?cvsroot=dolibarr&r1=1.37&r2=1.38
Patches:
Index: comm/propal/apercu.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/comm/propal/apercu.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- comm/propal/apercu.php 3 Jun 2006 22:01:38 -0000 1.12
+++ comm/propal/apercu.php 9 Jun 2006 15:47:20 -0000 1.13
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: apercu.php,v 1.12 2006/06/03 22:01:38 eldy Exp $
+ * $Id: apercu.php,v 1.13 2006/06/09 15:47:20 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/comm/propal/apercu.php,v $
*/
@@ -26,7 +26,7 @@
\file htdocs/comm/propal/apercu.php
\ingroup propal
\brief Page de l'onglet aperçu d'une propal
- \version $Revision: 1.12 $
+ \version $Revision: 1.13 $
*/
require("./pre.inc.php");
@@ -163,15 +163,15 @@
* Documents
*/
$propalref = sanitize_string($propal->ref);
- $file = $conf->propal->dir_output . "/" .
$propalref . "/" . $propalref . ".pdf";
- $filedetail = $conf->propal->dir_output . "/" .
$propalref . "/" . $propalref . "-detail.pdf";
+ $dir_output = $conf->propal->dir_output . "/";
+ $filepath = $dir_output . $propalref . "/";
+ $file = $filepath . $propalref . ".pdf";
+ $filedetail = $filepath . $propalref .
"-detail.pdf";
$relativepath = "${propalref}/${propalref}.pdf";
$relativepathdetail =
"${propalref}/${propalref}-detail.pdf";
// Chemin vers png aperçus
$relativepathimage =
"${propalref}/${propalref}.pdf.png";
- $relativepathimagebis =
"${propalref}/${propalref}.pdf.png.0";
- $relativepathimagebis2 =
"${propalref}/${propalref}.pdf.png.1";
$fileimage = $file.".png"; // Si PDF
d'1 page
$fileimagebis = $file.".png.0"; // Si PDF
de plus d'1 page
@@ -262,8 +262,16 @@
// Si fichier png PDF de plus d'1 page trouvé
elseif (file_exists($fileimagebis))
{
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercupropal&file='.urlencode($relativepathimagebis).'"><p>';
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercupropal&file='.urlencode($relativepathimagebis2).'"></p>';
+ $multiple = $relativepathimage . ".";
+
+ for ($i = 0; $i < 20; $i++)
+ {
+ $preview = $multiple.$i;
+
+ if (file_exists($dir_output.$preview))
+ {
+ print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercupropal&file='.urlencode($preview).'"><p>';
+ }
}
@@ -277,5 +285,5 @@
$db->close();
-llxFooter('$Date: 2006/06/03 22:01:38 $ - $Revision: 1.12 $');
+llxFooter('$Date: 2006/06/09 15:47:20 $ - $Revision: 1.13 $');
?>
Index: commande/apercu.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/commande/apercu.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- commande/apercu.php 17 May 2006 09:41:06 -0000 1.22
+++ commande/apercu.php 9 Jun 2006 15:47:20 -0000 1.23
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: apercu.php,v 1.22 2006/05/17 09:41:06 hregis Exp $
+ * $Id: apercu.php,v 1.23 2006/06/09 15:47:20 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/commande/apercu.php,v $
*/
@@ -26,7 +26,7 @@
\file htdocs/commande/apercu.php
\ingroup commande
\brief Page de l'onglet aperçu d'une commande
- \version $Revision: 1.22 $
+ \version $Revision: 1.23 $
*/
require("./pre.inc.php");
@@ -141,15 +141,15 @@
* Documents
*/
$commanderef = sanitize_string($commande->ref);
- $file = $conf->commande->dir_output . "/" .
$commanderef . "/" . $commanderef . ".pdf";
- $filedetail = $conf->commande->dir_output . "/"
. $commanderef . "/" . $commanderef . "-detail.pdf";
+ $dir_output = $conf->commande->dir_output . "/";
+ $filepath = $dir_output . $commanderef . "/";
+ $file = $filepath . $commanderef . ".pdf";
+ $filedetail = $filepath . $commanderef .
"-detail.pdf";
$relativepath =
"${commanderef}/${commanderef}.pdf";
$relativepathdetail =
"${commanderef}/${commanderef}-detail.pdf";
// Chemin vers png aperçus
$relativepathimage =
"${commanderef}/${commanderef}.pdf.png";
- $relativepathimagebis =
"${commanderef}/${commanderef}.pdf.png.0";
- $relativepathimagebis2 =
"${commanderef}/${commanderef}.pdf.png.1";
$fileimage = $file.".png"; // Si PDF
d'1 page
$fileimagebis = $file.".png.0"; // Si PDF
de plus d'1 page
@@ -258,8 +258,17 @@
// Si fichier png PDF de plus d'1 page trouvé
elseif (file_exists($fileimagebis))
{
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercucommande&file='.urlencode($relativepathimagebis).'"><p>';
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercucommande&file='.urlencode($relativepathimagebis2).'"></p>';
+ $multiple = $relativepathimage . ".";
+
+ for ($i = 0; $i < 20; $i++)
+ {
+ $preview = $multiple.$i;
+
+ if (file_exists($dir_output.$preview))
+ {
+ print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercucommande&file='.urlencode($preview).'"><p>';
+ }
+ }
}
@@ -273,5 +282,5 @@
$db->close();
-llxFooter('$Date: 2006/05/17 09:41:06 $ - $Revision: 1.22 $');
+llxFooter('$Date: 2006/06/09 15:47:20 $ - $Revision: 1.23 $');
?>
Index: compta/facture/apercu.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture/apercu.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- compta/facture/apercu.php 3 Jun 2006 16:04:32 -0000 1.37
+++ compta/facture/apercu.php 9 Jun 2006 15:47:20 -0000 1.38
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: apercu.php,v 1.37 2006/06/03 16:04:32 eldy Exp $
+ * $Id: apercu.php,v 1.38 2006/06/09 15:47:20 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture/apercu.php,v $
*/
@@ -25,7 +25,7 @@
\file htdocs/compta/facture/apercu.php
\ingroup facture
\brief Page de l'onglet aperçu d'une facture
- \version $Revision: 1.37 $
+ \version $Revision: 1.38 $
*/
require("./pre.inc.php");
@@ -130,16 +130,15 @@
* Documents
*/
$facref = sanitize_string($fac->ref);
- $file = $conf->facture->dir_output . "/" . $facref . "/" . $facref .
".pdf";
- $filedetail = $conf->facture->dir_output . "/" . $facref . "/" .
$facref . "-detail.pdf";
+ $dir_output = $conf->facture->dir_output . "/";
+ $filepath = $dir_output . $facref . "/";
+ $file = $filepath . $facref . ".pdf";
+ $filedetail = $filepath . $facref . "-detail.pdf";
$relativepath = "${facref}/${facref}.pdf";
$relativepathdetail = "${facref}/${facref}-detail.pdf";
// Chemin vers png aperçus
$relativepathimage = "${facref}/${facref}.pdf.png";
- $relativepathimagebis = "${facref}/${facref}.pdf.png.0";
- $relativepathimagebis2 = "${facref}/${facref}.pdf.png.1";
-
$fileimage = $file.".png"; // Si PDF d'1 page
$fileimagebis = $file.".png.0"; // Si PDF de plus d'1 page
@@ -258,8 +257,16 @@
// Si fichier png PDF de plus d'1 page trouvé
elseif (file_exists($fileimagebis))
{
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimagebis).'"><p>';
- print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimagebis2).'"></p>';
+ $multiple = $relativepathimage . ".";
+
+ for ($i = 0; $i < 20; $i++)
+ {
+ $preview = $multiple.$i;
+
+ if (file_exists($dir_output.$preview))
+ {
+ print '<img src="'.DOL_URL_ROOT .
'/viewimage.php?modulepart=apercufacture&file='.urlencode($preview).'"><p>';
+ }
}
@@ -273,5 +280,5 @@
$db->close();
-llxFooter('$Date: 2006/06/03 16:04:32 $ - $Revision: 1.37 $');
+llxFooter('$Date: 2006/06/09 15:47:20 $ - $Revision: 1.38 $');
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-cvs] dolibarr/htdocs comm/propalapercu.php commande/...,
Regis Houssin <=