From b68276637bd2adfe7192546ffebfcb1688b86c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Wed, 24 Dec 2014 14:31:17 +0100
Subject: [PATCH] Fix: [ bug #1736 ] Failing supplier Elephant numeration
module with some masks
Conflicts:
htdocs/core/lib/functions2.lib.php
---
ChangeLog | 1 +
htdocs/core/lib/functions2.lib.php | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 5ec86761300..7b5447aed23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -181,6 +181,7 @@ Dolibarr better:
- 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 #1749 ] Undefined $mailchimp
+- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users:
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 246af863d12..219d0074813 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$sql = "SELECT MAX(".$sqlstring.") as val";
$sql.= " FROM ".MAIN_DB_PREFIX.$table;
$sql.= " WHERE ".$field." LIKE '".$maskLike."'";
- $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+ $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
if ($bentityon) // only if entity enable
$sql.= " AND entity IN (".getEntity($table, 1).")";
+
if ($where) $sql.=$where;
if ($sqlwhere) $sql.=' AND '.$sqlwhere;
--
GitLab