Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
1d01377d
Commit
1d01377d
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'marcosgdf-bug-1397' into 3.5
parents
20ec1e6a
9c398b14
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/fourn/commande/liste.php
+3
-1
3 additions, 1 deletion
htdocs/fourn/commande/liste.php
with
4 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
1d01377d
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
htdocs/fourn/commande/liste.php
+
3
−
1
View file @
1d01377d
...
...
@@ -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
...
...
@@ -113,7 +114,8 @@ if ($sall)
}
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'
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment