lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into

Browse Source 
marcosgdf-bug-1397

Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2014-05-23 20:06:40 +02:00
commit 9c398b14c5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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 Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error. will be 10000 instead of 0000 and error.
Fix: element page on project give wrong href link 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 ***** ***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task. Fix: Can't add user for a task.

4
htdocs/fourn/commande/liste.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr> * 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 * 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 * it under the terms of the GNU General Public License as published by
@ -113,7 +114,8 @@ if ($sall)
} }
if ($socid) $sql.= " AND s.rowid = ".$socid; 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'); $sql .= " AND fk_statut =".GETPOST('statut','int');
} }