2
0
forked from Wavyzz/dolibarr

Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
This commit is contained in:
Laurent Destailleur
2019-05-19 02:15:01 +02:00
11 changed files with 139 additions and 20 deletions

View File

@@ -1282,6 +1282,10 @@ function check_value($mask, $value)
if (! empty($reg[3]) && preg_match('/^@/', $reg[3])) $maskraz=preg_replace('/^@/', '', $reg[3]);
if ($maskraz >= 0)
{
if ($maskraz == 99) {
$maskraz = date('m');
$resetEveryMonth = true;
}
if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
// Define reg