Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Regis Houssin
2006-06-20 16:18:24 +00:00
parent e6e8dc5e54
commit b76a3af6c5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/commande.class.php
View File

@@ -873,7 +873,8 @@ class Commande extends CommonObject
{
$this->lignes = array();
$sql = 'SELECT l.fk_product, l.fk_commande, l.description, l.price, l.qty, l.rowid, l.tva_tx,';
$sql.= ' l.remise_percent, l.subprice, l.rang, l.coef';
$sql.= ' l.remise_percent, l.subprice, l.rang, l.coef, l.label';
$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
$sql.= ' WHERE l.fk_commande = '.$this->id;
@@ -892,6 +893,7 @@ class Commande extends CommonObject
$ligne = new CommandeLigne($this->db);
$ligne->rowid = $objp->rowid;
$ligne->id = $objp->rowid; // \deprecated
$ligne->label = $objp->label;
$ligne->fk_commande = $objp->fk_commande;
$ligne->commande_id = $objp->fk_commande; // \deprecated
$ligne->desc = $objp->description; // Description ligne
@@ -904,9 +906,9 @@ class Commande extends CommonObject
$ligne->coef = $objp->coef;
$ligne->rang = $objp->rang;
$ligne->libelle = $objp->label; // Label produit
$ligne->libelle = $objp->product_libelle; // Label produit
$ligne->product_desc = $objp->product_desc; // Description produit
$ligne->ref = $objp->ref;
$ligne->ref = $objp->product_ref;
$this->lignes[$i] = $ligne;