Merge lp:~openerp-dev/openobject-addons/trunk-imp-event-psa into lp:openobject-addons

[Paramjit Singh Sahota(OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-imp-event-psa]

9328. By Paramjit Singh Sahota(OpenERP) on 2014-04-16

[IMP] Improved code by adding some fields in event,
improving the view of event to make the available tickets, published/unpublished button and reminders make available at single place,
added from website_event whole promotion group which consists sharing no twitter and fb.

9329. By Paramjit Singh Sahota(OpenERP) on 2014-04-17

[ADD] Added qweb reports and svg images for flags and little bit improvemnt.

9330. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[MERGE] Merged lp:openobject-addons.

9331. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[IMP] Added div name in marketing and according set path in website_event

9332. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[FIX] FIxed syntx error

9333. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[REM] Removed some code bcz notebook is now not available in event form and replaced event_backend.xml code in website_event with vid's changes

9334. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[IMP] Improved code 'History of Order' in the event form to see the status of the orders.

9335. By Paramjit Singh Sahota(OpenERP) on 2014-04-18

[ADD] In website : dynamic form for attendee first name, last name and email address

9336. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[ADD] Added cron for event reminder.

9337. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[IMP] Improved demo data bcz its showing bad result in kanban view.
> Created an action to open the mass_mailing wizard on send email invitation button.

9338. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[IMP] Reordered the mass_mailing action.

9339. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[IMP] Resolved the errors of reports,
> rename event.registration into event.registration_attendee,

9340. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[MERGE] Merged lp:openobject-addons.

9341. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

Added the rights for event.reminder.

9342. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[FIx] Fixed warning where it must be view_id rather than inherit_id

9343. By Paramjit Singh Sahota(OpenERP) on 2014-04-22

[MERGE] MErged lp:openobject-addons.

9344. By Paramjit Singh Sahota(OpenERP) on 2014-04-24

[REM] Removed the code related to reports and made another branch for that.
Removed all svg image flags
Removed reports.

9345. By Paramjit Singh Sahota(OpenERP) on 2014-04-24

[Fix] Fixed the issue of cron where in event.event wrong object was passed.

9346. By Paramjit Singh Sahota(OpenERP) on 2014-04-24

Removed unwanted code.

9347. By Paramjit Singh Sahota(OpenERP) on 2014-04-24

[MERGE] Merged lp:openobject-addons.

9348. By Paramjit Singh Sahota(OpenERP) on 2014-04-24

[REM] REmoved the store from the fields.

9349. By Paramjit Singh Sahota(OpenERP) on 2014-04-25

[REM] Removed unwanted code improved indentation.

9350. By Paramjit Singh Sahota(OpenERP) on 2014-04-25

[FIX] Fixed indent issue.

9351. By Mehul Mehta(OpenERP) on 2014-04-25

[IMP] Now in setting of event management when you tick the 'pulish your events' than the published/unpublished are visible

9352. By Mehul Mehta(OpenERP) on 2014-04-25

[IMP] Now in setting of event management when you tick the 'Manage Event Tickets' than the Manage Ticket are visible and group_publish_events apply only for published button

9353. By Pariket Trivedi(OpenERP) on 2014-04-28

[IMP] groups are apply for 'agenda' and 'locatoin'

9354. By Paramjit Singh Sahota(OpenERP) on 2014-04-28

[MERGE] MErged lp:openobject-addons

9355. By Paramjit Singh Sahota(OpenERP) on 2014-04-28

[IMP] Added implied_ids and groups for publish event in website

9356. By Pariket Trivedi(OpenERP) on 2014-04-29

[IMP]: change for report class name and store seats_max in event_sale.

9357. By Paramjit Singh Sahota(OpenERP) on 2014-04-29

Added the send_reminder_mail method to send the mails to the attendees and fixed the issue of not working cron and removed badge_layout field bcz reporting has been to some other task.

9358. By Paramjit Singh Sahota(OpenERP) on 2014-04-29

[MERGE] Merged lp:openobject-addons.

9359. By Paramjit Singh Sahota(OpenERP) on 2014-04-29

Missed to remove from the defaults.

9360. By Paramjit Singh Sahota(OpenERP) on 2014-05-05

[MERGE] Merged lp:openobject-addons & removed conflicts.

9361. By Paramjit Singh Sahota(OpenERP) on 2014-05-05

[IMP] Some changes missed out while merging.

9362. By Paramjit Singh Sahota(OpenERP) on 2014-05-05

[IMP] Improved the form view of event ' https://openerp.mybalsamiq.com/mockups/1815495.png'
add security file for event_sale for creating a group rights for tickets and added same in res_config.

9363. By Paramjit Singh Sahota(OpenERP) on 2014-05-05

[IMP] Improved the o2m of Automated reminders
'Email to Send | Timing | | When '.

9364. By Paramjit Singh Sahota(OpenERP) on 2014-05-05

[IMP] Improved
>In settings/marketing,
>>event section should come before marketing campaign
>Rename Marketing campaign into lead automation
>>under lead Automation, rename Settings into 'Feature'.
>>rename 'Marketing campaign feature' into 'Automate leads accquisition'.

9365. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

[MERGE] Merged lp:openobject-addons.

9366. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

Resolved conflicts

9367. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

[IMP] Improved code
> Creating product from the event_ticket_ids the event_ok must be true.
> Improved the xpath.
> Typo.

9368. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

 Proper fix will be done afterwards, fix for right now.

9369. By Paramjit Singh Sahota(OpenERP) on 2014-05-08

[IMP] Improved the res_config issue.

9370. By Paramjit Singh Sahota(OpenERP) on 2014-05-08

[MERGE] Merged lp:openobject-addons.

9371. By Paramjit Singh Sahota(OpenERP) on 2014-05-08

[IMP] Improved the views issues.

9372. By Pariket Trivedi(OpenERP) on 2014-05-08

[IMP]: Manage Event Tickets groups implied for all user.

9373. By Pariket Trivedi(OpenERP) on 2014-05-08

[IMP]: Manage Event Tickets groups remove implied for all user and Publish your event groups implied for all user.

9374. By Paramjit Singh Sahota(OpenERP) on 2014-05-08

[MERGE] Merged lp:openobject-addons.

9375. By Paramjit Singh Sahota(OpenERP) on 2014-05-08

[IMP] Added the kanban view.

9376. By Paramjit Singh Sahota(OpenERP) on 2014-05-12

[MERGE] MErged lp:openobject-addons.

9377. By Paramjit Singh Sahota(OpenERP) on 2014-05-13

[IMP] Applied sparkline_bar widget for getting the attendees in the event kanban view and added the code accordingly..

9378. By Paramjit Singh Sahota(OpenERP) on 2014-05-13

[MERGE] MErged lp:openobject-addons.

9379. By Paramjit Singh Sahota(OpenERP) on 2014-05-13

Added for loop for event.

9380. By Paramjit Singh Sahota(OpenERP) on 2014-05-14

[IMP]If there is email configured on event type, the autmated reminder should be prefilled

9381. By Paramjit Singh Sahota(OpenERP) on 2014-05-14

[IMP] Make the ticket booking working through website.
[WIP] Event kanban using Sparkline

9382. By Paramjit Singh Sahota(OpenERP) on 2014-05-15

[IMP]Improved code for pie chart using sparkline. :( Still data is not perfect.

9383. By Paramjit Singh Sahota(OpenERP) on 2014-05-15

[MERGE] MERGED lp:openobject-addons.

9384. By Paramjit Singh Sahota(OpenERP) on 2014-05-15

[IMP] Improved code 'registration per day' using sparkline.

9385. By Paramjit Singh Sahota(OpenERP) on 2014-05-16

[IMP] Improved code and added gauge meter and removed unwanted functional fields.

9386. By Pariket Trivedi(OpenERP) on 2014-05-16

[IMP] make gauge view for No. of seates registrated.

9387. By Paramjit Singh Sahota(OpenERP) on 2014-05-16

[IMP] Improved code and make the sparkline data comes properly.

9388. By Paramjit Singh Sahota(OpenERP) on 2014-05-19

[MERGE] MERGED lp:openobject-addons.

9389. By Pariket Trivedi(OpenERP) on 2014-05-19

[IMP] add template file and change html code to qweb render template.

9390. By Pariket Trivedi(OpenERP) on 2014-05-21

[IMP]: change for input fild name and define res value.

9391. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

[IMP] Added event_graph widget for the piechart in the event kanban.
Removed unwanted css class
Added functional fields for the pie charts.

9392. By Pariket Trivedi(OpenERP) on 2014-05-21

[IMP]: set date group_begin_date in __get_bar_values method.

9393. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

[IMP] Typo change and fixed the issue of sold out tickets.

9394. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

[MERGE] MERGED lp:openobject-addons.

9395. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

[IMP] Improved test case according to new attendees feature.

9396. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

[IMP] Removed unwanted code and imprved test case.

9397. By Paramjit Singh Sahota(OpenERP) on 2014-05-21

Revert unwanted diff.

9398. By Paramjit Singh Sahota(OpenERP) on 2014-05-22

[IMP]Improved the list view strings like
| Creation Date | Customer | Name | Email | Event | Ticket | Source | Status |

9399. By Mehul Mehta(OpenERP) on 2014-05-23

[IMP] Removed a _defaults from event_sale

9400. By Paramjit Singh Sahota(OpenERP) on 2014-05-23

[IMP] Improved code
>When subscibe the attendee screen shouldn't be in the event page.
>>when selecting teckets, the button should be 'Select Attendees and Order'
>>a screen with attendees
>>then, order teckets the button should be 'Order Now'.

9401. By Paramjit Singh Sahota(OpenERP) on 2014-05-24

[IMP] Fixed the issue where the quantity is not updated when selecting the attendees.
Improved test cases.

9402. By Paramjit Singh Sahota(OpenERP) on 2014-05-24

[IMP] Improved the test case.

9403. By Paramjit Singh Sahota(OpenERP) on 2014-05-24

[MERGE] MERGED lp:openobject-addons

9404. By Paramjit Singh Sahota(OpenERP) on 2014-05-26

[IMP] Added form for the FREE tickets.

9405. By Paramjit Singh Sahota(OpenERP) on 2014-05-26

[IMP] Improved code and remove unwanted code.

9406. By Paramjit Singh Sahota(OpenERP) on 2014-05-26

[FIX] Fixed the issue of TICKET NAME not properly displayed in online event.

9407. By Paramjit Singh Sahota(OpenERP) on 2014-05-26

[FIX] Fixed the missed out collections.

9408. By Paramjit Singh Sahota(OpenERP) on 2014-05-27

[IMP] Improved package names.

9409. By Paramjit Singh Sahota(OpenERP) on 2014-05-27

Removed the base.group_user which is setting implied_ids

9410. By Paramjit Singh Sahota(OpenERP) on 2014-05-27

[IMP] TYPO changes and 'If there is email configured on event type, the autmated reminder should be prefilled'

9411. By Paramjit Singh Sahota(OpenERP) on 2014-05-27

[FIx]
Traceback when cron run :
          AttributeError: Got KeyError('' Field 'reminder_sended' does not exist in object 'browse_record(event.registration_attendee, 1)' '',) while trying to get attribute reminder_sended on a event.registration_attendee record.

9412. By Paramjit Singh Sahota(OpenERP) on 2014-05-27

[FIx] 'Type of Event'.

9413. By Paramjit Singh Sahota(OpenERP) on 2014-05-28

ADDED action for attendees from event kanban.

9414. By Jitendra Prajapati(OpenERP) on 2014-05-28

Added demo data.

9415. By Pariket Trivedi(OpenERP) on 2014-05-28

[IMP]: add action for click sparkline_bar in event.

9416. By Paramjit Singh Sahota(OpenERP) on 2014-05-28

Added groups and typo changes

9417. By Paramjit Singh Sahota(OpenERP) on 2014-05-28

[IMP] Reordered the action, loaded tthe report xml before view xml, little css improvement and made event_ok true when record created from event_ticket_ids.

9418. By Jitendra Prajapati(OpenERP) on 2014-05-29

[IMP]created sale order line one by one as per selected quantity

9419. By Paramjit Singh Sahota(OpenERP) on 2014-05-29

[IMP] Added the attendee name into and sale order line.

9420. By Pariket Trivedi(OpenERP) on 2014-05-29

[IMP]: check condition and after concat string.

9421. By Pariket Trivedi(OpenERP) on 2014-05-30

[IMP]: genrated SO in descriptin.

9422. By Pariket Trivedi(OpenERP) on 2014-05-30

[IMP]:remove registration_date field and change cron job for create_date.

9423. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[FIX] Fixed the issue 'if i add one attendee then sys will add two attendee(one from SO) that is wrong.'

9424. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[IMP] Improved code and removed the test case bcz we can't get the request.

9425. By Paramjit Singh Sahota(OpenERP) on 2014-05-31

[IMP] Improved the attendee form and added event details on attendee page.

9426. By Paramjit Singh Sahota(OpenERP) on 2014-06-03

[IMP] Improved code for button_confirm method through which the test cases are failed.

9427. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

Testing for test cases.

9428. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP] Improved code to inhibits the session stuffs when SO is created manually.
Reverted the test cases

9429. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

TEST

9430. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP]: change condition.

9431. By Paramjit Singh Sahota(OpenERP) on 2014-06-09

[IMP] Improved test case and improved code for the free tickets and little bit improvement.

Unmerged revisions

9431. By Paramjit Singh Sahota(OpenERP) on 2014-06-09

[IMP] Improved test case and improved code for the free tickets and little bit improvement.

9430. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP]: change condition.

9429. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

TEST

9428. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP] Improved code to inhibits the session stuffs when SO is created manually.
Reverted the test cases

9427. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

Testing for test cases.

9426. By Paramjit Singh Sahota(OpenERP) on 2014-06-03

[IMP] Improved code for button_confirm method through which the test cases are failed.

9425. By Paramjit Singh Sahota(OpenERP) on 2014-05-31

[IMP] Improved the attendee form and added event details on attendee page.

9424. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[IMP] Improved code and removed the test case bcz we can't get the request.

9423. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[FIX] Fixed the issue 'if i add one attendee then sys will add two attendee(one from SO) that is wrong.'

9422. By Pariket Trivedi(OpenERP) on 2014-05-30

[IMP]:remove registration_date field and change cron job for create_date.

=== modified file 'event/__openerp__.py'
--- event/__openerp__.py	2014-04-29 15:41:04 +0000
+++ event/__openerp__.py	2014-06-09 06:19:49 +0000
@@ -38,17 +38,18 @@
 * Use emails to automatically confirm and send acknowledgements for any event registration
 """,
     'author': 'OpenERP SA',
-    'depends': ['base_setup', 'board', 'email_template', 'marketing'],
+    'depends': ['base_setup', 'board', 'email_template', 'marketing', 'web_kanban_sparkline', ],
     'data': [
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
+        'report/report_event_registration_view.xml',
         'event_view.xml',
         'event_data.xml',
-        'report/report_event_registration_view.xml',
         'res_partner_view.xml',
         'email_template.xml',
         'views/event.xml',
+        'res_config_view.xml',
     ],
     'demo': [
         'event_demo.xml',

=== modified file 'event/email_template.xml'
--- event/email_template.xml	2014-05-09 12:18:27 +0000
+++ event/email_template.xml	2014-06-09 06:19:49 +0000
@@ -3,7 +3,7 @@
     <data>
         <record id="confirmation_event" model="email.template">
         <field name="name">Confirmation of the Event</field>
-        <field name="model_id" ref="event.model_event_registration"/>
+        <field name="model_id" ref="event.model_event_registration_attendee"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
@@ -20,7 +20,7 @@
 
         <record id="confirmation_registration" model="email.template">
         <field name="name">Confirmation of the Registration</field>
-        <field name="model_id" ref="event.model_event_registration"/>
+        <field name="model_id" ref="event.model_event_registration_attendee"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>

=== modified file 'event/event.py'
--- event/event.py	2014-05-12 07:23:31 +0000
+++ event/event.py	2014-06-09 06:19:49 +0000
@@ -21,9 +21,12 @@
 import pytz
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from datetime import datetime, timedelta
+from dateutil import relativedelta
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
+from openerp import tools
+import json
 
 class event_type(osv.osv):
     """ Event Type """
@@ -46,6 +49,7 @@
     """Event"""
     _name = 'event.event'
     _description = __doc__
+    _period_number = 5
     _order = 'date_begin'
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
@@ -81,7 +85,7 @@
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
-        registration = self.pool.get('event.registration')
+        registration = self.pool.get('event.registration_attendee')
         reg_ids = registration.search(cr, uid, [('event_id','in',ids)], context=context)
         for event_reg in registration.browse(cr,uid,reg_ids,context=context):
             if event_reg.state == 'done':
@@ -93,7 +97,7 @@
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def confirm_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         for event in self.browse(cr, uid, ids, context=context):
             if event.email_confirmation_id:
             #send reminder that will confirm the event for all the people that were already confirmed
@@ -116,7 +120,7 @@
         res = {}
         for event_id in ids:
             res[event_id] = {key:0 for key in keys.values()}
-        query = "SELECT state, sum(nb_register) FROM event_registration WHERE event_id = %s AND state IN ('draft','open','done') GROUP BY state"
+        query = "SELECT state, sum(nb_register) FROM event_registration_attendee WHERE event_id = %s AND state IN ('draft','open','done') GROUP BY state"
         for event in self.pool.get('event.event').browse(cr, uid, ids, context=context):
             cr.execute(query, (event.id,))
             reg_states = cr.fetchall()
@@ -132,14 +136,14 @@
         @return: Dictionary of function field values.
         """
         event_ids=set()
-        for registration in self.pool['event.registration'].browse(cr, uid, ids, context=context):
+        for registration in self.pool['event.registration_attendee'].browse(cr, uid, ids, context=context):
             event_ids.add(registration.event_id.id)
         return list(event_ids)
 
     def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
         """This functional fields compute if the current user (uid) is already subscribed or not to the event passed in parameter (ids)
         """
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = False
@@ -150,13 +154,74 @@
                         res[event.id]= True
                         continue
         return res
-    
+
     def _count_registrations(self, cr, uid, ids, field_name, arg, context=None):
         return {
             event.id: len(event.registration_ids)
             for event in self.browse(cr, uid, ids, context=context)
         }
 
+    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, date_begin, context=None):
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        section_result = [{'value': 0,
+                           'tooltip': (date_begin + relativedelta.relativedelta(days=i)).strftime('%d %B %Y'),
+                           } for i in range(0, self._period_number)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        field_col_info = obj._all_columns.get(groupby_field.split(':')[0])
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if field_col_info.column._type == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][3][2], pattern).date() + relativedelta.relativedelta(days=4)
+            timedelta = relativedelta.relativedelta(group_begin_date, date_begin)
+            section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
+        return section_result
+
+    def _count_registrations_per_day(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool['event.registration_attendee']
+        res = {}
+        for count in self.browse(cr, uid, ids, context=context):
+            res[count.id] = {}
+            date_begin = datetime.now().date() + relativedelta.relativedelta(days=-4)
+            date_end = datetime.today() + relativedelta.relativedelta(days=self._period_number - 1)
+            domain = [('event_id', '=', count.id), ('create_date', '>=', date_begin.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)), ('create_date', '<=', date_end.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT))]
+            res[count.id] = self.__get_bar_values(cr, uid, obj, domain, ['create_date','nb_register'], 'nb_register', 'create_date:day', date_begin, context=context)
+        return res
+
+    def _get_registered_seats(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for event in self.browse(cr, uid, ids, context=context):
+            data = []
+            group_obj = self.read_group(cr, uid, [('id','=',event.id)], ['seats_reserved', 'seats_max'], ['seats_reserved', 'seats_max'], context=context)
+            for group in group_obj:
+                data.append({'label' : 'Seat Reserved', 'value': group['seats_reserved']})
+                data.append({'label' : 'Seat Max', 'value': group['seats_max']})
+            res[event.id] = data
+        return res
+
+    def _get_sold_tickets(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for event in self.browse(cr, uid, ids, context=context):
+            data = []
+            group_obj = self.read_group(cr, uid, [('id','=',event.id)], ['seats_reserved', 'seats_unconfirmed'], ['seats_reserved', 'seats_unconfirmed'], context=context)
+            for group in group_obj:
+                data.append({'label' : 'Sold Tickets', 'value': group['seats_reserved']})
+                data.append({'label' : 'Unconfirmed Tickets', 'value': group['seats_unconfirmed']})
+            res[event.id] = data
+        return res
+
     def _compute_date_tz(self, cr, uid, ids, fld, arg, context=None):
         if context is None:
             context = {}
@@ -180,19 +245,22 @@
         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'seats_min': fields.integer('Minimum Reserved Seats', oldname='register_min', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'seats_reserved': fields.function(_get_seats, oldname='register_current', string='Reserved Seats', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_available': fields.function(_get_seats, oldname='register_avail', string='Available Seats', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_unconfirmed': fields.function(_get_seats, oldname='register_prospect', string='Unconfirmed Seat Reservations', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_used': fields.function(_get_seats, oldname='register_attended', string='Number of Participations', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
-        'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
+        'seats_registered': fields.function(_get_registered_seats, string='Number of Seats Registered', type='string'),
+        'sold_ticket': fields.function(_get_sold_tickets, string='Sold Tickets on Unconfirmed Tickets', type='string'),
+        'registration_ids': fields.one2many('event.registration_attendee', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_tz': fields.selection(_tz_get, string='Timezone'),
+        'track_ids': fields.one2many('event.track', 'event_id', 'Tracks', readonly=False),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_begin_located': fields.function(_compute_date_tz, string='Start Date Located', type="datetime"),
@@ -218,6 +286,12 @@
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'organizer_id': fields.many2one('res.partner', "Organizer"),
         'count_registrations': fields.function(_count_registrations, type="integer", string="Registrations"),
+        'registration_per_day': fields.function(_count_registrations_per_day, type="string", string="Registrations per day"),
+        'location': fields.selection([("online", "Online Event"),
+                                      ("physical", "Physical Event")], "Location"),
+        'event_reminder_ids': fields.one2many('event.reminder', 'event_id', "Event Reminders"),
+        'attendee_ids': fields.one2many('event.registration_attendee', 'event_id', "Attendees"),
+        'color': fields.integer('Color Index'),
     }
     _defaults = {
         'state': 'draft',
@@ -226,6 +300,7 @@
         'organizer_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, context=c).company_id.partner_id.id,
         'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, context=c).company_id.partner_id.id,
         'date_tz': lambda self, cr, uid, ctx: ctx.get('tz', "UTC"),
+        'color': 0,
     }
 
     def _check_seats_limit(self, cr, uid, ids, context=None):
@@ -239,7 +314,7 @@
     ]
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         user_pool = self.pool.get('res.users')
         num_of_seats = int(context.get('ticket', 1))
         user = user_pool.browse(cr, uid, uid, context=context)
@@ -252,7 +327,7 @@
         return register_pool.confirm_registration(cr, SUPERUSER_ID, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         #the unsubscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to unsubscribe
         curr_reg_ids = register_pool.search(cr, SUPERUSER_ID, [('user_id', '=', uid), ('event_id', '=', ids[0])])
         return register_pool.button_reg_cancel(cr, SUPERUSER_ID, curr_reg_ids, context=context)
@@ -267,19 +342,13 @@
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
 
-    def onchange_event_type(self, cr, uid, ids, type_event, context=None):
-        values = {}
-        if type_event:
-            type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
-            dic ={
-              'reply_to': type_info.default_reply_to,
-              'email_registration_id': type_info.default_email_registration.id,
-              'email_confirmation_id': type_info.default_email_event.id,
-              'seats_min': type_info.default_registration_min,
-              'seats_max': type_info.default_registration_max,
-            }
-            values.update(dic)
-        return values
+    def onchange_event_type(self, cr, uid, ids, event_type_id, context=None):
+        event_reminder_ids = False
+        if event_type_id:
+            type_info =  self.pool.get('event.type').browse(cr, uid, event_type_id, context)
+            if type_info.default_email_event:
+                event_reminder_ids = [(0, 0, {'email_template': type_info.default_email_event.id,'unit': 'days', 'element': 'after_subscription' })]
+        return {'value': {'event_reminder_ids': event_reminder_ids}}
 
     def onchange_start_date(self, cr, uid, ids, date_begin=False, date_end=False, context=None):
         res = {'value':{}}
@@ -291,10 +360,35 @@
             res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
         return res
 
+    def send_reminder_mail(self, cr, uid, ids, template_id, context={}):
+        """
+        Send mail reminder to event attendees.
+        @param ids: ids of event.event.
+        @param template-id: id of the template to send
+        """
+        if not isinstance(ids, (tuple, list)):
+            ids = [ids]
+        res = False
+        vals = {}
+        mail_ids = []
+        mail_pool = self.pool.get('mail.mail')
+        mailmessage_pool = self.pool.get('mail.message')
+        emailtemplate_pool = self.pool.get('email.template')
+        for event in self.browse(cr, uid, ids, context=context):
+            for attendee in event.attendee_ids:
+                if attendee.email:
+                    mail_id = emailtemplate_pool.send_mail(cr, uid, template_id, attendee.id, context=context)
+                    vals['model'] = None  # We don't want to have the mail in the chatter while in queue!
+                    mailmessage = mail_pool.browse(cr, uid, mail_id, context=context).mail_message_id
+                    mailmessage_pool.write(cr, uid, [mailmessage.id], vals, context=context)
+                    mail_ids.append(mail_id)
+        if mail_ids:
+            res = mail_pool.send(cr, uid, mail_ids, context=context)
+        return res
 
 class event_registration(osv.osv):
     """Event Registration"""
-    _name= 'event.registration'
+    _name= 'event.registration_attendee'
     _description = __doc__
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
@@ -320,10 +414,12 @@
         'email': fields.char('Email', size=64),
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
+        'reminder_sended' : fields.boolean('Reminder sended', help="For the reminder linked to a subscription"),
     }
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
+        'reminder_sended': False,
     }
     _order = 'name, create_date desc'
 
@@ -417,4 +513,60 @@
             data.update(d['value'])
         return {'value': data}
 
+class event_reminder(osv.osv):
+    """ Event Reminder """
+
+    _name='event.reminder'
+
+    _columns = {
+        'number_unit': fields.integer('Number of units', help="number of unit."),
+        'unit': fields.selection([('days', 'Days'),
+                                  ('weeks', 'Weeks'),
+                                  ('months', 'Months')], string="Units", required=True, help="unit of the reminder (days, weeks, month)."),
+        'element' : fields.selection([('after_subscription', 'After Subscription'),
+                                    ('before_event', 'Before Event'),
+                                    ('after_event', 'After Event')], string="Element", required=True, help="(subscription or event)"),
+        'email_template': fields.many2one('email.template', 'Email Template', required=True, help="Email template to be send."),
+        'sended' : fields.boolean("Sended", help="Works for reminder linked to an event and not for a registration (see event.registration_attendee)"),
+        'event_id' : fields.many2one('event.event', 'Event ID'),
+    }
+
+    _defaults = {
+        'number_unit' : 1,
+        'sended' : False,
+    }
+
+    def _get_number_days(self, reminder):
+        if reminder.unit == "days":
+            return reminder.number_unit
+        if reminder.unit == "weeks":
+            return reminder.number_unit * 7
+        if reminder.unit == "months":
+            return reminder.number_unit * 30
+
+    def action_cron_reminder_event(self, cr, uid, context=None):
+        event_obj = self.pool.get('event.event')
+        for event in event_obj.browse(cr, uid, event_obj.search(cr, uid, [], context=context), context):
+            for reminder in event.event_reminder_ids:
+                if reminder.element == "after_subscription":
+                    for subs in event.attendee_ids:
+                        time_to_send = datetime.max
+                        if not subs.reminder_sended:
+                            time_to_send = datetime.strptime(subs.create_date, "%Y-%m-%d %H:%M:%S") + timedelta(days=self._get_number_days(reminder))
+                            if time_to_send < datetime.now():
+                                self.pool.get('event.event').send_reminder_mail(cr, uid, event.id, reminder.email_template.id, context=context)
+                                self.pool.get('event.registration_attendee').write(cr, uid, [subs.id], {'reminder_sended': True}, context=context)
+                else:
+                    for subs in event.attendee_ids:
+                        time_to_send = datetime.max
+                        if not reminder.sended:
+                            time_to_send = datetime.max
+                            if reminder.element == "before_event":
+                                time_to_send = datetime.strptime(reminder.event_id.date_begin, '%Y-%m-%d %H:%M:%S') - timedelta(days=self._get_number_days(reminder))
+                            elif reminder.element == "after_event":
+                                time_to_send = datetime.strptime(reminder.event_id.date_end, '%Y-%m-%d %H:%M:%S') + timedelta(days=self._get_number_days(reminder))
+                            if time_to_send < datetime.now():
+                                self.pool.get('event.event').send_reminder_mail(cr, uid, event.id, reminder.email_template.id, context=context)
+                                self.write(cr, uid, [reminder.id], {'sended': True}, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'event/event_data.xml'
--- event/event_data.xml	2012-12-05 05:37:32 +0000
+++ event/event_data.xml	2014-06-09 06:19:49 +0000
@@ -14,7 +14,7 @@
 
         <!-- Event-related subtypes for messaging / Chatter -->
         <record id="event.mt_event_registration" model="mail.message.subtype">
-            <field name="name">New Registration</field>
+            <field name="name">New Attendee</field>
             <field name="res_model">event.event</field>
             <field name="default" eval="False"/>
         </record>
@@ -26,5 +26,19 @@
             <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
             <value>Module Events has been installed</value>
         </function>
+
+        <!-- Scheduler for Event Reminder -->
+        <record forcecreate="True" id="ir_cron_event_reminder" model="ir.cron">
+            <field name="name">Event Reminder Cron Task</field>
+            <field name="active">True</field>
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False" />
+            <field name="model">event.reminder</field>
+            <field name="function">action_cron_reminder_event</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'event/event_demo.xml'
--- event/event_demo.xml	2014-01-27 13:58:28 +0000
+++ event/event_demo.xml	2014-06-09 06:19:49 +0000
@@ -32,7 +32,7 @@
         <field name="name">Open Days in Los Angeles</field>
         <field eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 8:00:00')" name="date_begin"/>
         <field eval="(DateTime.now() + timedelta(days=5)).strftime('%Y-%m-%d 18:00:00')" name="date_end"/>
-        <field name="seats_max">500</field>
+        <field name="seats_max">60</field>
         <field name="address_id" ref="base.res_partner_6"/>
         <field name="type" ref="event_type_1"/>
         <field name="description"><![CDATA[
@@ -78,7 +78,7 @@
         <field eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d 11:00:00')" name="date_end"/>
         <field name="type" ref="event_type_0"/>
         <field name="address_id" ref="base.res_partner_5"/>
-        <field name="seats_max">350</field>
+        <field name="seats_max">60</field>
         <field name="description"><![CDATA[
 <div class="oe_structure">
     <center><strong>Functional Webinar</strong></center>
@@ -113,7 +113,7 @@
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="address_id" ref="base.res_partner_14"/>
-        <field name="seats_max">200</field>
+        <field name="seats_max">55</field>
         <field name="description"><![CDATA[
 <div class="oe_structure">
     <center><strong>Conference on Business Applications</strong></center>
@@ -208,7 +208,7 @@
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
+    <record id="reg_1_1" model="event.registration_attendee">
         <field name="name">Agrolait</field>
         <field name="email">[e-mail]</field>
         <field name="phone">003281588558</field>
@@ -217,7 +217,7 @@
         <field name="nb_register">5</field>
     </record>
 
-    <record id="reg_1_2" model="event.registration">
+    <record id="reg_1_2" model="event.registration_attendee">
         <field name="name">ASUStek</field>
         <field name="email">[e-mail]</field>
         <field name="phone">+ 1 64 61 04 01</field>
@@ -226,7 +226,7 @@
         <field name="nb_register">10</field>
     </record>
 
-    <record id="reg_0_2" model="event.registration">
+    <record id="reg_0_2" model="event.registration_attendee">
         <field name="name">Camptocamp</field>
         <field name="email">[e-mail]</field>
         <field name="phone">[phone] </field>
@@ -235,5 +235,33 @@
         <field name="nb_register">5</field>
     </record>
 
+    <record id="event_reminder_rec0" model="event.reminder">
+            <field name="email_template" ref="event.confirmation_event"/>
+            <field name="unit">days</field>
+            <field name="element">after_subscription</field>
+            <field name="event_id" ref="event_0"/>
+    </record>
+
+    <record id="event_reminder_rec1" model="event.reminder">
+            <field name="email_template" ref="event.confirmation_event"/>
+            <field name="unit">days</field>
+            <field name="element">after_subscription</field>
+            <field name="event_id" ref="event_1"/>
+    </record>
+
+    <record id="event_reminder_rec2" model="event.reminder">
+            <field name="email_template" ref="event.confirmation_event"/>
+            <field name="unit">days</field>
+            <field name="element">after_subscription</field>
+            <field name="event_id" ref="event_2"/>
+    </record>
+
+    <record id="event_reminder_rec3" model="event.reminder">
+            <field name="email_template" ref="event.confirmation_event"/>
+            <field name="unit">days</field>
+            <field name="element">after_subscription</field>
+            <field name="event_id" ref="event_3"/>
+    </record>
+
     </data>
 </openerp>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2014-05-12 07:23:31 +0000
+++ event/event_view.xml	2014-06-09 06:19:49 +0000
@@ -3,7 +3,7 @@
     <data>
 
         <record id="act_event_list_register_event" model="ir.actions.act_window">
-            <field name="res_model">event.registration</field>
+            <field name="res_model">event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="name">Registrations</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -23,9 +23,9 @@
                         <field name="name"/>
                         <field name="default_reply_to"/>
                         <field name="default_registration_min"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration_attendee')]"/>
                         <field name="default_registration_max"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration_attendee')]"/>
                     </group>
                 </form>
             </field>
@@ -80,74 +80,45 @@
                         </div>
                         <group name="main_field_group">
                             <group>
-                                <field name="address_id" context="{'show_address': 1}" options='{"always_reload": True}'/>
+                                <field name="location" widget="radio"/>
+                                <field name="address_id" context="{'show_address': 1}" options='{"always_reload": True}' attrs="{'invisible':[('location', '!=', 'physical')]}" string=" "/>
+                                <field name="date_begin" string="Event Date" on_change="onchange_start_date(date_begin,date_end)"/>
+                                <field name="date_end" string=" "/>
+                                <field name="date_tz" />
+                            </group>
+                            <group>
                                 <field name="organizer_id"/>
+                                <field name="user_id" string="Event manager"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
-                            <group>
-                                <field name="user_id"/>
-                                <field name="type" on_change="onchange_event_type(type,context)" />
-                                <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
-                                <field name="date_end"/>
-                                <field name="date_tz" />
-                            </group>
                         </group>
                         <notebook>
-                            <page string="Registrations">
+                            <page string="Advanced">
                                 <group>
                                     <group>
-                                        <field name="seats_min"/>
-                                        <field name="seats_max"/>
-                                        <label for="seats_reserved" string="Current Registrations" groups="base.group_user"/>
-                                        <div groups="base.group_user">
-                                             <field name="seats_unconfirmed" class="oe_inline"/> (confirmed: <field name="seats_reserved" class="oe_inline"/>)
-                                        </div>
-                                        <field name="seats_used"/>
+                                        <field name="type" string="Type of Event" on_change="onchange_event_type(type)"/>
                                     </group>
-                                </group>
-                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user" context="{'event_id': active_id}">
-                                    <tree string="Registration" editable="top">
-                                        <field name="name" />
-                                        <field name="email" />
-                                        <field name="phone"/>
-                                        <field name="nb_register" />
-                                        <field name="state"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </tree>
-                                    <form string="Registration">
-                                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                        <field name="name"/>
-                                        <group colspan="4" col="4">
-                                        <field name="email"/>
-                                        <field name="phone"/>
-                                        </group>
-                                        <group colspan="4" col="4">
-                                            <field name="nb_register"/>
-                                        </group>
-                                        <group colspan="4" col="4">
-                                        </group>
-                                            <group col="8" colspan="4">
-                                                <separator string="" colspan="4"/>
-                                                <newline/>
-                                                <field name="state" colspan="2"/>
-                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                            </group>
-                                    </form>
-                                </field>
-                            </page>
-                            <page string="Description">
-                                <field name="description" nolabel="1" placeholder="Event Description..."/>
-                            </page>
-                            <page string='Event Details' groups="base.group_no_one">
-                                <group colspan="4">
-                                    <field name="reply_to"/>
-                                    <field name="email_registration_id"/>
-                                    <field name="email_confirmation_id"/>
-                                </group>
+                                    <group/>
+                                </group>
+                                <!-- Automate reminders -->
+                                <group>
+                                    <field name="event_reminder_ids" string="Automate Reminders" context="{'default_event_id': active_id}">
+                                        <tree editable="top">
+                                            <field name="email_template" string="Email To Send" />
+                                            <field name="number_unit" string="Timing" />
+                                            <field name="unit" string="" />
+                                            <field name="element" string="When" />
+                                        </tree>
+                                    </field>
+                                </group>
+                                <!-- Manage sales in event_sale_view.xml -->
+                                <div class="manageSales" />
+                            </page>
+                            <page string="Event Management" invisible="1">
+                                <!-- Ticket and seat management -->
+                                <div name="ticket_management"/>
+                                <!-- Event Promotion and Visibility -->
+                                <div name="promotion"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -187,61 +158,83 @@
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="type"/>
                     <field name="user_id"/>
                     <field name="is_subscribed"/>
                     <field name="country_id"/>
                     <field name="date_begin"/>
                     <field name="state"/>
+                    <field name="color"/>
                     <field name="seats_max"/>
                     <field name="seats_reserved"/>
                     <field name="seats_available"/>
+                    <field name="seats_unconfirmed"/>
+                    <field name="count_registrations"/>
                     <templates>
                     <t t-name="kanban-box">
-                      <div class="oe_module_vignette">
-                        <a type="open" class="oe_module_icon">
-                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
-                            <div class="oe_event_month_year">
-                                <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
-                                <t t-esc="record.date_begin.raw_value.getFullYear()"/>
-                            </div>
-                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
-                        </a>
-                        <div class="oe_module_desc">
-                            <h4><a type="open"><field name="name"/></a></h4>
-                            <p>
-                              <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
-                              <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
-                              <t t-if="record.seats_available.raw_value lte 10 and record.seats_available.raw_value gt 0"><i>Only</i></t>
-                              <t t-if="!record.seats_max.raw_value"><i>No ticket available.</i></t>
-                              <t t-if="record.seats_max.raw_value">
-                                <i t-if="record.seats_available.raw_value">
-                                    <b><field name="seats_available"/></b>
-                                    <t t-if="record.seats_available.raw_value > 1">tickets </t>
-                                    <t t-if="record.seats_available.raw_value lte 1">ticket </t>
-                                    available.
-                                </i>
-                              </t>
-                            </p>
-                            <div groups="base.group_user,base.group_portal">
-                                <t t-if="record.seats_available.raw_value gt 0 and record.seats_max.raw_value">
-                                  <t t-if="!record.is_subscribed.raw_value">
-                                    <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                    <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
-                                        <span >Subscribe</span>
-                                    </button>
-                                  </t>
-                                </t>
-                                <t t-if="record.is_subscribed.raw_value">
-                                  <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
-                                    <span>Subscribed</span>
-                                    <span class="oe_unsubscribe">Unsubscribe</span>
-                                  </button>
-                                </t>
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_event oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban oe_custom">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')">
+                                        <li><a type="edit">Edit...</a></li>
+                                    </t>
+                                    <t t-if="widget.view.is_action_enabled('delete')">
+                                        <li><a type="delete">Delete</a></li>
+                                    </t>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                </ul>
+                            </div>
+                            <div class = "oe_kanban_content">
+                                <!-- Module Icon -->
+                                <a type="open" class="oe_module_icon">
+                                    <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+                                    <div class="oe_event_month_year">
+                                        <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+                                        <t t-esc="record.date_begin.raw_value.getFullYear()"/>
+                                    </div>
+                                    <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+                                </a>
+                                <div class="oe_module_desc">
+                                    <h4><a type="open"><field name="name"/></a></h4>
+                                    <p>
+                                        <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
+                                    </p>
+                                    <p>
+                                        <t t-if="record.seats_reserved.raw_value">
+                                            <a name="%(act_event_list_register_event)d" type="action">
+                                                <b><field name="seats_reserved"/></b>
+                                                <t t-if="record.seats_reserved.raw_value > 1">Attendees</t>
+                                                <t t-if="record.seats_reserved.raw_value lte 1">Attendee</t>
+                                            </a>
+                                        </t>
+                                        <a name="%(event.action_report_event_attendees)d" type="action" class="oe_right oe_sparkline_bar_link">
+                                            <field name="registration_per_day" widget="sparkline_bar"
+                                                options="{'barWidth': 6, 'barSpacing': 2, 'tooltip_suffix': 'Attendees'}"></field>
+                                        </a>
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div t-if="record.seats_available.raw_value and record.seats_reserved.raw_value" class="row col-md-7" groups="event_sale.group_event_manage_tickets">
+                                    <div>
+                                        <field name="seats_registered" widget="event_graph"/>
+                                    </div>
+                                    <div class="row text-center oe_event_graph_description">
+                                        <strong><span>Real Attendees on Maximum Available</span></strong>
+                                    </div>
+                                </div>
+                                <div t-if="record.seats_reserved.raw_value or record.seats_unconfirmed.raw_value" class="row col-md-7" groups="event_sale.group_event_manage_tickets">
+                                    <div>
+                                        <field name="sold_ticket" widget="event_graph"/>
+                                    </div>
+                                    <div class="row text-center oe_event_graph_description">
+                                        <strong><span>Unconfirmed from sold tickets</span></strong>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-                      </div>
                     </t>
                     </templates>
                 </kanban>
@@ -314,7 +307,7 @@
         <act_window
             id="act_register_event_partner"
             name="Subscribe"
-            res_model="event.registration"
+            res_model="event.registration_attendee"
             src_model="res.partner"
             view_mode="tree,form,calendar,graph"
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
@@ -326,16 +319,15 @@
 
 
         <record model="ir.ui.view" id="view_event_registration_tree">
-            <field name="name">event.registration.tree</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.tree</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <tree string="Registration" fonts="bold:message_unread==True">
                     <field name="create_date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Customer"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
-                    <field name="nb_register"/>
                     <field name="user_id" invisible="1"/>
                     <field name="origin"/>
                     <field name="state"/>
@@ -348,8 +340,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_form">
-            <field name="name">event.registration.form</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.form</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <form string="Event Registration" version="7.0">
                     <header>
@@ -397,8 +389,8 @@
 
          <!-- Calendar view of event registration -->
         <record id="view_event_registration_calendar" model="ir.ui.view">
-            <field name="name">event.registration.calendar</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.calendar</field>
+            <field name="model">event.registration_attendee</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="event_id" date_start="event_begin_date" date_stop="event_end_date" string="Event Registration">
@@ -410,7 +402,7 @@
 
         <record model="ir.ui.view" id="view_event_registration_graph">
             <field name="name">Registration Graph</field>
-            <field name="model">event.registration</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <graph string="Registration" type="bar">
                     <field name="event_id" type="row"/>
@@ -423,7 +415,7 @@
         <!-- Search view of event registration -->
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
-            <field name="model">event.registration</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|',('name','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
@@ -449,8 +441,8 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_registration">
-          <field name="name">Registrations</field>
-          <field name="res_model">event.registration</field>
+          <field name="name">Attendees</field>
+          <field name="res_model">event.registration_attendee</field>
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form,calendar,graph</field>
@@ -458,7 +450,7 @@
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
 
-        <menuitem name="Registrations"
+        <menuitem name="Attendees"
             id="menu_action_registration" parent="event.event_main_menu"
             action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
 

=== modified file 'event/report/report_event_registration.py'
--- event/report/report_event_registration.py	2014-03-10 14:36:00 +0000
+++ event/report/report_event_registration.py	2014-06-09 06:19:49 +0000
@@ -22,8 +22,8 @@
 from openerp.osv import fields, osv
 from openerp import tools
 
-class report_event_registration(osv.osv):
-    _name = "report.event.registration"
+class report_event_registration_attendee(osv.osv):
+    _name = "report.event.registration_attendee"
     _description = "Events Analysis"
     _auto = False
     _columns = {
@@ -47,10 +47,10 @@
         """
         Initialize the sql view for the event registration
         """
-        tools.drop_view_if_exists(cr, 'report_event_registration')
+        tools.drop_view_if_exists(cr, 'report_event_registration_attendee')
 
         # TOFIX this request won't select events that have no registration
-        cr.execute(""" CREATE VIEW report_event_registration AS (
+        cr.execute(""" CREATE VIEW report_event_registration_attendee AS (
             SELECT
                 e.id::varchar || '/' || coalesce(r.id::varchar,'') AS id,
                 e.id AS event_id,
@@ -68,7 +68,7 @@
                 r.state AS registration_state
             FROM
                 event_event e
-                LEFT JOIN event_registration r ON (e.id=r.event_id)
+                LEFT JOIN event_registration_attendee r ON (e.id=r.event_id)
 
             GROUP BY
                 event_id,

=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml	2014-03-05 10:17:37 +0000
+++ event/report/report_event_registration_view.xml	2014-06-09 06:19:49 +0000
@@ -3,8 +3,8 @@
     <data>
 
         <record model ="ir.ui.view" id="report_event_registration_graph">
-            <field name="name">report.event.registration.graph</field>
-            <field name="model">report.event.registration</field>
+            <field name="name">report.event.registration_attendee.graph</field>
+            <field name="model">report.event.registration_attendee</field>
             <field name="arch" type="xml">
                 <graph string="Event on Registration"  type="pivot" >
                     <field name="event_type" type="row"/>
@@ -17,8 +17,8 @@
 
         <!-- Event on Registration search view -->
         <record model="ir.ui.view" id="view_report_event_registration_search">
-            <field name="name">report.event.registration.search</field>
-            <field name="model">report.event.registration</field>
+            <field name="name">report.event.registration_attendee.search</field>
+            <field name="model">report.event.registration_attendee</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
@@ -55,7 +55,7 @@
 
         <record model="ir.actions.act_window" id="action_report_event_registration">
             <field name="name">Events Analysis</field>
-            <field name="res_model">report.event.registration</field>
+            <field name="res_model">report.event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
             <field name="search_view_id" ref="view_report_event_registration_search"/>
@@ -69,6 +69,16 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
         </record>
 
+        <record id="action_report_event_attendees" model="ir.actions.act_window">
+           <field name="name">Events Analysis</field>
+           <field name="res_model">report.event.registration_attendee</field>
+           <field name="context">{"search_default_event_id":active_id}</field>
+           <field name="view_mode">graph</field>
+           <field name="view_id" ref="event.view_report_event_registration_search"/>
+           <field name="domain">[]</field>
+           <field name="help"></field>
+        </record>
+
         <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
         <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
 

=== added file 'event/res_config_view.xml'
--- event/res_config_view.xml	1970-01-01 00:00:00 +0000
+++ event/res_config_view.xml	2014-06-09 06:19:49 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_event_config" model="ir.ui.view">
+            <field name="name">Configure Events</field>
+            <field name="model">marketing.config.settings</field>
+            <field name="inherit_id" ref="marketing.view_marketing_configuration"/>
+            <field name="arch" type="xml">
+                <div name="lead automation" position="before">
+                    <div name="event_management" invisible="1">
+                        <separator string="Event Management"/>
+                        <group>
+                            <label for="id" string="Event Management"/>
+                            <div>
+                                <div name="event_sale_manage_tickets"/>
+                                <div name="website_event_promotion"/>
+                            </div>
+                        </group>
+                    </div>
+                </div>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'event/security/event_security.xml'
--- event/security/event_security.xml	2013-10-27 12:31:04 +0000
+++ event/security/event_security.xml	2014-06-09 06:19:49 +0000
@@ -38,7 +38,7 @@
         </record>
         <record model="ir.rule" id="event_registration_company_rule">
             <field name="name">Event/Registration: multi-company</field>
-            <field name="model_id" ref="model_event_registration"/>
+            <field name="model_id" ref="model_event_registration_attendee"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',
                                             ('company_id', '=', False),
@@ -48,7 +48,7 @@
         </record>
         <record model="ir.rule" id="report_event_registration_company_rule">
             <field name="name">Event/Report Registration: multi-company</field>
-            <field name="model_id" ref="model_report_event_registration"/>
+            <field name="model_id" ref="model_report_event_registration_attendee"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',
                                             ('company_id', '=', False),

=== modified file 'event/security/ir.model.access.csv'
--- event/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ event/security/ir.model.access.csv	2014-06-09 06:19:49 +0000
@@ -2,7 +2,8 @@
 access_event_type,event.type,model_event_type,event.group_event_user,1,0,0,0
 access_event_type_manager,event.type manager,model_event_type,event.group_event_manager,1,1,1,1
 access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,1
-access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,1
-access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
+access_event_registration_attendee,event.registration_attendee,model_event_registration_attendee,event.group_event_user,1,1,1,1
+access_report_event_registration_attendee,report.event.registration_attendee,model_report_event_registration_attendee,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0
-access_event_registration_portal,event.registration,model_event_registration,,1,0,0,0
+access_event_registration_attendee_portal,event.registration_attendee,model_event_registration_attendee,,1,0,0,0
+access_event_reminder,event.reminder,model_event_reminder,,1,1,1,1

=== modified file 'event/static/src/css/event.css'
--- event/static/src/css/event.css	2012-11-29 22:26:45 +0000
+++ event/static/src/css/event.css	2014-06-09 06:19:49 +0000
@@ -1,3 +1,7 @@
+.openerp .oe_kanban_event {
+  width: 325px;
+  min-height: 290px !important;
+}
 .oe_event_date{
   border-top-left-radius:3px;
   border-top-right-radius:3px;
@@ -9,6 +13,7 @@
   color: #FFFFFF;
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   background-color: #8A89BA;
+  margin-right: 0px !important;
 }
 .oe_event_time{
   border-bottom-left-radius:3px;
@@ -31,23 +36,7 @@
   color: #FFFFFF;
   background-color: #8A89BA;
 }
-
-.no_of_seats{
-    width:35px;
-}
-
-.oe_mapbox
-{ 
-    position: relative;
-    float: right;
-    height:200px;
-    width:256px;
-    border: 1px solid #eeeeee;
-}
-.oe_unsubscribe, .oe_unsubscribe_button:hover span {
-   display: none;
- }
-.oe_unsubscribe_button:hover .oe_unsubscribe {
-   display: inline;
- }
-
+.oe_event_graph_description {
+  width:175px;
+  margin-left: -5px;
+}

=== added directory 'event/static/src/js'
=== added file 'event/static/src/js/event.js'
--- event/static/src/js/event.js	1970-01-01 00:00:00 +0000
+++ event/static/src/js/event.js	2014-06-09 06:19:49 +0000
@@ -0,0 +1,29 @@
+openerp.event = function (instance) {
+    var _t = instance.web._t;
+    var _lt = instance.web._lt;
+
+    instance.web_kanban.EventGraph = instance.web_kanban.AbstractField.extend({
+        start: function() {
+            this.display_graph(this.field.raw_value);
+        },
+        display_graph : function(data) {
+            var self = this;
+            nv.addGraph(function () {
+                self.$el.append('<svg>');
+                var chart = nv.models.pieChart()
+                    .x(function(d) { return d.label; })
+                    .y(function(d) { return d.value; })
+                    .showLabels(false)
+                    .showLegend(false)
+                    .width(170)
+                    .height(170);
+                self.svg = self.$el.find('svg')[0];
+                d3.select(self.svg)
+                    .datum(data)
+                    .transition().duration(350)
+                    .call(chart);
+            });
+        },
+    });
+    instance.web_kanban.fields_registry.add("event_graph", "instance.web_kanban.EventGraph");
+};
\ No newline at end of file

=== modified file 'event/test/process/event_draft2done.yml'
--- event/test/process/event_draft2done.yml	2014-01-27 13:58:28 +0000
+++ event/test/process/event_draft2done.yml	2014-06-09 06:19:49 +0000
@@ -18,14 +18,14 @@
 -
   I create a registration for the event
 -
-  !record {model: event.registration, id: event_registration1}:
+  !record {model: event.registration_attendee, id: event_registration1}:
    event_id: event_event
    name: test_confirm
    nb_register: 10
 -
   I create a second registration for the same event
 -
-   !record {model: event.registration, id: event_registration2}:
+   !record {model: event.registration_attendee, id: event_registration2}:
     event_id: event_event
     name: test_cancel
     nb_register: 5
@@ -37,13 +37,13 @@
 -
    I confirm the registration1
 -
-   !python {model: event.registration}: |
+   !python {model: event.registration_attendee}: |
      event_pool = self.pool.get("event.event")
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"
 -
-   !assert {model: event.registration, id: event_registration1}:
+   !assert {model: event.registration_attendee, id: event_registration1}:
      - state == 'open', "registration should be confirmed."
 -
    I check if the number of confirmed registration is correct
@@ -53,12 +53,12 @@
 -
    I close the registration
 -
-   !python {model: event.registration}: |
+   !python {model: event.registration_attendee}: |
      self.button_reg_close(cr, uid, [ref("event_registration1")],context=context)
 -
     I check if registration is correctly finnished
 -
-  !assert {model: event.registration, id: event_registration1}:
+  !assert {model: event.registration_attendee, id: event_registration1}:
       - state == 'done'
 -
    I check if attended registration is correct
@@ -68,12 +68,12 @@
 -
     I cancel the second registration
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     self.button_reg_cancel(cr, uid, [ref("event_registration2")],context=context)
 -
     I Check that registration is cancelled
 -
-  !assert {model: event.registration, id: event_registration2}:
+  !assert {model: event.registration_attendee, id: event_registration2}:
     - state == 'cancel', "Registration should be cancelled."
 -
     I confirm the event
@@ -110,7 +110,7 @@
 -
   I create a registration for the event
 -
-  !record {model: event.registration, id: event_registration_cancel}:
+  !record {model: event.registration_attendee, id: event_registration_cancel}:
    event_id: event_event1
    name: test_confirm_again
    nb_register: 5
@@ -127,5 +127,5 @@
 -
     I check if its registrations are cancelled too
 -
-  !assert {model: event.registration, id: event_registration_cancel}:
+  !assert {model: event.registration_attendee, id: event_registration_cancel}:
      - state == 'cancel', "Registration should be cancelled."

=== modified file 'event/test/ui/demo_data.yml'
--- event/test/ui/demo_data.yml	2012-11-29 22:26:45 +0000
+++ event/test/ui/demo_data.yml	2014-06-09 06:19:49 +0000
@@ -1,7 +1,7 @@
 -
   I create event registation record to call event onchange and partner onchange.
 -
-  !record {model: event.registration, id: reg_0_1}:
+  !record {model: event.registration_attendee, id: reg_0_1}:
     event_id: event_0
     partner_id: base.res_partner_1
     name: 'Ticket for Concert'
@@ -14,7 +14,7 @@
 -
   I call onchange event from event registration wizard. 
 -
-  !python {model: partner.event.registration}: |
+  !python {model: partner.event.registration_attendee}: |
     context.update({'active_id': ref("base.res_partner_5")})
     self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context)
 -
@@ -27,5 +27,5 @@
 -
   I call close registration process.
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     self.button_reg_close(cr, uid, [ref("reg_0_2")])

=== modified file 'event/test/ui/duplicate_event.yml'
--- event/test/ui/duplicate_event.yml	2011-11-28 09:11:58 +0000
+++ event/test/ui/duplicate_event.yml	2014-06-09 06:19:49 +0000
@@ -9,7 +9,7 @@
 -
   Copy of event registarion.
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     try:
       self.copy(cr, uid, ref("reg_1_1"))
     except:

=== modified file 'event/views/event.xml'
--- event/views/event.xml	2014-04-24 17:21:29 +0000
+++ event/views/event.xml	2014-06-09 06:19:49 +0000
@@ -6,6 +6,7 @@
         <template id="assets_backend" name="event assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/event/static/src/css/event.css"/>
+                <script type="text/javascript" src="/event/static/src/js/event.js"></script>
             </xpath>
         </template>
     </data>

=== modified file 'event_sale/__init__.py'
--- event_sale/__init__.py	2012-02-28 10:59:06 +0000
+++ event_sale/__init__.py	2014-06-09 06:19:49 +0000
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import event_sale
+import res_config

=== modified file 'event_sale/__openerp__.py'
--- event_sale/__openerp__.py	2013-11-26 16:14:24 +0000
+++ event_sale/__openerp__.py	2014-06-09 06:19:49 +0000
@@ -42,6 +42,8 @@
     'data': [
         'event_sale_view.xml',
         'event_sale_data.xml',
+        'security/event_sale_security.xml',
+        'res_config_view.xml',
     ],
     'demo': ['event_demo.xml'],
     'test': ['test/confirm.yml'],

=== modified file 'event_sale/event_sale.py'
--- event_sale/event_sale.py	2014-05-02 14:01:52 +0000
+++ event_sale/event_sale.py	2014-06-09 06:19:49 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp.addons.web.http import request
 from openerp.addons.event.event import event_event as Event
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -91,7 +92,7 @@
         '''
         if context is None:
             context = {}
-        registration_obj = self.pool.get('event.registration')
+        registration_obj = self.pool.get('event.registration_attendee')
         for order_line in self.browse(cr, uid, ids, context=context):
             if order_line.event_id:
                 dic = {
@@ -113,6 +114,7 @@
                 context.update({'mail_create_nolog': True})
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
+
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
 
     def onchange_event_ticket_id(self, cr, uid, ids, event_ticket_id=False, context=None):
@@ -141,15 +143,27 @@
             pass
         return []
 
+    def action_get_sale_order_for_event(self, cr, uid, ids, context=None):
+        sale_order_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('event_id', 'in', ids)])
+        return {
+            'name': 'History of order',
+            'view_type': 'form',
+            'view_mode': 'tree, form',
+            'res_model': 'sale.order',
+            'target': 'new',
+            'type': 'ir.actions.act_window',
+            'domain': [('order_line', 'in', sale_order_line_ids)],
+        }
+
     def _get_ticket_events(self, cr, uid, ids, context=None):
         # `self` is the event.event.ticket model when called by ORM! 
         return list(set(ticket.event_id.id
                             for ticket in self.browse(cr, uid, ids, context)))
 
     # proxy method, can't import parent method directly as unbound_method: it would receive
-    # an invalid `self` <event_registration> when called by ORM
+    # an invalid `self` <event_registration_attendee> when called by ORM
     def _events_from_registrations(self, cr, uid, ids, context=None):
-        # `self` is the event.registration model when called by ORM
+        # `self` is the event.registration_attendee model when called by ORM
         return self.pool['event.event']._get_events_from_registrations(cr, uid, ids, context=context)
 
     _columns = {
@@ -159,11 +173,12 @@
             help="The maximum registration level is equal to the sum of the maximum registration of event ticket." +
             "If you have too much registrations you are not able to confirm your event. (0 to ignore this rule )",
             type='integer',
+            store={'event.event': (lambda self, cr, uid, ids, context={}: ids, ['event_ticket_ids'], 20)},
             readonly=True),
         'seats_available': fields.function(Event._get_seats, oldname='register_avail', string='Available Seats',
                                            type='integer', multi='seats_reserved',
                                            store={
-                                              'event.registration': (_events_from_registrations, ['state'], 10),
+                                              'event.registration_attendee': (_events_from_registrations, ['state'], 10),
                                               'event.event': (lambda self, cr, uid, ids, c = {}: ids,
                                                               ['seats_max', 'registration_ids'], 20),
                                               'event.event.ticket': (_get_ticket_events, ['seats_max'], 10),
@@ -175,6 +190,7 @@
 
 class event_ticket(osv.osv):
     _name = 'event.event.ticket'
+    _order = 'price'
 
     def _get_seats(self, cr, uid, ids, fields, args, context=None):
         """Get reserved, available, reserved but unconfirmed and used seats for each event tickets.
@@ -204,8 +220,8 @@
         'name': fields.char('Name', size=64, required=True, translate=True),
         'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_type_id", "!=", False)]),
-        'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'),
-        'deadline': fields.date("Sales End"),
+        'registration_ids': fields.one2many('event.registration_attendee', 'event_ticket_id', 'Registrations'),
+        'deadline': fields.date("End of Sales"),
         'is_expired': fields.function(_is_expired, type='boolean', string='Is Expired'),
         'price': fields.float('Price'),
         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )"),
@@ -243,7 +259,7 @@
 
 class event_registration(osv.osv):
     """Event Registration"""
-    _inherit= 'event.registration'
+    _inherit= 'event.registration_attendee'
     _columns = {
         'event_ticket_id': fields.many2one('event.event.ticket', 'Event Ticket'),
     }

=== modified file 'event_sale/event_sale_data.xml'
--- event_sale/event_sale_data.xml	2013-11-26 16:14:24 +0000
+++ event_sale/event_sale_data.xml	2014-06-09 06:19:49 +0000
@@ -18,8 +18,18 @@
             <field name="event_type_id" ref="event_sale.event_type"/>
         </record>
 
+        <record id="product_product_event_free" model="product.product">
+            <field name="list_price">0.0</field>
+            <field name="event_ok" eval="True"/>
+            <field name="standard_price">0.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="name">Free</field>
+            <field name="categ_id" ref="product.product_category_all"/>
+            <field name="type">service</field>
+            <field name="event_type_id" ref="event_sale.event_type"/>
+        </record>
+
     </data>
 </openerp>
 
-
-

=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml	2014-05-12 05:01:53 +0000
+++ event_sale/event_sale_view.xml	2014-06-09 06:19:49 +0000
@@ -18,8 +18,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_ticket_search">
-            <field name="name">event.registration.ticket.search</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.ticket.search</field>
+            <field name="model">event.registration_attendee</field>
             <field name="inherit_id" ref="event.view_registration_search" />
             <field name="arch" type="xml">
                 <filter name="group_event" position="after">
@@ -29,19 +29,19 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_ticket_tree">
-            <field name="name">event.registration.ticket.tree</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.ticket.tree</field>
+            <field name="model">event.registration_attendee</field>
             <field name="inherit_id" ref="event.view_event_registration_tree" />
             <field name="arch" type="xml">
                 <field name="event_id" position="after">
-                    <field name="event_ticket_id"/>
+                    <field name="event_ticket_id" string="Ticket"/>
                 </field>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_ticket_form">
-            <field name="name">event.registration.ticket.form</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.ticket.form</field>
+            <field name="model">event.registration_attendee</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
@@ -90,27 +90,39 @@
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//notebook" position="inside">
-                        <page string="Ticket Types">
-                            <field name="event_ticket_ids" context="{'default_name': name}">
-                                <tree string="Payments" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="product_id" on_change='onchange_product_id(product_id)'/>
-                                    <field name="deadline"/>
-                                    <field name="price"/>
-                                    <field name="seats_max"/>
-                                    <field name="seats_reserved"/>
-                                    <field name="seats_unconfirmed"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </xpath>
-                    <field name="nb_register" position="after">
-                        <field name="event_ticket_id" domain="[('event_id', '=', context.get('event_id'))]"/>
-                    </field>
+                    <xpath expr="//notebook/page[@string='Event Management']" position="attributes">
+                        <attribute name="invisible">0</attribute>
+                    </xpath>
+                    <xpath expr="//notebook/page[@string='Event Management']/div[@name='ticket_management']" position="replace">
+                            <group string="Ticket and Seats Management" groups="event_sale.group_event_manage_tickets">
+                                <field name="seats_max" string="Maximum Registration" class="oe_inline" 
+                                    attrs="{'invisible':[('event_ticket_ids', '==', [])]}"/>
+                                <label for="seats_max" string="Maximum Registration" class="oe_inline" attrs="{'invisible':[('event_ticket_ids', '!=', [])]}"/>
+                                <span class="oe_inline oe_grey" attrs="{'invisible':[('event_ticket_ids', '!=', [])]}"> Unlimited</span>
+                            </group>
+                            <group name="Event Tickets" groups="event_sale.group_event_manage_tickets">
+                                <field name="event_ticket_ids" string="Manage tickets">
+                                    <tree editable="top">
+                                        <field name="name" />
+                                        <field name="product_id" string="Ticket" on_change='onchange_product_id(product_id)' context="{'default_event_ok': True}"/>
+                                        <field name="price"/>
+                                        <field name="seats_max" string="Quantity Available" />
+                                        <field name="deadline"/>
+                                    </tree>
+                                </field>
+                            </group>
+                    </xpath>
+                    <xpath expr="//notebook/page[@string='Advanced']/div[@class='manageSales']" position="replace">
+                        <group attrs="{'invisible':[('event_ticket_ids', '=', [])]}">
+                            <label for="action_get_sale_order_for_event" string="Manage Sales" states="confirm,done"/>
+                            <button string="History of Orders" type="object" name="action_get_sale_order_for_event" states="confirm,done" />
+                        </group>
+                    </xpath>
                </data>
+
             </field>
         </record>
 
     </data>
 </openerp>
+

=== added file 'event_sale/res_config.py'
--- event_sale/res_config.py	1970-01-01 00:00:00 +0000
+++ event_sale/res_config.py	2014-06-09 06:19:49 +0000
@@ -0,0 +1,11 @@
+
+from openerp.osv import fields, osv
+
+class event_config_settings(osv.osv_memory):
+    _inherit = 'marketing.config.settings'
+
+    _columns = {
+        'group_event_manage_tickets': fields.boolean('Manage Event Tickets',
+            implied_group='event_sale.group_event_manage_tickets',
+            help='Manage different kind of tickets: vip, free, ... '),
+    }

=== added file 'event_sale/res_config_view.xml'
--- event_sale/res_config_view.xml	1970-01-01 00:00:00 +0000
+++ event_sale/res_config_view.xml	2014-06-09 06:19:49 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_event_sale_config" model="ir.ui.view">
+            <field name="name">Configure Events</field>
+            <field name="model">marketing.config.settings</field>
+            <field name="inherit_id" ref="event.view_event_config"/>
+            <field name="arch" type="xml">
+                <div name="event_management" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </div>
+                <div name="event_sale_manage_tickets" position="replace">
+                    <div>
+                        <div name="manage_tickets">
+                            <field name="group_event_manage_tickets" class="oe_inline"/>
+                            <label for="group_event_manage_tickets"/>
+                        </div>
+                    </div>
+                </div>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'event_sale/security'
=== added file 'event_sale/security/event_sale_security.xml'
--- event_sale/security/event_sale_security.xml	1970-01-01 00:00:00 +0000
+++ event_sale/security/event_sale_security.xml	2014-06-09 06:19:49 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+       <record id="group_event_manage_tickets" model="res.groups">
+            <field name="name">Manage Event Tickets</field>
+            <field name="category_id" ref="base.module_category_hidden"/>
+       </record>
+
+</data>
+</openerp>
\ No newline at end of file

=== modified file 'event_sale/test/confirm.yml'
--- event_sale/test/confirm.yml	2012-11-29 22:26:45 +0000
+++ event_sale/test/confirm.yml	2014-06-09 06:19:49 +0000
@@ -45,7 +45,9 @@
 -
     I check if a registration is created
 -
-    !python {model: event.registration}: |
+    !python {model: event.registration_attendee}: |
+        from openerp.osv import osv
+        from openerp.tools.translate import _
         order_id = ref('order1')
         order =  self.pool.get('sale.order').browse(cr, uid,order_id)
         registration_ids = self.search(cr,uid,[('origin','=',order.name)])

=== modified file 'marketing/res_config_view.xml'
--- marketing/res_config_view.xml	2014-03-13 12:05:03 +0000
+++ marketing/res_config_view.xml	2014-06-09 06:19:49 +0000
@@ -12,26 +12,30 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Mass Mailing"/>
-                    <group>
-                        <label for="id" string="Settings"/>
-                        <div>
-                            <div name="module_mass_mailing">
-                                <field name="module_mass_mailing" class="oe_inline"/>
-                                <label for="module_mass_mailing"/>
-                            </div>
-                        </div>
-                    </group>
-                    <separator string="Marketing Campaigns"/>
-                    <group>
-                        <label for="id" string="Settings"/>
-                        <div>
-                            <div name="module_marketing_campaign">
-                                <field name="module_marketing_campaign" class="oe_inline"/>
-                                <label for="module_marketing_campaign"/>
-                            </div>
-                        </div>
-                    </group>
+                    <div name="mass mailing">
+                        <separator string="Mass Mailing"/>
+                        <group>
+                            <label for="id" string="Settings"/>
+                            <div>
+                                <div name="module_mass_mailing">
+                                    <field name="module_mass_mailing" class="oe_inline"/>
+                                    <label for="module_mass_mailing"/>
+                                </div>
+                            </div>
+                        </group>
+                    </div>
+                    <div name="lead automation">
+                        <separator string="Lead Automation"/>
+                        <group>
+                            <label for="id" string="Feature"/>
+                            <div>
+                                <div name="module_marketing_campaign">
+                                    <field name="module_marketing_campaign" class="oe_inline"/>
+                                    <label for="module_marketing_campaign" string="Automate leads acquisition"/>
+                                </div>
+                            </div>
+                        </group>
+                    </div>
                 </form>
             </field>
         </record>

=== modified file 'website_event/__openerp__.py'
--- website_event/__openerp__.py	2014-01-31 09:27:21 +0000
+++ website_event/__openerp__.py	2014-06-09 06:19:49 +0000
@@ -9,13 +9,14 @@
 Online Events
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'website_partner', 'website_mail', 'event'],
+    'depends': ['website', 'website_partner', 'website_mail', 'event', 'mass_mailing'],
     'data': [
         'data/event_data.xml',
         'views/website_event.xml',
         'views/website_event_sale_backend.xml',
         'security/ir.model.access.csv',
         'security/website_event.xml',
+        'views/res_config_view.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [

=== modified file 'website_event/models/__init__.py'
--- website_event/models/__init__.py	2014-01-28 11:31:01 +0000
+++ website_event/models/__init__.py	2014-06-09 06:19:49 +0000
@@ -1,1 +1,2 @@
 import event
+import res_config

=== added file 'website_event/models/res_config.py'
--- website_event/models/res_config.py	1970-01-01 00:00:00 +0000
+++ website_event/models/res_config.py	2014-06-09 06:19:49 +0000
@@ -0,0 +1,14 @@
+
+from openerp.osv import fields, osv
+
+class event_config_settings(osv.osv_memory):
+    _inherit = 'marketing.config.settings'
+
+    _columns = {
+        'group_publish_events': fields.boolean('Publish your event',
+            implied_group='website_event.group_publish_events',
+            help='Publish your event in the web.'),
+        'group_advanced_event_features': fields.boolean('Manage advanced event features',
+            implied_group='website_event.group_advanced_event_features',
+            help='Manage advanced event features like etracking, agenda, sponsors.'),
+    }

=== modified file 'website_event/security/website_event.xml'
--- website_event/security/website_event.xml	2014-01-28 11:31:01 +0000
+++ website_event/security/website_event.xml	2014-06-09 06:19:49 +0000
@@ -11,5 +11,18 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
+
+    <record id="group_publish_events" model="res.groups">
+        <field name="name">Publish your event</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_website_publisher'))]"/>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="group_advanced_event_features" model="res.groups">
+        <field name="name">Manage advanced event features</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+   
 </data>
 </openerp>
+

=== modified file 'website_event/static/src/js/website.tour.event.js'
--- website_event/static/src/js/website.tour.event.js	2014-03-20 08:30:55 +0000
+++ website_event/static/src/js/website.tour.event.js	2014-06-09 06:19:49 +0000
@@ -17,7 +17,7 @@
                 element:   '#content-menu-button',
                 placement: 'left',
                 title:     _t("Add Content"),
-                content:   _t("The <em>Content</em> menu allows you to create new pages, events, menus, etc."),
+                content:   _t("Use this <em>Content</em> menu to create a new event like any other document (page, menu, products, blog post, ...)"),
                 popover:   { fixed: true },
             },
             {
@@ -32,7 +32,7 @@
                 sampleText: 'Advanced Technical Training',
                 placement: 'right',
                 title:     _t("Create an Event Name"),
-                content:   _t("Create a name for your new event and click <em>'Continue'</em>. e.g: Technical Training"),
+                content:   _t("Add a name for your new event e.g: New product demo"),
             },
             {
                 waitNot:   '.modal input[type=text]:not([value!=""])',

=== added file 'website_event/views/res_config_view.xml'
--- website_event/views/res_config_view.xml	1970-01-01 00:00:00 +0000
+++ website_event/views/res_config_view.xml	2014-06-09 06:19:49 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_website_event_config" model="ir.ui.view">
+            <field name="name">Configure Events</field>
+            <field name="model">marketing.config.settings</field>
+            <field name="inherit_id" ref="event.view_event_config"/>
+            <field name="arch" type="xml">
+                <div name="event_management" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </div>
+                <div name="website_event_promotion" position="replace">
+                    <div>
+                        <field name="group_publish_events" class="oe_inline"/>
+                        <label for="group_publish_events"/>
+                    </div>
+                    <div>
+                        <field name="group_advanced_event_features" class="oe_inline"/>
+                        <label for="group_advanced_event_features"/>
+                    </div>
+                </div>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'website_event/views/website_event.xml'
--- website_event/views/website_event.xml	2014-05-09 20:27:53 +0000
+++ website_event/views/website_event.xml	2014-06-09 06:19:49 +0000
@@ -207,11 +207,16 @@
                     </ol>
                     <ol class="breadcrumb mb0" id="event_menu" t-if="event.menu_id">
                         <t t-foreach="event.menu_id.child_id" t-as="submenu">
-                            <t t-call="website.submenu"/>
+                            <t t-if="submenu.name not in ['Agenda', 'Location']">
+                                <t t-call="website.submenu"/>
+                            </t>
+                            <t t-if="submenu.name in ['Agenda', 'Location']" groups="website_event.group_advanced_event_features">
+                                <t t-call="website.submenu"/>
+                            </t>
                         </t>
                     </ol>
                 </div>
-                <div class="col-sm-5" groups="event.group_event_manager">
+                <div class="col-sm-5" groups="event.group_event_manager,website_event.group_publish_events">
                     <t t-call="website.publish_management">
                       <t t-set="object" t-value="event"/>
                       <t t-set="publish_edit" t-value="True"/>
@@ -299,6 +304,11 @@
                 </li>
             </ul>
         </div>
+        <div class="col-md-4 mb16">
+            <t t-call="website_mail.follow">
+                <t t-set="object" t-value="event"/>
+            </t>
+        </div>
         <div class="col-md-4 css_noprint">
             <div class="clearfix"/>
 
@@ -342,7 +352,6 @@
                     <h4>Social Stream</h4>
                 </div>
                 <div class="panel-body">
-                    <t t-call="website_mail.follow"><t t-set="object" t-value="event"/></t>
                     <div t-if="event.twitter_hashtag" class="mt16">
                         <p><strong>Participate on Twitter</strong></p>
                         <p class="text-muted">

=== modified file 'website_event/views/website_event_sale_backend.xml'
--- website_event/views/website_event_sale_backend.xml	2014-01-30 17:51:53 +0000
+++ website_event/views/website_event_sale_backend.xml	2014-06-09 06:19:49 +0000
@@ -2,18 +2,30 @@
 <openerp>
 <data>
 
-    <record model="ir.ui.view" id="view_event_sale_form">
+    <record id="action_view_mass_mailings1" model="ir.actions.act_window">
+        <field name="name">Mass Mailings</field>
+        <field name="res_model">mail.mass_mailing</field>
+        <field name="view_id" ref="mass_mailing.action_view_mass_mailings"/>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_form">
         <field name="name">event.event.website.form</field>
         <field name="model">event.event</field>
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
-            <!-- add state field in header -->
-            <xpath expr="//div[@class='oe_right oe_button_box']" position="before">
-                <field name="website_url" invisible="1"/>
-                <field name="website_published" class="pull-right" widget="website_button"/>
+            <xpath expr="//notebook/page[@string='Event Management']" position="attributes">
+                <attribute name="invisible">0</attribute>
             </xpath>
-            <xpath expr="//field[@name='organizer_id']" position="after">
-                <field name="twitter_hashtag"/>
+            <xpath expr="//notebook/page[@string='Event Management']/div[@name='promotion']" position="replace">
+                <group string="Event Promotion and Visibility">
+                    <field name="website_published" class="pull-left" widget="website_button" string=" " groups="website_event.group_publish_events"/>
+                    <field name="website_url" string="Publish" widget="url"/>
+                    <label for="%(action_view_mass_mailings1)d" />
+                    <button name="%(action_view_mass_mailings1)d" string="Send Invitation by Email" type="action" />
+                </group>
             </xpath>
         </field>
     </record>

=== modified file 'website_event_sale/__openerp__.py'
--- website_event_sale/__openerp__.py	2014-01-28 11:31:01 +0000
+++ website_event_sale/__openerp__.py	2014-06-09 06:19:49 +0000
@@ -17,7 +17,6 @@
         'security/ir.model.access.csv',
         'security/website_event_sale.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': True
 }

=== modified file 'website_event_sale/controllers/main.py'
--- website_event_sale/controllers/main.py	2014-05-13 09:35:45 +0000
+++ website_event_sale/controllers/main.py	2014-06-09 06:19:49 +0000
@@ -24,33 +24,68 @@
 from openerp.addons.web.http import request
 from openerp.addons.website_event.controllers.main import website_event
 from openerp.tools.translate import _
+from collections import OrderedDict, defaultdict
 
 
 class website_event(website_event):
 
+    @http.route(['/event/register/attendee'], type='http', auth="public", methods=['POST'], website=True)
+    def register_attendee(self, event_id, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        event_obj = request.registry.get('event.event').browse(cr, uid, int(event_id), context=context)
+        values = {
+            'post': OrderedDict(sorted(post.items())),
+            'event_id': event_id,
+            'event': event_obj 
+        }
+        return request.website.render("website_event_sale.event_attendee_registration", values)
+
     @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True)
     def cart_update(self, event_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         ticket_obj = request.registry.get('event.event.ticket')
+        attendees_list = []
+        dict_attendee = {}
+
+        attendee_obj = request.registry.get('event.registration_attendee')
+        for key, value in post.items():
+            if key.partition('-')[0] == "attendee":
+                dict_attendee[key] = value
 
         sale = False
-        for key, value in post.items():
-            quantity = int(value or "0")
+        attendees = defaultdict(lambda: defaultdict(lambda: defaultdict(dict)))
+        for key, value in dict_attendee.items():
+            splitted_key = key.rsplit('-')
+            quantity = int(splitted_key[4] or "0")
             if not quantity:
                 continue
             sale = True
-            ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
-            ticket = ticket_obj.browse(cr, SUPERUSER_ID, ticket_id, context=context)
-            request.website.sale_get_order(force_create=1)._cart_update(
-                product_id=ticket.product_id.id, add_qty=quantity, context=dict(context, event_ticket_id=ticket.id))
+            ticket_id = int(splitted_key[2])
+            context.update({'event': True})
+            if ticket_id != 0:
+                ticket = ticket_obj.browse(cr, SUPERUSER_ID, ticket_id, context=context)
+                request.website.sale_get_order(force_create=1)._cart_update(
+                    product_id=ticket.product_id.id, add_qty=quantity, context=dict(context, event_ticket_id=ticket.id))
+            else:
+                product_id = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'event_sale.product_product_event_free')
+                request.website.sale_get_order(force_create=1)._cart_update(
+                    product_id=product_id, add_qty=quantity, context=dict(context))
+            attendees[splitted_key[2]][splitted_key[3]][splitted_key[1]] = value
 
         if not sale:
             return request.redirect("/event/%s" % event_id)
+
+        for key1, value1 in attendees.items():
+            for key2, value2 in value1.items():
+                value2['event_id'] = event_id
+                attendees_list.append(dict(value2))
+
+        request.session['attendees_list'] = attendees_list
+
         return request.redirect("/shop/checkout")
 
     def _add_event(self, event_name="New Event", context={}, **kwargs):
         try:
-            print kwargs
             dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event')
             context['default_event_ticket_ids'] = [[0,0,{
                 'name': _('Subscription'),
@@ -63,5 +98,3 @@
             pass
         return super(website_event, self)._add_event(event_name, context, **kwargs)
 
-
-

=== modified file 'website_event_sale/models/sale_order.py'
--- website_event_sale/models/sale_order.py	2014-05-02 14:01:52 +0000
+++ website_event_sale/models/sale_order.py	2014-06-09 06:19:49 +0000
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from openerp.addons.web.http import request
 from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
@@ -47,3 +48,31 @@
             values['name'] = "%s: %s" % (ticket.event_id.name, ticket.name)
 
         return values
+
+class sale_order_line(osv.Model):
+    _inherit = 'sale.order.line'
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        '''
+        Updated attendees details in attendee form and sales order lines.
+        '''
+        if context is None:
+            context = {}
+        result = super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
+        attendee_obj = request.registry.get('event.registration_attendee')
+        if request.session.get('attendees_list', False) and request.session.get('attendees_list') != []:
+            sale_order_obj = request.registry.get('sale.order').browse(cr, uid, request.session.get('sale_order_id', False), context=context)
+            attendee_ids = request.registry.get('event.registration_attendee').search(cr, uid, [('origin', '=', sale_order_obj.name)])
+            attendee_ids.reverse()
+            for attendee, attendees_list in zip(attendee_obj.browse(cr, uid, attendee_ids, context=context), request.session.get('attendees_list', False)):
+                attendee_obj.write(cr, uid, [attendee.id], {
+                        'name': attendees_list['name'],
+                        'email': attendees_list['email'],
+                        'phone': attendees_list['phone']}, context=context)
+
+            ids.reverse()
+            for attendee, saleorder_line in zip(attendee_obj.browse(cr, uid, attendee_ids, context= context), self.browse(cr, uid, ids, context= context)):
+                values = saleorder_line.name + ' ( ' + attendee.name + ' )'
+                self.write(cr, uid, saleorder_line.id, {'name': values}, context=context)
+            request.session['attendees_list'] = []
+        return result

=== modified file 'website_event_sale/static/src/js/website.tour.event_sale.js'
--- website_event_sale/static/src/js/website.tour.event_sale.js	2014-04-14 08:48:33 +0000
+++ website_event_sale/static/src/js/website.tour.event_sale.js	2014-06-09 06:19:49 +0000
@@ -15,24 +15,38 @@
             },
             {
                 waitNot:   'a[href*="/event"]:contains("Conference on Business Applications")',
-                title:     "select 2 Standard tickets",
+                title:     "select 1 Standard ticket",
                 element:   'select:eq(0)',
-                sampleText: '2',
+                sampleText: '1',
             },
             {
-                title:     "select 3 VIP tickets",
-                waitFor:   'select:eq(0) option:contains(2):selected',
+                title:     "select 1 VIP ticket",
+                waitFor:   'select:eq(0) option:contains(1):selected',
                 element:   'select:eq(1)',
-                sampleText: '3',
-            },
-            {
-                title:     "Order Now",
-                waitFor:   'select:eq(1) option:contains(3):selected',
-                element:   '.btn-primary:contains("Order Now")',
+                sampleText: '1',
+            },
+            {
+                title:     "Select Attendees and Order",
+                waitFor:   'select:eq(1) option:contains(1):selected',
+                element:   '.btn-primary:contains("Select Attendees and Order")',
+            },
+            {
+                title:     "Fill attendees details",
+                element:   'form[action="/event/cart/update?event_id=3"] .btn:contains("Order Now")',
+                autoComplete: function (tour) {
+                    if ($("input[name='attendee-name-4-1-1']").val() === "")
+                        $("input[name='attendee-name-4-1-1']").val("StandardAttendee1");
+                    if ($("input[name='attendee-email-4-1-1']").val() === "")
+                        $("input[name='attendee-email-4-1-1']").val("[e-mail]");
+                    if ($("input[name='attendee-name-5-1-1']").val() === "")
+                        $("input[name='attendee-name-5-1-1']").val("VIPAttendee1");
+                    if ($("input[name='attendee-email-5-1-1']").val() === "")
+                        $("input[name='attendee-email-5-1-1']").val("[e-mail]");
+                },
             },
             {
                 title:     "Complete checkout",
-                waitFor:   '#top_menu .my_cart_quantity:contains(5)',
+                waitFor:   '#top_menu .my_cart_quantity:contains(2)',
                 element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                 autoComplete: function (tour) {
                     if ($("input[name='name']").val() === "")
@@ -63,3 +77,4 @@
     });
 
 }());
+

=== modified file 'website_event_sale/views/website_event_sale.xml'
--- website_event_sale/views/website_event_sale.xml	2014-05-02 14:01:52 +0000
+++ website_event_sale/views/website_event_sale.xml	2014-06-09 06:19:49 +0000
@@ -28,7 +28,7 @@
 
 <template id="event_description_full" inherit_id="website_event.event_description_full" inherit_option_id="website_event.event_description_full" name="Event's Ticket form">
     <xpath expr="//div[@t-field='event.description']" position="before">
-        <form t-attf-action="/event/cart/update?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
+        <form t-attf-action="/event/register/attendee?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
             <table itemprop="offers" class="table table-striped">
                 <thead>
                     <tr>
@@ -65,21 +65,103 @@
                             </span>
                         </td>
                         <td>
-                            <select t-if="ticket.seats_available" t-attf-name="ticket-#{ ticket.id }" class="form-control">
-                                <t t-foreach="range(0, ticket.seats_available > 9 and 10 or ticket.seats_available+1 )" t-as="nb"><option t-esc="nb"/></t>
+                            <select t-if="event.seats_available" t-attf-name="ticket-#{ ticket.id }-#{ ticket.name}" class="form-control" >
+                                <t t-foreach="range(0, event.seats_available > 9 and 10 or event.seats_available+1 )" t-as="nb">
+                                    <option t-esc="nb"/>
+                                </t>
                             </select>
-                            <span t-if="not ticket.seats_available">Sold Out</span>
+                            <span t-if="not event.seats_available">Sold Out</span>
                         </td>
                       </tr>
                     </t>
                 </tbody>
             </table>
-            <button type="submit" class="btn btn-primary btn-lg pull-right" t-if="event.seats_available">Order Now</button>
+            <button type="submit" t-if="event.seats_available" class="btn btn-primary btn-lg pull-right" >Select Attendees and Order</button>
             <div class="clearfix"/>
             <hr/>
         </form>
+        <form t-attf-id="form_noticket" t-attf-action="/event/register/attendee?event_id=#{ event.id }" method="post" t-if="not event.event_ticket_ids">
+            <table itemprop="offers" class="table table-striped">
+                <thead>
+                    <tr>
+                        <th>Ticket Type</th>
+                        <th>Quantity</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr itemscope="itemscope" itemtype="http://data-vocabulary.org/Offer">
+                        <td itemscope="itemscope" itemtype="http://data-vocabulary.org/Product">
+                            <span>Free</span>
+                        </td>
+                        <td>
+                            <select class="form-control" name='ticket-0-FREE'>
+                                <t t-foreach="range(0, 11)" t-as="nb"><option t-esc="nb"/></t>
+                            </select>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <button href="#" t-attf-class="btn btn-primary btn-lg pull-right">Subscribe to this Event</button>
+            <div class="clearfix"/>
+        </form>
     </xpath>
 </template>
 
+<template id="event_attendee_registration" name="Event Attendees">
+    <t t-call="website.layout">
+        <div class="col-md-offset-1 col-md-9 well" style="margin-bottom: 0px;">
+            <form t-attf-action="/event/cart/update?event_id=#{ event_id }" method="post">
+                <div itemscope="itemscope" itemtype="http://schema.org/Event">
+                    <h1 itemprop="name" class="text-center" t-field="event.name"></h1>
+                    <h4 class="text-center text-muted">
+                        <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.date_begin" t-field-options='{"hide_seconds":"True"}'/> to
+                        <span itemprop="endDate" t-field="event.date_end" t-field-options='{"hide_seconds":"True"}'/>
+                    </h4>
+                    <h4 class="text-center text-muted"
+                        t-field="event.address_id" t-field-options='{
+                        "widget": "contact",
+                        "fields": ["city"]
+                        }'/>
+                </div>
+                <table class="table">
+                    <t t-foreach="post" t-as="ticket">
+                        <t t-set="split_ticket" t-value="ticket.split('-')"></t>
+                        <t t-set="quantity" t-value="post[ticket]"/>
+                        <t t-if="int(post[ticket]) > 0">
+                            <thead>
+                                <tr>
+                                    <th colspan="4" class="text-center"><t t-esc="split_ticket[2]"/></th>
+                                </tr>
+                                <tr>
+                                    <th/>
+                                    <th>Name</th>
+                                    <th>Phone</th>
+                                    <th>Email</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <t t-foreach="range(1, int(post[ticket])+1)" t-as="attendee">
+                                    <tr class='form-group'>
+                                        <td>Attendee<t t-raw="attendee"/></td>
+                                        <td><input class='form-control input-sm' type='text' t-attf-name="attendee-name-#{split_ticket[1]}-#{attendee}-#{quantity}" required="required"/></td>
+                                        <td><input class='form-control input-sm' type='tel' t-attf-name="attendee-phone-#{split_ticket[1]}-#{attendee}-#{quantity}"/></td>
+                                        <td><input class='form-control input-sm' type='email' t-attf-name="attendee-email-#{split_ticket[1]}-#{attendee}-#{quantity}" required="required"/></td>
+                                        <td><input t-if="split_ticket[2] != 'FREE'" class='hidden' type='text' t-attf-name="attendee-event_ticket_id-#{split_ticket[1]}-#{attendee}-#{quantity}" t-attf-value="#{ split_ticket[1] }"/></td>
+                                    </tr>
+                                </t>
+                            </tbody>
+                        </t>
+                    </t>
+                </table>
+                <hr/>
+                <a t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register' or ''}" class="btn btn-default btn-lg"><span class="fa fa-long-arrow-left"/> Select Ticket</a>
+                <button type="submit" class="btn btn-primary btn-lg pull-right" >Order Now</button>
+                <div class="clearfix"/>
+            </form>
+        </div>
+    </t>
+</template>
+
 </data>
 </openerp>
+

=== modified file 'website_event_track/views/event_backend.xml'
--- website_event_track/views/event_backend.xml	2014-04-10 14:51:31 +0000
+++ website_event_track/views/event_backend.xml	2014-06-09 06:19:49 +0000
@@ -167,45 +167,6 @@
                         <field name="count_tracks" widget="statinfo"/>
                     </button>
                 </xpath>
-                <xpath expr="//field[@name='organizer_id']" position="after">
-                    <field name="timezone_of_event" />
-                </xpath>
-                <xpath expr="//div[@class='oe_title']" position="inside">
-                    <label for="tag_ids" class="oe_edit_only"/>
-                    <field name="tag_ids" widget="many2many_tags"/>
-                    <div name="event_checkboxes">
-                        <field name="show_menu"/>
-                        <label for="show_menu"/>
-                        <field name="show_tracks"/>
-                        <label for="show_tracks"/>
-                        <field name="show_track_proposal"/>
-                        <label for="show_track_proposal"/>
-                    </div>
-                </xpath>
-                <xpath expr="//notebook" position="inside">
-                    <page string="Tracks">
-                        <group col="2" class="oe_title">
-                            <field name="allowed_track_tag_ids" widget="many2many_tags"/>
-                        </group>
-                        <field name="track_ids" context="{'default_event_id': active_id}"/>
-                    </page>
-                    <page string="Sponsorships">
-                        <field name="sponsor_ids" context="{'default_event_id': active_id}">
-                            <tree editable="bottom">
-                                <field name="partner_id"/>
-                                <field name="url"/>
-                                <field name="sponsor_type_id"/>
-                            </tree>
-                            <form string="Sponsoring">
-                                <field name="partner_id"/>
-                                <field name="url"/>
-                                <field name="sponsor_type_id"/>
-                            </form>
-                        </field>
-                    </page>
-                </xpath>
-                <xpath expr="//div[@class='oe_right oe_button_box']" position="inside">
-                </xpath>
             </field>
         </record>
 
@@ -327,7 +288,6 @@
                                     <field name="duration" class="oe_inline" widget="float_time"/> hours
                                 </div>
                                 <field name="tag_ids" widget="many2many_tags"/>
-                                <field name="color"/>
                             </group>
                         </group>
                         <label for="description" class="oe_edit_only"/>

=== modified file 'website_event_track/views/website_event.xml'
--- website_event_track/views/website_event.xml	2014-04-09 18:43:34 +0000
+++ website_event_track/views/website_event.xml	2014-06-09 06:19:49 +0000
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
+<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout" groups="website_event.group_advanced_event_features">
     <xpath expr="//t[@t-call='website.layout']" position="inside">
         <t t-set="head">
             <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>

=== modified file 'website_sale/models/sale_order.py'
--- website_sale/models/sale_order.py	2014-05-15 08:02:02 +0000
+++ website_sale/models/sale_order.py	2014-06-09 06:19:49 +0000
@@ -88,15 +88,21 @@
             # Create line if no line with product_id can be located
             if not line_id:
                 values = self._website_product_id_change(cr, uid, ids, so.id, product_id, context=context)
-                line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
+                if context.get('event', False):
+                    for i in range(add_qty):
+                        line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
+                else:
+                    line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
                 if add_qty:
                     add_qty -= 1
 
             # compute new quantity
             if set_qty:
                 quantity = set_qty
-            elif add_qty != None:
+            elif add_qty != None and not context.get('event', False):
                 quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + (add_qty or 0)
+            elif context.get('event', False):
+                quantity = 1
 
             # Remove zero of negative lines
             if quantity <= 0: