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

prepare new rule

Browse Source
This commit is contained in:
Frédéric FRANCE
2020-05-23 21:07:47 +02:00
parent 6522bb70fd
commit 174ddc5fd4
26 changed files with 223 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,11 +904,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
{
// If before of next new year date
if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
}
// If after or equal of current new year date
} // If after or equal of current new year date
elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
}
// For backward compatibility
} // For backward compatibility
elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; } // If current month lower that month of return to zero, year is previous year
if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);