Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
festa_dashboard
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
Festa
festa_dashboard
Compare revisions
814eb219cc313e994d5b1c8b1725b15117f0b007 to 250ecaf34ae60a40627190c73d58c411638c9d67
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
lefilament/festa/festa_dashboard
Select target project
No results found
250ecaf34ae60a40627190c73d58c411638c9d67
Select Git revision
Swap
Target
lefilament/festa/festa_dashboard
Select target project
lefilament/festa/festa_dashboard
1 result
814eb219cc313e994d5b1c8b1725b15117f0b007
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (3)
[ADD] use contract tags
· 660122c1
Julien - Le Filament
authored
5 months ago
660122c1
[ADD] use tag in sales report
· 9a636f6d
Julien - Le Filament
authored
5 months ago
9a636f6d
Merge branch '16.0-add-tags' into '16.0'
· 250ecaf3
Benjamin - Le Filament
authored
5 months ago
16.0 add tags See merge request
!2
250ecaf3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
report/hall_contract_sale_report.py
+17
-1
17 additions, 1 deletion
report/hall_contract_sale_report.py
report/hall_contract_sale_report.xml
+3
-1
3 additions, 1 deletion
report/hall_contract_sale_report.xml
with
20 additions
and
2 deletions
report/hall_contract_sale_report.py
View file @
250ecaf3
# Copyright 2023 Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
from
odoo
import
fields
,
models
,
tools
from
odoo
import
fields
,
models
,
tools
,
api
class
HallContractSaleReport
(
models
.
Model
):
...
...
@@ -18,6 +18,13 @@ class HallContractSaleReport(models.Model):
slot_id
=
fields
.
Many2one
(
comodel_name
=
"
hall.day.slot
"
,
string
=
"
Créneau Horaire
"
,
readonly
=
True
)
tag_ids
=
fields
.
Many2many
(
comodel_name
=
"
hall.contract.tag
"
,
string
=
"
Etiquette
"
,
compute
=
"
_compute_tags
"
,
search
=
"
_search_tags
"
,
)
nb_receipts
=
fields
.
Integer
(
"
Nombre de tickets
"
)
nb_seats
=
fields
.
Integer
(
"
Nombre de couverts
"
)
sales_excl_taxes
=
fields
.
Monetary
(
"
Total HT
"
)
...
...
@@ -79,9 +86,18 @@ class HallContractSaleReport(models.Model):
"
partner_id
"
,
"
manager_id
"
,
"
commercial_name
"
,
"
tag_ids
"
,
],
}
@api.depends
(
'
contract_id
'
)
def
_compute_tags
(
self
):
for
s
in
self
:
s
.
tag_ids
=
s
.
contract_id
.
tag_ids
def
_search_tags
(
self
,
operator
,
value
):
return
[(
'
contract_id.tag_ids
'
,
operator
,
value
)]
def
_select
(
self
):
return
"""
SELECT
...
...
This diff is collapsed.
Click to expand it.
report/hall_contract_sale_report.xml
View file @
250ecaf3
...
...
@@ -36,6 +36,7 @@
<tree>
<field
name=
"day_date"
optional=
"show"
/>
<field
name=
"contract_id"
optional=
"hide"
/>
<field
name=
"tag_ids"
optional=
"hide"
/>
<field
name=
"commercial_name"
/>
<field
name=
"hall_id"
/>
<field
name=
"stand_id"
optional=
"hide"
/>
...
...
@@ -73,7 +74,7 @@
<field
name=
"day_date"
/>
<field
name=
"location"
/>
<field
name=
"day_name"
/>
<field
name=
"tag_ids"
/>
<filter
name=
"filter_day_date"
date=
"day_date"
...
...
@@ -129,6 +130,7 @@
<field
name=
"contract_id"
select=
"multi"
filters=
"1"
/>
<field
name=
"day_name"
select=
"multi"
filters=
"1"
/>
<field
name=
"slot_id"
select=
"multi"
filters=
"1"
/>
<field
name=
"tag_ids"
select=
"multi"
filters=
"1"
/>
</searchpanel>
</search>
</field>
...
...
This diff is collapsed.
Click to expand it.