From 1de3d440133c42554a588a7e2b7446b3fece7098 Mon Sep 17 00:00:00 2001 From: Patrick Hoste Date: Fri, 7 Feb 2020 14:56:15 +0000 Subject: [PATCH] [IMP] event: remove seats_min and default_registration_min from event model PURPOSE This field is deprecated. Since its usage was to trigger a warning when trying to confirm an event and confirming an event is not done anymore, it has become obsolete. SPECIFICATION remove seats_min field and usage from event.event remove default_registration_min field and usage from event.type LINKS Task ID : 2192652 PR : #44938 --- addons/event/__manifest__.py | 2 +- addons/event/models/event_event.py | 13 ------------- addons/event/tests/common.py | 1 - addons/event/tests/test_event_internals.py | 4 ---- addons/event/views/event_views.xml | 7 +------ 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py index e4b21a6930c..f0c92259c99 100644 --- a/addons/event/__manifest__.py +++ b/addons/event/__manifest__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- { 'name': 'Events Organization', - 'version': '1.0', + 'version': '1.1', 'website': 'https://www.odoo.com/page/events', 'category': 'Marketing/Events', 'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations', diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 34ede63a323..fdbe02e4ea9 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -49,9 +49,6 @@ class EventType(models.Model): readonly=False, store=True) # registration has_seats_limitation = fields.Boolean('Limited Seats') - default_registration_min = fields.Integer( - 'Minimum Registrations', default=0, - help="It will select this default minimum value when you choose this event") default_registration_max = fields.Integer( 'Maximum Registrations', default=0, help="It will select this default maximum value when you choose this event") @@ -86,7 +83,6 @@ class EventType(models.Model): @api.onchange('has_seats_limitation') def _onchange_has_seats_limitation(self): if not self.has_seats_limitation: - self.default_registration_min = 0 self.default_registration_max = 0 @@ -135,9 +131,6 @@ class EventEvent(models.Model): seats_availability = fields.Selection( [('unlimited', 'Unlimited'), ('limited', 'Limited')], 'Maximum Attendees', required=True, default='unlimited') - seats_min = fields.Integer( - string='Minimum Attendees', - help="For each event you can define a minimum reserved seats (number of attendees), if it does not reach the mentioned registrations the event can not be confirmed (keep 0 to ignore this rule)") seats_reserved = fields.Integer( string='Reserved Seats', store=True, readonly=True, compute='_compute_seats') @@ -292,7 +285,6 @@ class EventEvent(models.Model): @api.onchange('event_type_id') def _onchange_type(self): if self.event_type_id: - self.seats_min = self.event_type_id.default_registration_min self.seats_max = self.event_type_id.default_registration_max if self.event_type_id.default_registration_max: self.seats_availability = 'limited' @@ -325,11 +317,6 @@ class EventEvent(models.Model): self.event_ticket_ids = [(5, 0, 0)] + [(0, 0, item) for item in all_ticket_values] - @api.constrains('seats_min', 'seats_max', 'seats_availability') - def _check_seats_min_max(self): - if any(event.seats_availability == 'limited' and event.seats_min > event.seats_max for event in self): - raise ValidationError(_('Maximum attendees number should be greater than minimum attendees number.')) - @api.constrains('seats_max', 'seats_available') def _check_seats_limit(self): if any(event.seats_availability == 'limited' and event.seats_max and event.seats_available < 0 for event in self): diff --git a/addons/event/tests/common.py b/addons/event/tests/common.py index e85f7f16884..f58722efcd1 100644 --- a/addons/event/tests/common.py +++ b/addons/event/tests/common.py @@ -53,7 +53,6 @@ class TestEventCommon(common.SavepointCase): 'auto_confirm': True, 'is_online': False, 'has_seats_limitation': True, - 'default_registration_min': 10, 'default_registration_max': 30, 'use_timezone': True, 'default_timezone': 'Europe/Paris', diff --git a/addons/event/tests/test_event_internals.py b/addons/event/tests/test_event_internals.py index c8b8c05f074..6f10eb1ca8f 100644 --- a/addons/event/tests/test_event_internals.py +++ b/addons/event/tests/test_event_internals.py @@ -132,7 +132,6 @@ class TestEventData(TestEventCommon): event._onchange_type() self.assertEqual(event.date_tz, 'Europe/Paris') self.assertEqual(event.seats_availability, 'limited') - self.assertEqual(event.seats_min, event_type.default_registration_min) self.assertEqual(event.seats_max, event_type.default_registration_max) self.assertTrue(event.auto_confirm) self.assertFalse(event.is_online) @@ -259,13 +258,11 @@ class TestEventTypeData(TestEventCommon): event_type = self.env['event.type'].create({ 'name': 'Testing fields computation', 'has_seats_limitation': True, - 'default_registration_min': 5, 'default_registration_max': 30, 'use_ticket': True, }) event_type._onchange_has_seats_limitation() self.assertTrue(event_type.has_seats_limitation) - self.assertEqual(event_type.default_registration_min, 5) self.assertEqual(event_type.default_registration_max, 30) self.assertEqual(event_type.event_type_ticket_ids.mapped('name'), ['Registration']) @@ -273,7 +270,6 @@ class TestEventTypeData(TestEventCommon): event_type.write({'has_seats_limitation': False}) event_type._onchange_has_seats_limitation() self.assertFalse(event_type.has_seats_limitation) - self.assertEqual(event_type.default_registration_min, 0) self.assertEqual(event_type.default_registration_max, 0) # reset tickets diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index 4e3c43739ff..fecad7a2e94 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -79,9 +79,6 @@