From c2d4ee82723ab65868e5ad9d70c3fb6953e7b282 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Tue, 11 Jan 2005 11:15:12 +0000
Subject: [PATCH] =?UTF-8?q?Modif=20gestion=20des=20factures=20d=E9taill=E9?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index fa53df14ab8..5e21cb43da2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1212,18 +1212,22 @@ else
 	  /*
 	   * Documents générés
 	   *
+	   * Le fichier de facture détaillée est de la forme
+	   * 
+	   * REFFACTURE-XXXXXX-detail.pdf ou XXXXX est une forme diverse
+	   *
 	   */
 
 	  $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","=");
 	  $facref = str_replace($forbidden_chars,"_",$fac->ref);
 	  $file = $conf->facture->dir_output . "/" . $facref . "/" . $facref . ".pdf";
-      $filedetail = $conf->facture->dir_output . "/" . $facref . "/" . $facref . "-detail.pdf";
-      $relativepath = "${facref}/${facref}.pdf";
-      $relativepathdetail = "${facref}/${facref}-detail.pdf";
 
-      $var=true;
-             
-	  print "<table width=\"100%\"><tr><td width=\"50%\" valign=\"top\">";
+	  $relativepath = "${facref}/${facref}.pdf";
+	  $relativepathdetail = "${facref}/${facref}-detail.pdf";
+	  
+	  $var=true;
+      
+	  print '<table width="100%"><tr><td width="50%" valign="top">';
 
 	  if (file_exists($file))
 	    {
@@ -1247,9 +1251,9 @@ else
 		    {
 		      print "<tr $bc[$var]><td>Facture détaillée</td>";
 		      
-		      print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepathdetail).'">'.$fac->ref.'-detail.pdf</a></td>';		  
-		      print '<td align="right">'.filesize($filedetail). ' bytes</td>';
-		      print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($filedetail)).'</td>';
+		      print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepathdetail).'">'.$file.'</a></td>';		  
+		      print '<td align="right">'.filesize($dir.$file). ' bytes</td>';
+		      print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($dir.$file)).'</td>';
 		      print '</tr>';
 		    }
 		}