odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] website_event: create tickets inside add_event. (insead of overwrite create in event_sale) 

bzr revid: chm@openerp.com-20131127103816-fn1dse25djmknylj
This commit is contained in:
Christophe Matthieu 2013-11-27 11:38:16 +01:00
parent 9fc02cfadc
commit db17d26b3a
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/event_sale/event_sale.py
View File

@ -125,7 +125,7 @@ class event_event(osv.osv):
return [{
'name': _('Subscription'),
'product_id': res_id,
'price': 100,
'price': 0,
}]
_columns = {
@ -146,12 +146,6 @@ class event_event(osv.osv):
event.event_ticket_ids.check_registration_limits_before(0)
return super(event_event, self).check_registration_limits(cr, uid, ids, context=context)
def create(self, cr, uid, vals, context=None):
if vals.get('event_ticket_ids'):
for data in vals.get('event_ticket_ids'):
if not data[0] and not data[2]['deadline']:
data[2]['deadline'] = vals.get('date_begin')
return super(event_event, self).create(cr, uid, vals, context=context)
class event_ticket(osv.osv):
_name = 'event.event.ticket'

17
addons/website_event/controllers/main.py
View File

@ -256,10 +256,23 @@ class website_event(http.Controller):
def add_event(self, event_name="New Event", **kwargs):
Event = request.registry.get('event.event')
date_begin = datetime.today() + timedelta(days=(15)) # FIXME: better defaults
event_id = Event.create(request.cr, request.uid, {
vals = {
'name': event_name,
'date_begin': date_begin.strftime('%Y-%m-%d'),
'date_end': (date_begin + timedelta(days=(1))).strftime('%Y-%m-%d'),
}, context=request.context)
}
try:
dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event')
vals['event_ticket_ids'] = [[0,0,{
'name': _('Subscription'),
'product_id': res_id,
'deadline' : vals.get('date_begin'),
'price': 0,
}]]
except ValueError:
pass
event_id = Event.create(request.cr, request.uid, vals, context=request.context)
return request.redirect("/event/%s/?enable_editor=1" % event_id)