Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
This commit is contained in:
Laurent Destailleur
2015-01-22 21:52:55 +01:00
parent eedca43cc3 04afe935a5
commit 6bda61436b
11 changed files with 119 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions2.lib.php
View File

@@ -608,7 +608,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$maskraz=-1;
$maskoffset=0;
$resetEveryMonth=false;
if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'CounterMustHaveMoreThan3Digits';
// Extract value for third party mask counter
if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))