diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index 35d2f51aacc..08eec29c51d 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -42,6 +42,8 @@ this event. 'data': [ 'event_sale_view.xml', 'event_sale_data.xml', + 'event_sale_report.xml', + 'views/report_registrationbadge.xml', 'security/ir.model.access.csv', ], 'demo': ['event_demo.xml'], diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml index ca55b66717d..8a55172cd85 100644 --- a/addons/event_sale/event_demo.xml +++ b/addons/event_sale/event_demo.xml @@ -123,5 +123,102 @@ 5 + + + Program +
Registrations are from 8:30 am, except on Friday from 9:00 am
+
+ Lunch is served between 1:00 pm and 2:00 pm. +
+

Special Events

+ + + + + + + + + + + +
4/619h00Barbecue Beer Event
5/618h30Odoo Awards Ceremony
+
+
+
+

+ #OpenDays +

+
+
+
Wifi network: opendays
+
Wifi password: odoo2014
+
+
+
+ sponsored by +
+ + + +
+
+ ]]>
+ Premium Tickets + + + + + + + + + + + + + + + + + + + + +
Full
Catering
BBQ &
Beer Event
Awards &
Walking
Dinner
Every DayJune 4thJune 5th
+

+

Free Tickets

+ + + + + + + + + + + + + + + + + + +
Drinks
Premium
Ticket
onsite
Every Day60 €/day
30 €/Friday
+ ]]>
+ +

Exhibition Hall

+ +
+ Picture of the exhibition hall +
+ ]]>
+
+ diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index b4f42673aba..8c679996c22 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -165,6 +165,9 @@ class event_event(osv.osv): ['seats_max', 'registration_ids'], 20), 'event.event.ticket': (_get_ticket_events, ['seats_max'], 10), }), + 'badge_back': fields.html('Badge Back', readonly=False, translate=True, states={'done': [('readonly', True)]}), + 'badge_innerleft': fields.html('Badge Innner Left', readonly=False, translate=True, states={'done': [('readonly', True)]}), + 'badge_innerright': fields.html('Badge Inner Right', readonly=False, translate=True, states={'done': [('readonly', True)]}), } _defaults = { 'event_ticket_ids': _get_tickets diff --git a/addons/event_sale/event_sale_report.xml b/addons/event_sale/event_sale_report.xml new file mode 100644 index 00000000000..1d9e21bc742 --- /dev/null +++ b/addons/event_sale/event_sale_report.xml @@ -0,0 +1,33 @@ + + + + + + European A4 low margin + + A4 + 0 + 0 + Portrait + 5 + 5 + 5 + 5 + + 0 + 80 + + + + + + + + \ No newline at end of file diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index 93f9bd8ffb4..d1baab9a7be 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -112,5 +112,45 @@ + + + view_event_form + event.event + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + +
+
+
+
+
diff --git a/addons/event_sale/views/report_registrationbadge.xml b/addons/event_sale/views/report_registrationbadge.xml new file mode 100644 index 00000000000..f9f33c9b2b9 --- /dev/null +++ b/addons/event_sale/views/report_registrationbadge.xml @@ -0,0 +1,75 @@ + + + + + +