mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-15 14:01:22 +01:00
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts: htdocs/modulebuilder/template/class/myobject.class.php
This commit is contained in:
@@ -1260,6 +1260,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
|
||||
|
||||
Reference in New Issue
Block a user