Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sapoval_calendar
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
Sapoval
sapoval_calendar
Commits
34343a9d
Commit
34343a9d
authored
3 years ago
by
Juliana
Browse files
Options
Downloads
Patches
Plain Diff
[ADD]Add filter to check timesheet linked in event
parent
28e3e401
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
models/calendar.py
+12
-0
12 additions, 0 deletions
models/calendar.py
views/calendar_views.xml
+4
-0
4 additions, 0 deletions
views/calendar_views.xml
with
16 additions
and
0 deletions
models/calendar.py
+
12
−
0
View file @
34343a9d
...
...
@@ -38,6 +38,10 @@ class CalendarEvent(models.Model):
string
=
'
Transféré
'
,
compute
=
'
_compute_is_transfered
'
,
default
=
False
)
is_fdp_exists
=
fields
.
Boolean
(
string
=
'
Feuille de temps existe
'
,
compute
=
'
_compute_is_fdp_exists
'
,
default
=
False
,
store
=
True
)
is_attendee
=
fields
.
Boolean
(
string
=
'
Est participant
'
,
compute
=
'
_compute_is_attendee
'
,
...
...
@@ -60,6 +64,13 @@ class CalendarEvent(models.Model):
else
:
event
.
is_transfered
=
False
@api.depends
(
'
is_transfered
'
)
def
_compute_is_fdp_exists
(
self
):
for
event
in
self
:
timesheet_id
=
self
.
env
[
'
account.analytic.line
'
].
search
([(
'
event_id
'
,
'
=
'
,
event
.
id
)])
if
timesheet_id
:
event
.
is_fdp_exists
=
True
def
_compute_is_attendee
(
self
):
for
event
in
self
:
if
self
.
env
.
user
.
partner_id
in
event
.
partner_ids
:
...
...
@@ -112,6 +123,7 @@ class CalendarEvent(models.Model):
raise
UserError
(
"
Vous avez déjà transféré cette entrée
\
d
'
agenda : %s
"
%
event
.
name
)
else
:
event
.
is_fdp_exists
=
True
values
=
{
'
user_id
'
:
self
.
env
.
user
.
id
,
'
project_id
'
:
event
.
project_id
.
id
,
...
...
This diff is collapsed.
Click to expand it.
views/calendar_views.xml
+
4
−
0
View file @
34343a9d
...
...
@@ -90,6 +90,7 @@
</calendar>
<field
name=
"name"
position=
"before"
>
<field
name=
"task_id"
/>
<field
name=
"is_fdp_exists"
/>
</field>
</field>
</record>
...
...
@@ -101,6 +102,9 @@
<field
name=
"inherit_id"
ref=
"calendar.view_calendar_event_search"
/>
<field
name=
"arch"
type=
"xml"
>
<filter
name=
"mymeetings"
position=
"after"
>
<separator/>
<filter
string=
"A transférer en FDT"
name=
"is_not_fdp"
domain=
"[('is_fdp_exists','!=',True)]"
/>
<filter
string=
"Transférés en FDT"
name=
"is_fdp"
domain=
"[('is_fdp_exists','=',True)]"
/>
<separator/>
<filter
string=
"Ce mois-ci"
name=
"this_month"
domain=
"[('start','<=', (context_today()-relativedelta(day=31, months=0)).strftime('%Y-%m-%d')),
('start','>=',(context_today()-relativedelta(day=1,months=0)).strftime('%Y-%m-%d'))]"
/>
...
...
This diff is collapsed.
Click to expand it.
Rémi - Le Filament
@remi-filament
mentioned in commit
b2c9174b
·
3 years ago
mentioned in commit
b2c9174b
mentioned in commit b2c9174bdd986f5838ffc3ad5c861ff1e8d61867
Toggle commit list
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