diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 8bacd37fc15..6d6e2ca1624 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -29,14 +29,17 @@ class product(osv.osv):
         'event_type_id': fields.many2one('event.type', 'Type of Event', help='Select event types so when we use this product in sales order lines, it will filter events of this type only.'),
     }
 
-    def onchange_event_ok(self, cr, uid, ids, event_ok, context=None):
-        return {'value': {'type': event_ok and 'service' or False}}
+    def onchange_event_ok(self, cr, uid, ids, type, event_ok, context=None):
+        return {'value': {'type': event_ok and 'service' or type != 'service' and type or False}}
 
 
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
-        'event_id': fields.many2one('event.event', 'Event', help="Choose an event and it will automatically create a registration for this event."),
+        'event_id': fields.many2one('event.event', 'Event',
+            help="Choose an event and it will automatically create a registration for this event."),
+        'event_ticket_id': fields.many2one('event.event.ticket', 'Event Ticket',
+            help="Choose an event ticket and it will automatically create a registration for this event ticket."),
         #those 2 fields are used for dynamic domains and filled by onchange
         'event_type_id': fields.related('product_id','event_type_id', type='many2one', relation="event.type", string="Event Type"),
         'event_ok': fields.related('product_id', 'event_ok', string='event_ok', type='boolean'),
@@ -73,7 +76,6 @@ class sale_order_line(osv.osv):
         if context is None:
             context = {}
         registration_obj = self.pool.get('event.registration')
-        sale_obj = self.pool.get('sale.order')
         for order_line in self.browse(cr, uid, ids, context=context):
             if order_line.event_id.id:
                 dic = {
@@ -84,9 +86,108 @@ class sale_order_line(osv.osv):
                     'phone': order_line.order_id.partner_id.phone,
                     'origin': order_line.order_id.name,
                     'event_id': order_line.event_id.id,
+                    'event_ticket_id': order_line.event_ticket_id and order_line.event_ticket_id.id or None,
                 }
-                message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+                print dic
+
+                if order_line.event_ticket_id:
+                    if order_line.event_ticket_id.register_avail != 9999 and dic['nb_register'] < order_line.event_ticket_id.register_avail:
+                      raise osv.except_osv(_('Error!'), _('There are not enough tickets available (%s).' % order_line.event_ticket_id.register_avail))
+                    message = _("The registration has been created for event <i>%s</i> with the ticket <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.event_ticket_id.name, order_line.order_id.name)
+                else:
+                    message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+                
                 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):
+        price = event_ticket_id and self.pool.get("event.event.ticket").browse(cr, uid, event_ticket_id, context=context).price or False
+        return {'value': {'price_unit': price}}
+
+
+class event(osv.osv):
+    _inherit = 'event.event'
+
+    def _get_register_max(self, cr, uid, ids, field_name, arg, context=None):
+        result = dict.fromkeys(ids, 0)
+        for rec in self.browse(cr, uid, ids, context=context):
+            result[rec.id] = sum([ep.register_max for ep in rec.event_ticket_ids])
+        return result
+
+    _columns = {
+        'website_published': fields.boolean('Available in the website'),
+        'description_website': fields.html('Description for the website'),
+        'event_ticket_ids': fields.one2many('event.event.ticket', "event_id", "Event Ticket"),
+        'organizer_id': fields.many2one('res.partner', "Orgonizer"),
+        'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
+        'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
+        'register_max': fields.function(_get_register_max,
+            string='Maximum Registrations',
+            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=True)
+    }
+
+
+class event_ticket(osv.osv):
+    _name = 'event.event.ticket'
+
+    def _get_register(self, cr, uid, ids, fields, args, context=None):
+        """Get Confirm or uncofirm register value.
+        @param ids: List of Event Ticket registration type's id
+        @param fields: List of function fields(register_current and register_prospect).
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of function fields value.
+        """
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            res[event.id] = {}
+            reg_open = reg_done = reg_draft =0
+            for registration in event.registration_ids:
+                if registration.state == 'open':
+                    reg_open += registration.nb_register
+                elif registration.state == 'done':
+                    reg_done += registration.nb_register
+                elif registration.state == 'draft':
+                    reg_draft += registration.nb_register
+            for field in fields:
+                number = 0
+                if field == 'register_current':
+                    number = reg_open
+                elif field == 'register_attended':
+                    number = reg_done
+                elif field == 'register_prospect':
+                    number = reg_draft
+                elif field == 'register_avail':
+                    #the number of ticket is unlimited if the event.register_max field is not set.
+                    #In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
+                    number = event.register_max - reg_open if event.register_max != 0 else 9999
+                res[event.id][field] = number
+        return res
+
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'event_id': fields.many2one('event.event', "Event", required=True),
+        '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"),
+        'price': fields.float('Price'),
+        'register_max': fields.integer('Maximum Registrations'),
+        'register_current': fields.function(_get_register, string='Current Registrations', type='integer', multi='register_numbers'),
+        'register_avail': fields.function(_get_register, string='Available Registrations', type='integer', multi='register_numbers'),
+        'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', type='integer', multi='register_numbers'),
+        'register_attended': fields.function(_get_register, string='# of Participations', type='integer', multi='register_numbers'),
+    }
+
+    def onchange_product_id(self, cr, uid, ids, product_id=False, context=None):
+        return {'value': {'price': self.pool.get("product.product").browse(cr, uid, product_id).list_price or 0}}
+
+
+class event_registration(osv.osv):
+    """Event Registration"""
+    _inherit= 'event.registration'
+    _columns = {
+        'event_ticket_id': fields.many2one('event.event.ticket', 'Event Ticket'),
+    }
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index cc00365c980..43d2fcde495 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -7,7 +7,7 @@
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
                 <div name="options" position="inside">
-                    <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
+                    <field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"/>
                     <label for="event_ok"/>
                 </div>
                 <div name='ean' position="after">
@@ -23,6 +23,8 @@
              <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_id']" position="after">
                     <field name="event_id" domain="['|', ('type','=', False),('type', '=', event_type_id)]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
+                    <field name="event_ticket_id" domain="[('event_id', '=', event_id), ('register_avail', '>', 0)]" attrs="{'invisible': [('event_id', '=', False)]}"
+                        on_change="onchange_event_ticket_id(event_ticket_id, context)"/>
                     <field name="event_type_id" invisible="1"/>
                     <field name="event_ok" invisible="1"/>
                 </xpath>
@@ -34,5 +36,33 @@
             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
         </record>        
         
+        <record id="view_event_form" model="ir.ui.view">
+            <field name="name">view_event_form</field>
+            <field name="model">event.event</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//notebook" position="inside">
+                        <page string="Tarifs">
+                            <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="register_max"/>
+                                    <field name="register_current"/>
+                                    <field name="register_prospect"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </xpath>
+                    <field name="address_id" position="after">
+                        <field name="organizer_id"/>
+                    </field>
+               </data>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 58741dfe9d5..da80f86fc5b 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -9,57 +9,3 @@ class product(osv.osv):
         'event_ticket_ids': fields.one2many('event.event.ticket', 'product_id', 'Event Tickets'),
     }
 
-
-class event(osv.osv):
-    _inherit = 'event.event'
-
-    def _get_register_max(self, cr, uid, ids, field_name, arg, context=None):
-        result = dict.fromkeys(ids, 0)
-        for rec in self.browse(cr, uid, ids, context=context):
-            result[rec.id] = sum([ep.register_max for ep in rec.event_ticket_ids])
-        return result
-
-    _columns = {
-        'website_published': fields.boolean('Available in the website'),
-        'description_website': fields.html('Description for the website'),
-        'event_ticket_ids': fields.one2many('event.event.ticket', "event_id", "Event Ticket"),
-        'organizer_id': fields.many2one('res.partner', "Orgonizer"),
-        'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
-        'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
-        'register_max': fields.function(_get_register_max,
-            string='Maximum Registrations',
-            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=True)
-    }
-
-
-class event_ticket(osv.osv):
-    _name = 'event.event.ticket'
-
-    def _get_register_current(self, cr, uid, ids, field_name, arg, context=None):
-        result = dict.fromkeys(ids, 0)
-        for rec in self.browse(cr, uid, ids, context=context):
-            result[rec.id] = sum([ep.nb_register for ep in rec.registration_ids])
-        return result
-
-    _columns = {
-        'event_id': fields.many2one('event.event', "Event", required=True),
-        '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"),
-        'price': fields.float('Price'),
-        'register_max': fields.integer('Maximum Registrations'),
-        'register_current': fields.function(_get_register_current, string='Current Registrations', type='integer', store=True),
-    }
-
-    def onchange_product_id(self, cr, uid, ids, product_id=False, context=None):
-        return {'value': {'price': self.pool.get("product.product").browse(cr, uid, product_id).list_price or 0}}
-
-
-class event_registration(osv.osv):
-    """Event Registration"""
-    _inherit= 'event.registration'
-    _columns = {
-        'event_ticket_id': fields.many2one('event.event.ticket', 'Event Ticket'),
-    }
diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 409ca162c66..1c35f9ea5e9 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
-access_event_event_ticket_public,event.event.ticket.public,website_event.model_event_event_ticket,base.group_public,1,0,0,0
+access_event_event_ticket_public,event.event.ticket.public,event_sale.model_event_event_ticket,base.group_public,1,0,0,0
 access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0
\ No newline at end of file
diff --git a/addons/website_event/security/website_event.xml b/addons/website_event/security/website_event.xml
index e1d3ea4ae6a..0bf2f29a733 100644
--- a/addons/website_event/security/website_event.xml
+++ b/addons/website_event/security/website_event.xml
@@ -13,7 +13,7 @@
     </record>
     <record id="event_event_ticket_public" model="ir.rule">
         <field name="name">event ticket: Public</field>
-        <field name="model_id" ref="website_event.model_event_event_ticket"/>
+        <field name="model_id" ref="event_sale.model_event_event_ticket"/>
         <field name="domain_force">[('event_id.website_published', '=', True)]</field>
         <field name="groups" eval="[(4, ref('base.group_public'))]"/>
         <field name="perm_read" eval="True"/>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 2b511e25c7e..9bbd8225690 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,31 +2,6 @@
 <openerp>
 <data>
 
-    <record id="view_event_form" model="ir.ui.view">
-        <field name="name">view_event_form</field>
-        <field name="model">event.event</field>
-        <field name="inherit_id" ref="event.view_event_form"/>
-        <field name="arch" type="xml">
-            <data>
-                <xpath expr="//notebook" position="inside">
-                    <page string="Tarifs">
-                        <field name="event_ticket_ids">
-                            <tree string="Payments" editable="bottom">
-                                <field name="product_id" on_change='onchange_product_id(product_id)'/>
-                                <field name="deadline"/>
-                                <field name="price"/>
-                                <field name="register_max"/>
-                            </tree>
-                        </field>
-                    </page>
-                </xpath>
-                <field name="address_id" position="after">
-                    <field name="organizer_id"/>
-                </field>
-           </data>
-        </field>
-    </record>
-
     <!-- Layout add nav and footer -->
 
     <record id="header_website_event" model="ir.ui.view">