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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
31c38ced
Commit
31c38ced
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: checkstyle
parent
420de76b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/lib/date.lib.php
+2
-2
2 additions, 2 deletions
htdocs/core/lib/date.lib.php
with
2 additions
and
2 deletions
htdocs/core/lib/date.lib.php
+
2
−
2
View file @
31c38ced
...
...
@@ -524,7 +524,7 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
}
$tmpmonth
=
$prev_month
;
$tmpyear
=
$prev_year
;
//Get first day of next week
$tmptime
=
dol_mktime
(
12
,
0
,
0
,
$month
,
$tmpday
,
$year
,
1
,
0
);
$tmptime
-=
24
*
60
*
60
*
7
;
...
...
@@ -720,7 +720,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
* @param int $inhour 0: return number of days, 1: return number of hours
* @param int $lastday We include last day, 0: no, 1:yes
* @param int $halfday Tag to define half day when holiday start and end
* @param string $countrycode
Country code (company country code if not defined)
* @param string $country
_
code Country code (company country code if not defined)
* @return int Number of days or hours
*/
function
num_open_day
(
$timestampStart
,
$timestampEnd
,
$inhour
=
0
,
$lastday
=
0
,
$halfday
=
0
,
$country_code
=
''
)
...
...
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