From 936773b18ede4ad78182aa7971c7552a408c2b9b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 7 Jun 2006 16:25:23 +0000 Subject: [PATCH] =?UTF-8?q?r=E9cup=E9ration=20de=20la=20r=E9f=E9rence=20de?= =?UTF-8?q?=20la=20commande=20associ=E9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/facture.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 6cd46f6603b..180fcaf1bd9 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -302,8 +302,10 @@ class Facture $sql .= ', f.note, f.note_public, f.paye, f.fk_statut, f.fk_user_author, f.model_pdf'; $sql .= ', f.fk_mode_reglement, f.ref_client, p.code as mode_reglement_code, p.libelle as mode_reglement_libelle'; $sql .= ', f.fk_cond_reglement, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_facture'; + $sql .= ', cf.fk_commande'; $sql .= ' FROM '.MAIN_DB_PREFIX.'cond_reglement as c, '.MAIN_DB_PREFIX.'facture as f'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id'; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'co_fa as cf ON cf.fk_facture = f.rowid'; $sql .= ' WHERE f.rowid='.$rowid.' AND c.rowid = f.fk_cond_reglement'; if ($societe_id > 0) { @@ -345,6 +347,7 @@ class Facture $this->note_public = $obj->note_public; $this->user_author = $obj->fk_user_author; $this->modelpdf = $obj->model_pdf; + $this->commande_id = $obj->fk_commande; $this->lignes = array(); @@ -363,6 +366,21 @@ class Facture $this->user_author_firstname = $obju->firstname; } } + + if ($this->commande_id) + { + $sql = "SELECT ref"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande"; + $sql.= " WHERE rowid = ".$this->commande_id; + + $resqlcomm = $this->db->query($sql); + + if ($resqlcomm) + { + $objc = $this->db->fetch_object($resqlcomm); + $this->commande_ref = $objc->ref; + } + } if ($this->statut == 0) {