diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index 5712bafd0d2..566a41f036f 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
{
'name': 'Events Organization',
- 'version': '1.2',
+ 'version': '1.3',
'website': 'https://www.odoo.com/page/events',
'category': 'Marketing/Events',
'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
diff --git a/addons/event/data/event_demo_misc.xml b/addons/event/data/event_demo_misc.xml
index cbb647d8041..a87cce5d7bb 100644
--- a/addons/event/data/event_demo_misc.xml
+++ b/addons/event/data/event_demo_misc.xml
@@ -42,51 +42,60 @@
5-10
1
+ 1
10-14
2
+ 2
15-18
3
+ 3
18+
4
+ 4
Culture
10
+ 5
Music
11
+ 6
Sport
12
+ 7
Online
20
+ 8
Conference
21
+ 9
diff --git a/addons/event/models/event_tag.py b/addons/event/models/event_tag.py
index a4dcad1a5b3..dd097c333a7 100644
--- a/addons/event/models/event_tag.py
+++ b/addons/event/models/event_tag.py
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import _, api, fields, models
+from random import randint
+
+from odoo import api, fields, models
class EventTagCategory(models.Model):
@@ -18,9 +20,15 @@ class EventTag(models.Model):
_description = "Event Tag"
_order = "sequence"
+ def _default_color(self):
+ return randint(1, 11)
+
name = fields.Char("Name", required=True, translate=True)
sequence = fields.Integer('Sequence', default=0)
category_id = fields.Many2one("event.tag.category", string="Category", required=True, ondelete='cascade')
+ color = fields.Integer(
+ string='Color Index', default=lambda self: self._default_color(),
+ help='Tag color. No color means no display in kanban or front-end, to distinguish internal tags from public categorization tags.')
def name_get(self):
return [(tag.id, "%s: %s" % (tag.category_id.name, tag.name)) for tag in self]
diff --git a/addons/event/views/event_tag_views.xml b/addons/event/views/event_tag_views.xml
index 10c94b0e82c..a1fe03843fd 100644
--- a/addons/event/views/event_tag_views.xml
+++ b/addons/event/views/event_tag_views.xml
@@ -9,7 +9,7 @@
-
+
@@ -28,6 +28,7 @@
+
@@ -51,6 +52,7 @@
+
@@ -64,6 +66,7 @@
+
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index faa081e643c..f3029824812 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -78,7 +78,7 @@
@@ -232,7 +232,7 @@
-
+
diff --git a/addons/website_event_online/__manifest__.py b/addons/website_event_online/__manifest__.py
index d391ea3346b..4244c5db0a0 100644
--- a/addons/website_event_online/__manifest__.py
+++ b/addons/website_event_online/__manifest__.py
@@ -19,8 +19,6 @@
'views/assets.xml',
'views/event_event_views.xml',
'views/event_registration_views.xml',
- 'views/event_tag_views.xml',
- 'views/event_type_views.xml',
'views/website_visitor_views.xml',
'views/event_templates_event.xml',
'views/event_templates_widgets.xml',
@@ -29,7 +27,6 @@
'data/website_visitor_demo.xml',
'data/event_demo.xml',
'data/event_registration_demo.xml',
- 'data/event_tag_demo.xml',
],
'application': False,
'installable': True,
diff --git a/addons/website_event_online/data/event_tag_demo.xml b/addons/website_event_online/data/event_tag_demo.xml
deleted file mode 100644
index 391eb867aa6..00000000000
--- a/addons/website_event_online/data/event_tag_demo.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
-
-
- 5
-
-
- 6
-
-
- 7
-
-
-
- 8
-
-
- 9
-
-
diff --git a/addons/website_event_online/models/__init__.py b/addons/website_event_online/models/__init__.py
index e6dbdc4c033..fa937cadda2 100644
--- a/addons/website_event_online/models/__init__.py
+++ b/addons/website_event_online/models/__init__.py
@@ -3,5 +3,4 @@
from . import event_event
from . import event_registration
-from . import event_tag
from . import website_visitor
diff --git a/addons/website_event_online/models/event_tag.py b/addons/website_event_online/models/event_tag.py
deleted file mode 100644
index 71aa5c63004..00000000000
--- a/addons/website_event_online/models/event_tag.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from random import randint
-
-from odoo import models, fields
-
-
-class EventTag(models.Model):
- _inherit = ['event.tag']
-
- def _default_color(self):
- return randint(1, 11)
-
- color = fields.Integer(
- string='Color Index', default=lambda self: self._default_color(),
- help='Tag color. No color means no display in kanban or front-end, to distinguish internal tags from public categorization tags.')
diff --git a/addons/website_event_online/views/event_event_views.xml b/addons/website_event_online/views/event_event_views.xml
index ed8cee747d8..0b2722fa5f5 100644
--- a/addons/website_event_online/views/event_event_views.xml
+++ b/addons/website_event_online/views/event_event_views.xml
@@ -12,9 +12,6 @@
-
- {'color_field': 'color', 'no_quick_create': True}
-
diff --git a/addons/website_event_online/views/event_tag_views.xml b/addons/website_event_online/views/event_tag_views.xml
deleted file mode 100644
index ebaffa264c0..00000000000
--- a/addons/website_event_online/views/event_tag_views.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- event.tag.category.view.form.inherit.online
- event.tag.category
-
-
-
-
-
-
-
-
-
- event.tag.category.view.tree.inherit.online
- event.tag.category
-
-
-
- many2many_tags
- {'color_field': 'color'}
-
-
-
-
-
- event.tag.view.list.inherit.online
- event.tag
-
-
-
-
-
-
-
-
-
- event.tag.view.form.inherit.online
- event.tag
-
-
-
-
-
-
-
-
-
diff --git a/addons/website_event_online/views/event_type_views.xml b/addons/website_event_online/views/event_type_views.xml
deleted file mode 100644
index b87ae0c0107..00000000000
--- a/addons/website_event_online/views/event_type_views.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- event.type.view.form.inherit.online
- event.type
-
-
-
- {'color_field': 'color', 'no_quick_create': True}
-
-
-
-
-