From f5ad2692f50c8496218528ba2cd2f8e7df5024b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Mar 2011 10:29:10 +0000 Subject: [PATCH] Fix: Missing property --- htdocs/comm/propal/class/propal.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 88f34340044..784c08e7d5c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -983,7 +983,7 @@ class Propal extends CommonObject */ $sql = "SELECT d.rowid, d.fk_propal, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,"; $sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.marge_tx, d.marque_tx, d.special_code, d.rang, d.product_type,"; - $sql.= " p.ref, p.label, p.description as product_desc"; + $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label'; $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; @@ -1027,10 +1027,11 @@ class Propal extends CommonObject $line->fk_product = $objp->fk_product; + $line->ref = $objp->product_ref; $line->libelle = $objp->label; // TODO deprecated $line->label = $objp->label; // Label produit $line->product_desc = $objp->product_desc; // Description produit - $line->ref = $objp->ref; + $line->fk_product_type = $objp->fk_product_type; $this->lines[$i] = $line; //dol_syslog("1 ".$line->fk_product);