From 555fe38fb13785c973ae4cb9a1a641dc3b1b9a32 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 5 Jun 2006 17:48:18 +0000 Subject: [PATCH] bugfix --- htdocs/propal.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index b2b29644c34..dc193632467 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -792,9 +792,10 @@ class Propal * Lignes propales liées à un produit */ $sql = "SELECT d.description, d.price, d.tva_tx, d.qty, d.remise_percent, d.subprice,"; - $sql.= " p.rowid, p.label, p.description as product_desc, p.ref"; - $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."product as p"; - $sql.= " WHERE d.fk_propal = ".$this->id ." AND d.fk_product = p.rowid"; + $sql.= " d.fk_product, p.label, p.description as product_desc, p.ref"; + $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d,"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid"; + $sql.= " WHERE d.fk_propal = ".$this->id; $sql.= " ORDER by d.rang"; $result = $this->db->query($sql); @@ -815,7 +816,8 @@ class Propal $ligne->subprice = $objp->subprice; $ligne->remise_percent = $objp->remise_percent; $ligne->price = $objp->price; - $ligne->product_id = $objp->rowid; + $ligne->product_id = $objp->fk_product; + $ligne->coef = $objp->coef; $ligne->libelle = $objp->label; // Label produit $ligne->product_desc = $objp->product_desc; // Description produit