Skip to content
Snippets Groups Projects
Commit 9c398b14 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

marcosgdf-bug-1397

Conflicts:
	ChangeLog
parents 20ec1e6a 603c28dc
Branches
No related tags found
No related merge requests found
...@@ -31,6 +31,7 @@ Fix: [ bug #1399 ] [pgsql] Silent warning when setting a propal as "facturée" i ...@@ -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.
......
...@@ -3,6 +3,7 @@ ...@@ -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) ...@@ -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');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment