Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cgscop_timesheet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hervé Silvant - CGScop
cgscop_timesheet
Commits
1df6d636
Commit
1df6d636
authored
5 years ago
by
Benjamin - Le Filament
Browse files
Options
Downloads
Patches
Plain Diff
[cgscop #179] check sur ressource sans company_id ou avec company_id = user.company_id
parent
79136f97
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
models/hr_timesheet.py
+2
-0
2 additions, 0 deletions
models/hr_timesheet.py
with
2 additions
and
0 deletions
models/hr_timesheet.py
+
2
−
0
View file @
1df6d636
...
...
@@ -115,6 +115,8 @@ class ScopHrTimesheet(models.Model):
for
line
in
self
:
dt
=
datetime
.
combine
(
line
.
date
,
time
(
12
,
00
))
holiday
=
self
.
env
[
'
resource.calendar.leaves
'
].
search
([
'
|
'
,
(
'
company_id
'
,
'
=
'
,
False
),
(
'
company_id
'
,
'
=
'
,
self
.
env
.
user
.
company_id
.
id
),
(
'
date_from
'
,
'
<=
'
,
dt
),
(
'
date_to
'
,
'
>=
'
,
dt
),
...
...
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