diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index e05754eb992..577a9ba9f3c 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -46,6 +46,7 @@ Note that: 'security/event_security.xml', 'security/ir.model.access.csv', 'wizard/event_confirm_view.xml', + 'wizard/event_preview_view.xml', 'event_view.xml', 'report/report_event_registration_view.xml', 'board_association_view.xml', @@ -54,7 +55,7 @@ Note that: ], 'demo_xml': ['event_demo.xml'], 'test': ['test/process/event_draft2done.yml'], - # 'js': ['static/src/js/google_map.js'], + 'js': ['static/src/js/google_map.js'], 'qweb': ['static/src/xml/event_address.xml'], 'css': ['static/src/css/event.css'], 'installable': True, diff --git a/addons/event/event.py b/addons/event/event.py index d029ba22acd..dfa35ad50b2 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -219,49 +219,14 @@ class event_event(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}), 'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'), 'available_qty': fields.integer('Availabel Quantity'), + 'sale_end_date': fields.datetime('SalesEnd'), } - _defaults = { 'state': 'draft', 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c), 'user_id': lambda obj, cr, uid, context: uid, } - - def order_now(self, cr, uid, ids, context=None): - register_pool = self.pool.get('event.registration') - user_pool = self.pool.get('res.users') - data_obj = self.pool.get('ir.model.data') - user = user_pool.browse(cr, uid, uid, context=context) - for event in self.browse(cr, uid, ids, context): - self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context) - curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)]) - #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe - print "event.curre_reg_ids",event.available_qty - if not curr_reg_ids and event.available_qty > 0: - print "cccccccccccc",event.available_qty - curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})] - elif event.available_qty > 0: - print "mmmmmmm",event.available_qty - register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context) - if event.available_qty > 0: - register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context) - view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form') - if view_id: - res_id = data_obj.browse(cr, uid, view_id, context=context).res_id - res = { - 'name': _('Registration'), - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'event.registration', - 'res_id': curr_reg_ids[0], - 'views':[(res_id,'form'), (False, 'tree')], - 'type': 'ir.actions.act_window', - 'nodestroy': True, - 'target': 'current', - } - return res - def subscribe_to_event(self, cr, uid, ids, context=None): register_pool = self.pool.get('event.registration') user_pool = self.pool.get('res.users') diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 27ff18d1457..730f6cb6573 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -47,7 +47,7 @@ - - - - Events - event.event - form - 20 - -
-
-
- - - - - - - - - - - - - - + @@ -316,7 +221,6 @@ Subscribed Unsubscribe - @@ -584,7 +488,7 @@ tree,form,calendar,graph {} -
+ view_ ). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import osv, fields + + +class event_preview(osv.osv_memory): + _name = 'event.preview' + _inherit= 'event.event' + _columns = { + 'qty': fields.integer('Quantity'), + 'sale_end_date': fields.datetime('SalesEnd'), + } + def default_get(self, cr, uid, fields, context=None): + event_pool = self.pool.get('event.event') + data_obj = self.pool.get('ir.model.data') + res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview') + if res_id: + event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id + + record_ids = context and context.get('active_ids', []) or [] + res = {} + for event in event_pool.browse(cr, uid, record_ids, context=context): + if 'name' in fields: + res.update({'name': event.name}) + if 'date_begin' in fields: + res.update({'date_begin': event.date_begin or False}) + if 'address_id' in fields: + res.update({'address_id': event.address_id and event.address_id.id or False}) + if 'date_end' in fields: + res.update({'date_end': event.date_end}) + if 'note' in fields: + res.update({'note': event.note}) + return res + +event_preview() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml new file mode 100644 index 00000000000..1d2aead8b28 --- /dev/null +++ b/addons/event/wizard/event_preview_view.xml @@ -0,0 +1,67 @@ + + + + + + Events + event.preview + form + 20 + +
+
+
+ + + +
+ + + + + + + +
+ Where + + + + + + + + + + +
Start:
End
+
+ + + + + + + +
+ + + + + Preview + event.preview + form + form + current + + + + + \ 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 faaa157d356..d0e00c9a8bf 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -57,7 +57,7 @@
Venue :
- + diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 895ca575f08..554f8085fb5 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -1,3 +1,4 @@ + /* ------------------------------ */ /* Wall */ /* ------------------------------ */