Skip to content

Commit

Permalink
Merge branch 'marcosgdf-bug-1397' into 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed May 23, 2014
2 parents 20ec1e6 + 9c398b1 commit 1d01377
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -31,6 +31,7 @@ Fix: [ bug #1399 ] [pgsql] Silent warning when setting a propal as "facturée" i
Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.
Fix: element page on project give wrong href link
Fix: [ bug #1397 ] Filter by supplier orders with status Draft does not filter

***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task.
Expand Down
4 changes: 3 additions & 1 deletion htdocs/fourn/commande/liste.php
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -113,7 +114,8 @@
}
if ($socid) $sql.= " AND s.rowid = ".$socid;

if (GETPOST('statut'))
//Required triple check because statut=0 means draft filter
if (GETPOST('statut', 'int') !== '')
{
$sql .= " AND fk_statut =".GETPOST('statut','int');
}
Expand Down

0 comments on commit 1d01377

Please sign in to comment.