From 919e3d9b8ec09eefe79992e7fb2fbc0a187d3548 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sun, 17 Apr 2005 15:41:05 +0000
Subject: [PATCH] Synchro

---
 htdocs/expedition/fiche.php                       |  4 +++-
 .../mods/pdf/pdf_expedition_dorade.modules.php    | 15 +++++++++------
 .../mods/pdf/pdf_expedition_rouget.modules.php    |  6 +++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 1073ee3d7c0..543b44f68c5 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -432,7 +432,9 @@ else
 	      print '<br /><table class="border" width="50%">';
 	      print "<tr $bc[$var]><td>".$langs->trans("Sending")." PDF</td>";
 
-	      print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=expedition&file='.urlencode(basename($file)).'">'.basename($file).'</a></td>';
+	      $b = ereg_replace($conf->expedition->dir_output."/","",$file);
+
+	      print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=expedition&file='.urlencode($b).'">'.basename($file).'</a></td>';
 	      print '<td align="right">'.filesize($file). ' bytes</td>';
 	      print '<td align="right">'.strftime("%e %B %Y %H:%M:%S",filemtime($file)).'</td></tr>';
 	      print "</table>";
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php
index 15e8682ef81..240ab5ee9e3 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php
@@ -21,7 +21,7 @@
  *
  * L'entete du pdf est définit dans pdf_expedition.class.php
  */
-require_once DOL_DOCUMENT_ROOT."/expedition/mods/pdf/pdf_expedition.class.php";
+require_once DOL_DOCUMENT_ROOT."/expedition/mods/pdf/modele.dorade.php";
 
 Class pdf_expedition_dorade
 {
@@ -37,6 +37,8 @@ Class pdf_expedition_dorade
     {
       $this->expe = $objExpe;
 
+      $this->expe->fetch_commande();
+
       $this->pdf = new pdf_expedition();
       $this->pdf->expe = &$this->expe;
 
@@ -51,18 +53,19 @@ Class pdf_expedition_dorade
       
       /*
        *
-       */  
-      
+       */        
       $this->pdf->SetTextColor(0,0,0);
-      $this->pdf->SetFont('Arial','', 14);
+      $this->pdf->SetFont('Arial','', 16);
       
       $this->expe->fetch_lignes();
       
       for ($i = 0 ; $i < sizeof($this->expe->lignes) ; $i++)
 	{
-	  $a = $this->pdf->tableau_top + 14 + ($i * 7);
+	  $a = $this->pdf->tableau_top + 14 + ($i * 16);
 	  
-	  $this->pdf->Text(8, $a, $this->expe->lignes[$i]->description);
+	  $this->pdf->i25(8, ($a - 2), "000000".$this->expe->lignes[$i]->product_id, 1, 8);
+
+	  $this->pdf->Text(40, $a, $this->expe->lignes[$i]->description);
 	  
 	  $this->pdf->Text(170, $a, $this->expe->lignes[$i]->qty_commande);
 	  
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
index 06455a1a9f1..aedc794f3a7 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
@@ -26,16 +26,16 @@ require_once DOL_DOCUMENT_ROOT."/expedition/mods/pdf/pdf_expedition.class.php";
 Class pdf_expedition_rouget
 {
 
-  Function pdf_expedition_rouget($db=0, &$objExpe)
+  Function pdf_expedition_rouget($db=0)
     { 
       $this->db = $db;
       $this->name = "rouget";
       $this->description = "Modèle simple.";
-      $this->expe = $objExpe;
     }
 
-  Function generate($filename)
+  Function generate(&$objExpe, $filename)
     {
+      $this->expe = $objExpe;
 
       $this->pdf = new pdf_expedition();
       $this->pdf->expe = &$this->expe;