From 070a6968e4bc9e36437ff8af422427cc65f1e5eb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 29 May 2006 16:26:17 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20bon=20de=20livraison?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/livraison/fiche.php           |  2 +-
 htdocs/livraison/livraison.class.php | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index ae46eb18f4c..e91cf944843 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -101,7 +101,7 @@ if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->
   $livraison = new Livraison($db);
   $livraison->fetch($_GET["id"]);
   $result = $livraison->valid($user);
-  $livraison->PdfWrite();
+  //$livraison->PdfWrite();
 }
 
 if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php
index ee2045de719..096eb79244a 100644
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -202,9 +202,10 @@ class Livraison
     
         $sql = "SELECT l.rowid, l.date_creation, l.ref, l.fk_user_author,";
         $sql .=" l.fk_statut, l.fk_commande, l.fk_expedition, l.fk_user_valid, l.note, l.note_public";
-        $sql .= ", ".$this->db->pdate("l.date_livraison")." as date_livraison, fk_adresse_livraison, model_pdf";
-        $sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
-        $sql .= " WHERE l.rowid = $id";
+        $sql .= ", ".$this->db->pdate("l.date_livraison")." as date_livraison, l.fk_adresse_livraison, l.model_pdf";
+        $sql .= ", s.idp as socid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+        $sql .= " WHERE l.rowid = $id AND c.rowid = l.fk.commande AND c.fk_soc = s.idp";
     
         $result = $this->db->query($sql) ;
     
@@ -214,6 +215,7 @@ class Livraison
     
             $this->id                   = $obj->rowid;
             $this->ref                  = $obj->ref;
+            $this->soc_id               = $obj->socid;
             $this->statut               = $obj->fk_statut;
             $this->commande_id          = $obj->fk_commande;
             $this->expedition_id        = $obj->fk_expedition;
@@ -249,9 +251,9 @@ class Livraison
     {
         global $conf;
         
-        require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
+        //require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
     
-        dolibarr_syslog("expedition.class.php::valid");
+        dolibarr_syslog("livraison.class.php::valid");
 
         $this->db->begin();