From b821ee7cc7c97ca0af84b77f9f6182436c8b6082 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Apr 2006 12:38:23 +0000 Subject: [PATCH] =?UTF-8?q?r=E9cup=E9ration=20de=20l'id=20de=20la=20soci?= =?UTF-8?q?=E9t=E9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/adresse_livraison.class.php | 3 ++- htdocs/html.form.class.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/adresse_livraison.class.php b/htdocs/comm/adresse_livraison.class.php index 1bf172d409c..f2f6e93dbbe 100644 --- a/htdocs/comm/adresse_livraison.class.php +++ b/htdocs/comm/adresse_livraison.class.php @@ -352,7 +352,7 @@ class Livraison global $langs; global $conf; - $sql = 'SELECT a.rowid, a.label, a.nom, a.address,'.$this->db->pdate('a.datec').' as dc'; + $sql = 'SELECT a.rowid, a.fk_societe, a.label, a.nom, a.address,'.$this->db->pdate('a.datec').' as dc'; $sql .= ','. $this->db->pdate('a.tms').' as date_update'; $sql .= ', a.cp,a.ville, a.note, a.fk_departement, a.fk_pays'; $sql .= ', p.code as pays_code, p.libelle as pays'; @@ -369,6 +369,7 @@ class Livraison $obj = $this->db->fetch_object($resql); $this->idl = $obj->rowid; + $this->socid = $obj->fk_societe; $this->date_update = $obj->date_update; $this->date_creation = $obj->date_creation; diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 022f6ba66e4..f13ff519414 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1614,7 +1614,7 @@ class Form require_once(DOL_DOCUMENT_ROOT ."/comm/adresse_livraison.class.php"); $livraison=new Livraison($this->db); $livraison->fetch_adresse($selected); - print ''.$livraison->label.''; + print 'socid.'>'.$livraison->label.''; } else {