diff --git a/addons/event_booth/views/event_booth_views.xml b/addons/event_booth/views/event_booth_views.xml index d8f29a7d0e0..bb1adb00c95 100644 --- a/addons/event_booth/views/event_booth_views.xml +++ b/addons/event_booth/views/event_booth_views.xml @@ -166,19 +166,41 @@ - + + + + + event.booth.view.graph + event.booth + + + + + + + + + event.booth.view.pivot + event.booth + + + + + + + Booths event.booth - kanban,tree,form + kanban,tree,form,graph,pivot [] - {} + {'search_default_group_by_state': 1}

Create a Booth @@ -191,9 +213,9 @@ Booths event.booth - kanban,tree,form + kanban,tree,form,graph,pivot [('event_id', '=', active_id)] - {'default_event_id': active_id} + {'default_event_id': active_id, 'search_default_group_by_state': 1}

Create a Booth diff --git a/addons/event_booth_sale/__manifest__.py b/addons/event_booth_sale/__manifest__.py index 04dd1de86cf..3b613d4639e 100644 --- a/addons/event_booth_sale/__manifest__.py +++ b/addons/event_booth_sale/__manifest__.py @@ -4,7 +4,7 @@ { 'name': "Events Booths Sales", 'category': 'Marketing/Events', - 'version': '1.0', + 'version': '1.1', 'summary': "Manage event booths sale", 'description': """ Sell your event booths and track payments on sale orders. diff --git a/addons/event_booth_sale/models/event_type_booth.py b/addons/event_booth_sale/models/event_type_booth.py index 38f6b559d61..397a6ed4b05 100644 --- a/addons/event_booth_sale/models/event_type_booth.py +++ b/addons/event_booth_sale/models/event_type_booth.py @@ -8,7 +8,7 @@ class EventTypeBooth(models.Model): _inherit = 'event.type.booth' product_id = fields.Many2one(related='booth_category_id.product_id') - price = fields.Float(related='booth_category_id.price') + price = fields.Float(related='booth_category_id.price', store=True) currency_id = fields.Many2one(related='booth_category_id.currency_id') @api.model diff --git a/addons/event_booth_sale/views/event_booth_views.xml b/addons/event_booth_sale/views/event_booth_views.xml index ef08a3769e6..a88968ec3c8 100644 --- a/addons/event_booth_sale/views/event_booth_views.xml +++ b/addons/event_booth_sale/views/event_booth_views.xml @@ -40,14 +40,14 @@ - - event.booth.view.tree.inherit.sale + + event.booth.view.tree.from.event.inherit.sale event.booth - + - + - + @@ -60,6 +60,31 @@ + + + + + + + + event.booth.event.booth.view.graph.inherit.sale + event.booth + + + + + + + + + + event.booth.event.booth.view.pivot.inherit.sale + event.booth + + + + + diff --git a/addons/test_event_full/tests/test_performance.py b/addons/test_event_full/tests/test_performance.py index 0807d50ea34..e63d6f564f7 100644 --- a/addons/test_event_full/tests/test_performance.py +++ b/addons/test_event_full/tests/test_performance.py @@ -144,7 +144,7 @@ class TestEventPerformance(EventPerformanceCase): has_social = 'social_menu' in self.env['event.event'] # otherwise view may crash in enterprise # type and website - with freeze_time(self.reference_now), self.assertQueryCount(event_user=700): # tef only: 673 - com runbot: 604 - ent runbot: 700 + with freeze_time(self.reference_now), self.assertQueryCount(event_user=700): # tef only: 601 - com runbot: 604 - ent runbot: 700 self.env.cr._now = self.reference_now # force create_date to check schedulers with Form(self.env['event.event']) as event_form: event_form.name = 'Test Event' diff --git a/addons/website_event_booth_exhibitor/__manifest__.py b/addons/website_event_booth_exhibitor/__manifest__.py index 52ce1a08f43..44bd7850c31 100644 --- a/addons/website_event_booth_exhibitor/__manifest__.py +++ b/addons/website_event_booth_exhibitor/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Booths/Exhibitors Bridge', 'category': 'Marketing/Events', - 'version': '1.0', + 'version': '1.1', 'summary': 'Event Booths, automatically create a sponsor.', 'description': """ Automatically create a sponsor when renting a booth. diff --git a/addons/website_event_booth_exhibitor/views/event_booth_views.xml b/addons/website_event_booth_exhibitor/views/event_booth_views.xml index 61fb201f174..2e381457d11 100644 --- a/addons/website_event_booth_exhibitor/views/event_booth_views.xml +++ b/addons/website_event_booth_exhibitor/views/event_booth_views.xml @@ -16,15 +16,4 @@ - - event.booth.view.search.inherit.website.event.booth.exhibitor - event.booth - - - - - - - -