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
Le Filament
Confédération Générale des SCOP
cgscop_timesheet
Commits
bb8f0542
Commit
bb8f0542
authored
4 years ago
by
Hervé Silvant - CGScop
Browse files
Options
Downloads
Patches
Plain Diff
Correction orthographe
parent
9b11fc8e
No related branches found
No related tags found
1 merge request
!1
Correction orthographe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
models/hr_timesheet.py
+2
-2
2 additions, 2 deletions
models/hr_timesheet.py
with
2 additions
and
2 deletions
models/hr_timesheet.py
+
2
−
2
View file @
bb8f0542
...
...
@@ -119,7 +119,7 @@ class ScopHrTimesheet(models.Model):
if
(
not
self
.
env
.
user
.
company_id
.
day_working
and
total
>
self
.
env
.
user
.
company_id
.
day_duration
):
raise
ValidationError
(
"
Vous ne pou
r
vez imputer plus de %sh sur la même journée.
\n
"
"
Vous ne pouvez imputer plus de %sh sur la même journée.
\n
"
"
Journée du %s
"
%
(
self
.
env
.
user
.
company_id
.
day_duration
,
record
.
date
.
strftime
(
"
%d/%m/%Y
"
)))
...
...
@@ -137,7 +137,7 @@ class ScopHrTimesheet(models.Model):
])
if
line
.
date
.
weekday
()
in
(
5
,
6
)
or
holiday
:
raise
ValidationError
(
"
Vous ne pou
r
vez imputer du temps sur un weekend
"
"
Vous ne pouvez imputer du temps sur un weekend
"
"
ou un jour férié.
"
)
# ------------------------------------------------------
...
...
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