diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 8029dc8d831..5c634efe1d3 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -64,11 +64,13 @@ class Commande * \brief Constructeur * \param DB Handler d'accès base */ - function Commande($DB) + function Commande($DB, $soc_idp="", $commandeid=0) { global $langs; $langs->load('orders'); $this->db = $DB; + $this->socidp = $soc_idp; + $this->id = $commandeid; $this->sources[0] = $langs->trans('OrderSource0'); $this->sources[1] = $langs->trans('OrderSource1'); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 651d1bca195..f7b931da44f 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1030,7 +1030,7 @@ else $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid'; $sql.= ' WHERE l.fk_commande = '.$commande->id; - $sql.= ' ORDER BY l.rowid'; + $sql.= ' ORDER BY l.rang ASC, l.rowid'; $resql = $db->query($sql); if ($resql)