Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
2ce00b29
Commit
2ce00b29
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
parents
041fa8d3
973e42d1
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/lib/date.lib.php
+1
-1
1 addition, 1 deletion
htdocs/core/lib/date.lib.php
with
1 addition
and
1 deletion
htdocs/core/lib/date.lib.php
+
1
−
1
View file @
2ce00b29
...
@@ -566,7 +566,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
...
@@ -566,7 +566,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
if
(((
$timestampEnd
-
$timestampStart
)
%
86400
)
!=
0
)
return
'ErrorDates must use same hours and must be GMT dates'
;
if
(((
$timestampEnd
-
$timestampStart
)
%
86400
)
!=
0
)
return
'ErrorDates must use same hours and must be GMT dates'
;
$i
=
0
;
$i
=
0
;
while
(
$timestampStart
<
$timestampEnd
&&
(
$i
<
50000
))
// Loop end when equals (Test on i is a security loop to avoid infinite loop)
while
(
$timestampStart
<
=
$timestampEnd
&&
(
$i
<
50000
))
// Loop end when equals (Test on i is a security loop to avoid infinite loop)
{
{
$ferie
=
false
;
$ferie
=
false
;
$countryfound
=
0
;
$countryfound
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment