diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index e6c7974d667..2986caa5f15 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -173,7 +173,7 @@ class event_ticket(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), - 'event_id': fields.many2one('event.event', "Event", required=True), + 'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'), 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_type_id", "!=", False)]), 'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'), 'deadline': fields.date("Sales End"), diff --git a/addons/website_event/static/description/analytics.png b/addons/website_event/static/description/analytics.png new file mode 100644 index 00000000000..f7eba2dd525 Binary files /dev/null and b/addons/website_event/static/description/analytics.png differ diff --git a/addons/website_event/static/description/event_bottom.png b/addons/website_event/static/description/event_bottom.png new file mode 100644 index 00000000000..f1d5a3bb707 Binary files /dev/null and b/addons/website_event/static/description/event_bottom.png differ diff --git a/addons/website_event/static/description/event_middle.png b/addons/website_event/static/description/event_middle.png new file mode 100644 index 00000000000..247a4db4d20 Binary files /dev/null and b/addons/website_event/static/description/event_middle.png differ diff --git a/addons/website_event/static/description/event_sell.png b/addons/website_event/static/description/event_sell.png new file mode 100644 index 00000000000..5b4cb586325 Binary files /dev/null and b/addons/website_event/static/description/event_sell.png differ diff --git a/addons/website_event/static/description/event_social.png b/addons/website_event/static/description/event_social.png new file mode 100644 index 00000000000..d9697212777 Binary files /dev/null and b/addons/website_event/static/description/event_social.png differ diff --git a/addons/website_event/static/description/event_top.png b/addons/website_event/static/description/event_top.png new file mode 100644 index 00000000000..62cff4396ec Binary files /dev/null and b/addons/website_event/static/description/event_top.png differ diff --git a/addons/website_event/static/description/index.html b/addons/website_event/static/description/index.html index 6188786c4e7..b7fa4745d38 100644 --- a/addons/website_event/static/description/index.html +++ b/addons/website_event/static/description/index.html @@ -7,7 +7,7 @@
@@ -69,24 +69,6 @@
- Use the segmentation, the social network integration and mass - mailing features to promote your events to the right audience. - Setup automated emails to attendees to send them last minute - details. -
-+ Use the segmentation, the social network integration and mass + mailing features to promote your events to the right audience. + Setup automated emails to attendees to send them last minute + details. +