Skip to content
Snippets Groups Projects
Commit 8988daf3 authored by Regis Houssin's avatar Regis Houssin
Browse files

fix: le label du produit n'était plus récupéré

parent b76a3af6
No related branches found
No related tags found
No related merge requests found
...@@ -874,7 +874,6 @@ class Commande extends CommonObject ...@@ -874,7 +874,6 @@ class Commande extends CommonObject
$this->lignes = array(); $this->lignes = array();
$sql = 'SELECT l.fk_product, l.fk_commande, l.description, l.price, l.qty, l.rowid, l.tva_tx,'; $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, l.label'; $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.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
$sql.= ' WHERE l.fk_commande = '.$this->id; $sql.= ' WHERE l.fk_commande = '.$this->id;
...@@ -893,7 +892,6 @@ class Commande extends CommonObject ...@@ -893,7 +892,6 @@ class Commande extends CommonObject
$ligne = new CommandeLigne($this->db); $ligne = new CommandeLigne($this->db);
$ligne->rowid = $objp->rowid; $ligne->rowid = $objp->rowid;
$ligne->id = $objp->rowid; // \deprecated $ligne->id = $objp->rowid; // \deprecated
$ligne->label = $objp->label;
$ligne->fk_commande = $objp->fk_commande; $ligne->fk_commande = $objp->fk_commande;
$ligne->commande_id = $objp->fk_commande; // \deprecated $ligne->commande_id = $objp->fk_commande; // \deprecated
$ligne->desc = $objp->description; // Description ligne $ligne->desc = $objp->description; // Description ligne
...@@ -906,7 +904,8 @@ class Commande extends CommonObject ...@@ -906,7 +904,8 @@ class Commande extends CommonObject
$ligne->coef = $objp->coef; $ligne->coef = $objp->coef;
$ligne->rang = $objp->rang; $ligne->rang = $objp->rang;
$ligne->libelle = $objp->product_libelle; // Label produit $ligne->libelle = $objp->label; // Label ligne
$ligne->product_desc = $objp->product_desc; // Description produit $ligne->product_desc = $objp->product_desc; // Description produit
$ligne->ref = $objp->product_ref; $ligne->ref = $objp->product_ref;
...@@ -1835,6 +1834,7 @@ class CommandeLigne ...@@ -1835,6 +1834,7 @@ class CommandeLigne
var $fk_facture; var $fk_facture;
var $desc; // Description ligne var $desc; // Description ligne
var $product_id; // Id produit prédéfini var $product_id; // Id produit prédéfini
var $label;
var $qty; var $qty;
var $tva_tx; var $tva_tx;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment