From ca54d94534089f3bf9f4b958d8564609c1ee9f49 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 6 Aug 2013 15:00:53 +0200 Subject: [PATCH] [IMP] website_event, event bzr revid: chm@openerp.com-20130806130053-wt1l25ri50c1z0e6 --- addons/event/event.py | 2 +- addons/event/event_view.xml | 13 +----- addons/website_event/__openerp__.py | 2 +- addons/website_event/controllers/main.py | 6 +-- addons/website_event/event.py | 6 ++- addons/website_event/views/website_event.xml | 43 +++++++++++--------- 6 files changed, 32 insertions(+), 40 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 1d5bb35a83f..52cca514f7b 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -203,7 +203,7 @@ class event_event(osv.osv): 'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."), 'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."), 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."), - 'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}), + 'address_id': fields.many2one('res.partner','Location', readonly=False, states={'done': [('readonly', True)]}), 'street': fields.related('address_id','street',type='char',string='Street'), 'street2': fields.related('address_id','street2',type='char',string='Street2'), 'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index a9831720abf..82992388498 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -80,18 +80,7 @@ - diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py index ad615c092d8..100175e6eee 100644 --- a/addons/website_event/__openerp__.py +++ b/addons/website_event/__openerp__.py @@ -8,7 +8,7 @@ OpenERP Blog """, 'author': 'OpenERP SA', - 'depends': ['website', 'event', 'website_sale'], + 'depends': ['website', 'event_sale', 'website_sale'], 'data': [ 'views/website_event.xml', 'security/ir.model.access.csv', diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 3c7c10f0a13..33fbe3730bc 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -66,7 +66,6 @@ class website_event(http.Controller): for key, search in domain_search.items(): if key != without: domain += search - print domain return domain # count by domains without self search @@ -97,12 +96,9 @@ class website_event(http.Controller): @http.route(['/event/'], type='http', auth="public") def event(self, event_id=None, **post): website = request.registry['website'] - event = request.registry['event.event'].browse(request.cr, request.uid, event_id) - organizer = event.user_id and request.registry['res.users'].browse(request.cr, SUPERUSER_ID, event.user_id.id) or None - + event = request.registry['event.event'].browse(request.cr, request.uid, event_id, {'show_address': 1}) values = website.get_rendering_context({ 'event_id': event, - 'organizer': organizer, 'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=12&size=298x298" % urllib.quote_plus('%s, %s %s, %s' % (event.street, event.city, event.zip, event.country_id and event.country_id.name_get()[0][1] or '')) }) return website.render("website_event.detail", values) diff --git a/addons/website_event/event.py b/addons/website_event/event.py index 72ad35a4210..047e492153f 100644 --- a/addons/website_event/event.py +++ b/addons/website_event/event.py @@ -9,14 +9,18 @@ class event(osv.osv): 'website_published': fields.boolean('Available in the website'), 'description_website': fields.html('Description for the website'), 'product_ids': fields.one2many('event.event.product', "event_id", "Event"), + 'organizer_id': fields.many2one('res.partner', "Orgonizer"), + 'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'), + 'email': fields.related('orgonizer_id', 'email', type='char', string='Email'), } class event_product(osv.osv): _name = 'event.event.product' _columns = { + 'deadline': fields.date("Sales End"), 'event_id': fields.many2one('event.event', "Event"), - 'product_id': fields.many2one('product.product', 'Product'), + 'product_id': fields.many2one('product.product', 'Product', domain=[("event_type_id", "!=", False)]), 'price': fields.float('Price'), 'qty': fields.integer('Current Registrations', readonly=True), 'max_qty': fields.integer('Maximum Registrations'), diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index a1797e1ebcb..6115491429c 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -10,17 +10,19 @@ - - - - - - - - - + + + + + + + + + + + @@ -73,7 +75,7 @@