Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8

Dolibarr · Sep 25, 2015 · dcf3c00 · dcf3c00
2 parents c043392 + 3ee5920
commit dcf3c00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
@@ -338,7 +338,7 @@
 	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")).'">';

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
@@ -307,8 +307,8 @@ function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $f
 	{
 		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,";