[Dolibarr-cvs] dolibarr/htdocs propal.class.php

[Regis Houssin]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Changes by:     Regis Houssin <hregis>  06/06/05 17:48:18

Modified files:
        htdocs         : propal.class.php 

Log message:
        bugfix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/propal.class.php?cvsroot=dolibarr&r1=1.132&r2=1.133

Patches:
Index: propal.class.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/propal.class.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- propal.class.php    1 Jun 2006 15:44:30 -0000       1.132
+++ propal.class.php    5 Jun 2006 17:48:18 -0000       1.133
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: propal.class.php,v 1.132 2006/06/01 15:44:30 hregis Exp $
+ * $Id: propal.class.php,v 1.133 2006/06/05 17:48:18 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/propal.class.php,v $
  */
 
@@ -30,7 +30,7 @@
                \author     Rodolphe Qiedeville
                \author     Eric Seigne
                \author     Laurent Destailleur
-               \version    $Revision: 1.132 $
+               \version    $Revision: 1.133 $
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/product.class.php");
@@ -792,9 +792,10 @@
                 * 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 @@
                         $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