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
b6827663
Commit
b6827663
authored
10 years ago
by
Marcos García de La Fuente
Committed by
Juanjo Menent
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some
masks Conflicts: htdocs/core/lib/functions2.lib.php
parent
a111c476
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/lib/functions2.lib.php
+2
-1
2 additions, 1 deletion
htdocs/core/lib/functions2.lib.php
with
3 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
b6827663
...
@@ -181,6 +181,7 @@ Dolibarr better:
...
@@ -181,6 +181,7 @@ Dolibarr better:
- Fix: Show sender Country on PDF docs when sender Country <> receiver Country
- Fix: Show sender Country on PDF docs when sender Country <> receiver Country
- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
- Fix: [ bug #1749 ] Undefined $mailchimp
- Fix: [ bug #1749 ] Undefined $mailchimp
- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
***** ChangeLog for 3.6.1 compared to 3.6.* *****
***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users:
For users:
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/lib/functions2.lib.php
+
2
−
1
View file @
b6827663
...
@@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
...
@@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$sql
=
"SELECT MAX("
.
$sqlstring
.
") as val"
;
$sql
=
"SELECT MAX("
.
$sqlstring
.
") as val"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
$table
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
$table
;
$sql
.
=
" WHERE "
.
$field
.
" LIKE '"
.
$maskLike
.
"'"
;
$sql
.
=
" WHERE "
.
$field
.
" LIKE '"
.
$maskLike
.
"'"
;
$sql
.
=
" AND "
.
$field
.
" NOT LIKE '
%
PROV%'"
;
$sql
.
=
" AND "
.
$field
.
" NOT LIKE '
(
PROV%
)
'"
;
if
(
$bentityon
)
// only if entity enable
if
(
$bentityon
)
// only if entity enable
$sql
.
=
" AND entity IN ("
.
getEntity
(
$table
,
1
)
.
")"
;
$sql
.
=
" AND entity IN ("
.
getEntity
(
$table
,
1
)
.
")"
;
if
(
$where
)
$sql
.
=
$where
;
if
(
$where
)
$sql
.
=
$where
;
if
(
$sqlwhere
)
$sql
.
=
' AND '
.
$sqlwhere
;
if
(
$sqlwhere
)
$sql
.
=
' AND '
.
$sqlwhere
;
...
...
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