From 8309ed5c126b2ff230faabe9a0f9c980b4cf71b4 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Wed, 23 Sep 2015 09:24:49 +0200
Subject: [PATCH 1/2] FIX: When filter with empty status, by default get
 canceled status (-1)

---
 htdocs/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 6af44d4a7d6..db11df409f6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -338,7 +338,7 @@ if ($resql)
 	print '</td>';
 	print '<td align="right">';
 	$liststatus=array('0'=>$langs->trans("StatusOrderDraftShort"), '1'=>$langs->trans("StatusOrderValidated"), '2'=>$langs->trans("StatusOrderSentShort"), '3'=>$langs->trans("StatusOrderToBill"), '4'=>$langs->trans("StatusOrderProcessed"), '-1'=>$langs->trans("StatusOrderCanceledShort"));
-	print $form->selectarray('viewstatut', $liststatus, $viewstatut, 1);
+	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
 	print '</td>';
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

From 3ff8b3e4373a591f43a0ac0efdedbf2eeedb3ebf Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Wed, 23 Sep 2015 10:23:29 +0200
Subject: [PATCH 2/2] FIX: Error retrieving customer prices

---
 htdocs/product/class/productcustomerprice.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 1bca4579070..d5d75e82254 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -307,8 +307,8 @@ class Productcustomerprice extends CommonObject
 	{
 		global $langs;
 
-		if (! empty($sortfield)) $sortfield = "t.rowid";
-		if (! empty($sortorder)) $sortorder = "DESC";
+		if ( empty($sortfield)) $sortfield = "t.rowid";
+		if ( empty($sortorder)) $sortorder = "DESC";
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";