Skip to content
Snippets Groups Projects
Commit 660122c1 authored by Julien - Le Filament's avatar Julien - Le Filament
Browse files

[ADD] use contract tags

parent 2534457e
No related branches found
No related tags found
1 merge request!216.0 add tags
...@@ -18,6 +18,10 @@ class HallContractSaleReport(models.Model): ...@@ -18,6 +18,10 @@ class HallContractSaleReport(models.Model):
slot_id = fields.Many2one( slot_id = fields.Many2one(
comodel_name="hall.day.slot", string="Créneau Horaire", readonly=True comodel_name="hall.day.slot", string="Créneau Horaire", readonly=True
) )
tag_id = fields.Many2one(
comodel_name="hall.contract.tag", string="Etiquette", readonly=True
)
nb_receipts = fields.Integer("Nombre de tickets") nb_receipts = fields.Integer("Nombre de tickets")
nb_seats = fields.Integer("Nombre de couverts") nb_seats = fields.Integer("Nombre de couverts")
sales_excl_taxes = fields.Monetary("Total HT") sales_excl_taxes = fields.Monetary("Total HT")
...@@ -78,6 +82,7 @@ class HallContractSaleReport(models.Model): ...@@ -78,6 +82,7 @@ class HallContractSaleReport(models.Model):
"partner_id", "partner_id",
"manager_id", "manager_id",
"commercial_name", "commercial_name",
"tag_ids",
], ],
} }
...@@ -88,6 +93,7 @@ class HallContractSaleReport(models.Model): ...@@ -88,6 +93,7 @@ class HallContractSaleReport(models.Model):
s.contract_id, s.contract_id,
s.day_date, s.day_date,
s.slot_id, s.slot_id,
s.tag_id,
s.nb_receipts, s.nb_receipts,
s.nb_seats, s.nb_seats,
s.sales_excl_taxes, s.sales_excl_taxes,
...@@ -114,6 +120,8 @@ class HallContractSaleReport(models.Model): ...@@ -114,6 +120,8 @@ class HallContractSaleReport(models.Model):
hall_contract_sale s hall_contract_sale s
LEFT JOIN LEFT JOIN
hall_contract c ON c.id = s.contract_id hall_contract c ON c.id = s.contract_id
LEFT JOIN
hall_contract_tag ct ON ct.id = s.tag_id
LEFT JOIN LEFT JOIN
hall_contract_sale_tax tva5 ON tva5.sale_id = s.id and tva5.tax_rate = 0.055 hall_contract_sale_tax tva5 ON tva5.sale_id = s.id and tva5.tax_rate = 0.055
LEFT JOIN LEFT JOIN
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<field name="contract_id" type="col" /> <field name="contract_id" type="col" />
<field name="day_date" type="row" /> <field name="day_date" type="row" />
<field name="slot_id" type="row" /> <field name="slot_id" type="row" />
<field name="tag_id" type="row" />
<field name="sales_excl_taxes" type="measure" /> <field name="sales_excl_taxes" type="measure" />
<field name="sales_incl_taxes" type="measure" /> <field name="sales_incl_taxes" type="measure" />
</pivot> </pivot>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
<tree> <tree>
<field name="day_date" optional="show" /> <field name="day_date" optional="show" />
<field name="contract_id" optional="hide" /> <field name="contract_id" optional="hide" />
<field name="tag_id" optional="hide" />
<field name="commercial_name" /> <field name="commercial_name" />
<field name="hall_id" /> <field name="hall_id" />
<field name="stand_id" optional="hide" /> <field name="stand_id" optional="hide" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment