From c8b43ceb58003f3712bc00d907fa93a41f5ede72 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 27 May 2006 11:01:04 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20fl=E8ches=20d'ordonnancement=20des=20pr?=
 =?UTF-8?q?oduits=20sur=20les=20commandes=20et=20les=20propales?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/commande/commande.class.php | 4 +++-
 htdocs/commande/fiche.php          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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)