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
Commits
1438b3f2
Commit
1438b3f2
authored
1 year ago
by
Benjamin - Le Filament
Browse files
Options
Downloads
Patches
Plain Diff
[UPD] add commercial_name in sale report
parent
ea7925eb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
report/hall_contract_sale_report.py
+4
-1
4 additions, 1 deletion
report/hall_contract_sale_report.py
report/hall_contract_sale_report.xml
+10
-3
10 additions, 3 deletions
report/hall_contract_sale_report.xml
with
14 additions
and
4 deletions
report/hall_contract_sale_report.py
+
4
−
1
View file @
1438b3f2
...
...
@@ -29,8 +29,9 @@ class HallContractSaleReport(models.Model):
stand_id
=
fields
.
Many2one
(
comodel_name
=
"
hall.stand
"
,
string
=
"
Stand
"
,
readonly
=
True
)
hall_id
=
fields
.
Many2one
(
comodel_name
=
"
hall.hall
"
,
string
=
"
Site
"
,
readonly
=
True
)
partner_id
=
fields
.
Many2one
(
comodel_name
=
"
res.partner
"
,
string
=
"
Enseigne
"
,
readonly
=
True
comodel_name
=
"
res.partner
"
,
string
=
"
Client
"
,
readonly
=
True
)
commercial_name
=
fields
.
Char
(
"
Enseigne
"
,
readonly
=
True
)
type_job
=
fields
.
Selection
(
selection
=
[
(
"
food
"
,
"
Restauration
"
),
...
...
@@ -76,6 +77,7 @@ class HallContractSaleReport(models.Model):
"
hall_id
"
,
"
partner_id
"
,
"
manager_id
"
,
"
commercial_name
"
,
],
}
...
...
@@ -95,6 +97,7 @@ class HallContractSaleReport(models.Model):
c.stand_id,
c.hall_id,
c.partner_id,
c.commercial_name,
c.type_job,
extract(isodow from s.day_date)::varchar as day_name,
tva5.total_without_taxes as amount_untaxed_five,
...
...
This diff is collapsed.
Click to expand it.
report/hall_contract_sale_report.xml
+
10
−
3
View file @
1438b3f2
...
...
@@ -22,7 +22,7 @@
<field
name=
"model"
>
hall.contract.sale.report
</field>
<field
name=
"arch"
type=
"xml"
>
<graph
string=
"Sales Analysis"
type=
"bar"
>
<field
name=
"co
ntract_id
"
/>
<field
name=
"co
mmercial_name
"
/>
<field
name=
"sales_excl_taxes"
type=
"measure"
/>
</graph>
</field>
...
...
@@ -34,7 +34,8 @@
<field
name=
"arch"
type=
"xml"
>
<tree>
<field
name=
"day_date"
optional=
"show"
/>
<field
name=
"contract_id"
/>
<field
name=
"contract_id"
optional=
"hide"
/>
<field
name=
"commercial_name"
/>
<field
name=
"hall_id"
/>
<field
name=
"stand_id"
optional=
"hide"
/>
<field
name=
"slot_id"
/>
...
...
@@ -62,6 +63,7 @@
<field
name=
"model"
>
hall.contract.sale.report
</field>
<field
name=
"arch"
type=
"xml"
>
<search
string=
"Sales Analysis"
>
<field
name=
"commercial_name"
/>
<field
name=
"contract_id"
/>
<field
name=
"hall_id"
/>
<field
name=
"stand_id"
/>
...
...
@@ -95,6 +97,11 @@
/>
<filter
string=
"Enseigne"
name=
"group_commercial_name"
context=
"{'group_by':'commercial_name'}"
/>
<filter
string=
"Client"
name=
"group_partner"
context=
"{'group_by':'partner_id'}"
/>
...
...
@@ -144,7 +151,7 @@
<field
name=
"priority"
eval=
"40"
/>
<field
name=
"arch"
type=
"xml"
>
<pivot
string=
"Sales Analysis"
>
<field
name=
"co
ntract_id
"
type=
"row"
/>
<field
name=
"co
mmercial_name
"
type=
"row"
/>
<field
name=
"day_date"
type=
"col"
/>
<field
name=
"sales_excl_taxes"
type=
"measure"
/>
</pivot>
...
...
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