Merge remote-tracking branch 'origin/3.7' into develop

This commit is contained in:
Laurent Destailleur 2015-02-23 19:50:51 +01:00
commit afa8e5c6d8

View File

@ -45,7 +45,7 @@ $search_user=GETPOST('search_user');
$search_ht=GETPOST('search_ht');
$search_ttc=GETPOST('search_ttc');
$sall=GETPOST('search_all');
$search_status=GETPOST('search_status','int');
$search_status=(GETPOST('search_status','int')!=''?GETPOST('search_status','int'):GETPOST('statut','int'));
$page = GETPOST('page','int');
$socid = GETPOST('socid','int');