From c41d9199097f2c8c28efd9891a1ac41160da759a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jan 2005 19:14:25 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Pb=20mise=20a=20jout=20note=20et=20libel?= =?UTF-8?q?l=E9=20d'une=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/actioncomm.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 0cbc628f809..c4d52df07dd 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -131,7 +131,7 @@ class ActionComm */ function fetch($id) { - $sql = "SELECT ".$this->db->pdate("a.datea")." as da, a.note, c.libelle, fk_soc, fk_user_author, fk_contact, fk_facture, a.percent "; + $sql = "SELECT ".$this->db->pdate("a.datea")." as da, a.note, a.label, c.libelle, fk_soc, fk_user_author, fk_contact, fk_facture, a.percent "; $sql .= "FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c WHERE a.id=$id AND a.fk_action=c.id;"; if ($this->db->query($sql) ) @@ -142,18 +142,14 @@ class ActionComm $this->id = $id; $this->type = $obj->libelle; + $this->libelle = $obj->label; $this->date = $obj->da; $this->note =$obj->note; $this->percent =$obj->percent; - $this->societe->id = $obj->fk_soc; - $this->author->id = $obj->fk_user_author; - $this->contact->id = $obj->fk_contact; - $this->fk_facture = $obj->fk_facture; - if ($this->fk_facture) { $this->objet_url = 'Facture';