From 574ab4601a78353bcf2a3924d1dfb836855dad10 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 17 Jan 2008 11:37:28 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20modification=20expedition=20livraison?=
 =?UTF-8?q?=20Phase1:=20modification=20des=20expeditions=20-=20elles=20pou?=
 =?UTF-8?q?rront=20d=E9sormais=20etre=20li=E9=20=E0=20une=20propale=20(pas?=
 =?UTF-8?q?=20encore=20effectif)=20-=20l'id=20entrepot=20est=20stock=E9=20?=
 =?UTF-8?q?dans=20la=20ligne=20produit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/expedition/expedition.class.php        | 30 ++++++++++++++++---
 .../mods/pdf/ModelePdfExpedition.class.php    |  2 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index bd7f685a811..4e33bd05af7 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -205,11 +205,26 @@ class Expedition extends CommonObject
     
         $sql = "SELECT e.rowid, e.fk_soc as socid, e.date_creation, e.ref, e.fk_user_author, e.fk_statut";
         $sql.= ", ".$this->db->pdate("e.date_expedition")." as date_expedition, e.model_pdf, e.fk_adresse_livraison";
-        if ($conf->commande->enabled) $sql.=", ce.fk_commande as origin_id";
+        if ($conf->commande->enabled)
+        {
+        	$sql.=", ce.fk_commande as origin_id";
+        }
+        else
+        {
+        	$sql.=", pe.fk_propal as origin_id";
+        }
         if ($conf->livraison->enabled) $sql.=", l.rowid as livraison_id";
         $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_exp as ce ON e.rowid = ce.fk_expedition";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON ce.fk_commande = c.rowid";
+        if ($conf->commande->enabled)
+        {
+        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_exp as ce ON e.rowid = ce.fk_expedition";
+        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON ce.fk_commande = c.rowid";
+        }
+        else
+        {
+        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."pr_exp as pe ON e.rowid = pe.fk_expedition";
+        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."propal as p ON pe.fk_propal = p.rowid";
+        }
         if ($conf->livraison->enabled) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON e.rowid = l.fk_expedition";
         $sql.= " WHERE e.rowid = ".$id;
 
@@ -232,7 +247,14 @@ class Expedition extends CommonObject
             $this->adresse_livraison_id = $obj->fk_adresse_livraison;
 			      $this->modelpdf             = $obj->model_pdf;
 			      
-			      if ($conf->commande->enabled) $this->origin = "commande";
+			      if ($conf->commande->enabled)
+			      {
+			      	$this->origin = "commande";
+			      }
+			      else
+			      {
+			      	$this->origin = "propal";
+			      }
 			      
             $this->db->free($result);
     
diff --git a/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php b/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php
index d3c474e7976..81a5cb72cfb 100644
--- a/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php
+++ b/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php
@@ -135,7 +135,7 @@ function expedition_pdf_create($db, $id, $modele='', $outputlangs='')
 
 		$expedition = new Expedition($db);
 		$result=$expedition->fetch($id);
-		$result=$expedition->fetch_commande();
+		$result=$expedition->fetch_object($expedition->origin);
 		
         if ($obj->write_file($expedition, $langs) > 0)
 		{