From 09dd6e3da6022e5a2b12bbb5f48f810c5161f6e6 Mon Sep 17 00:00:00 2001 From: Pariket Trivedi Date: Wed, 28 May 2014 19:05:11 +0200 Subject: [PATCH 1/5] [IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content --- addons/event_sale/__openerp__.py | 2 + addons/event_sale/event_demo.xml | 97 +++++++++++++++++++ addons/event_sale/event_sale.py | 3 + addons/event_sale/event_sale_report.xml | 33 +++++++ addons/event_sale/event_sale_view.xml | 40 ++++++++ .../views/report_registrationbadge.xml | 75 ++++++++++++++ 6 files changed, 250 insertions(+) create mode 100644 addons/event_sale/event_sale_report.xml create mode 100644 addons/event_sale/views/report_registrationbadge.xml 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 @@ + + + + + + From 130c8893480a977d68d1faabce96a3ba3c1e01d7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 29 May 2014 15:02:27 +0200 Subject: [PATCH 2/5] [FIX] ir.attachment mess, restore list view --- addons/mail/mail_message_view.xml | 2 +- openerp/addons/base/ir/ir_attachment_view.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 1c4a7f55c10..81b47db819a 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -115,7 +115,7 @@ - kanban,form + kanban,list,form diff --git a/openerp/addons/base/ir/ir_attachment_view.xml b/openerp/addons/base/ir/ir_attachment_view.xml index 02ccfe73a25..c203fe0fd59 100644 --- a/openerp/addons/base/ir/ir_attachment_view.xml +++ b/openerp/addons/base/ir/ir_attachment_view.xml @@ -45,7 +45,9 @@ - + + + From 52501dde7a2a9d789deb743fd7a3d9df34b27da4 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 31 May 2014 01:48:55 +0200 Subject: [PATCH 3/5] [FIX] website_mail_group: duplicate preventDefault() call (called before onclick already) Plus it fails because `event` is not defined nor passed there (e.g. in Firefox) --- .../static/src/js/website_mail_group.snippet.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js index fc0e2bb864f..fd6a2d38cfa 100644 --- a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js +++ b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js @@ -33,7 +33,6 @@ return; }, on_click: function () { - event.preventDefault(); var self = this; var $email = this.$target.find(".js_follow_email"); From faace8493d6aa4a2b2994d25495208766180f1cd Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Sun, 1 Jun 2014 10:52:02 +0200 Subject: [PATCH 4/5] [FIX] email_template: partners ids are integers, not strings --- addons/email_template/email_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 54fbf572eb1..3f202ff6d9e 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -487,7 +487,7 @@ class email_template(osv.osv): partner_to = values.pop('partner_to', '') if partner_to: # placeholders could generate '', 3, 2 due to some empty field values - tpl_partner_ids = [pid for pid in partner_to.split(',') if pid] + tpl_partner_ids = [int(pid) for pid in partner_to.split(',') if pid] values['recipient_ids'] += [(4, pid) for pid in self.pool['res.partner'].exists(cr, SUPERUSER_ID, tpl_partner_ids, context=context)] attachment_ids = values.pop('attachment_ids', []) From c319dc40e7e87971865e95c68789b0534bd84b28 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Sun, 1 Jun 2014 11:17:09 +0200 Subject: [PATCH 5/5] [FIX] mail: view_mode "list" does not exists, it's "tree" --- addons/mail/mail_message_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 81b47db819a..6c15114cde6 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -115,7 +115,7 @@ - kanban,list,form + kanban,tree,form