diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 57e7f54745e..750b9bc3ac2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -176,7 +176,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_begin" string="Event Organization">
+                <calendar color="user_id" date_start="date_begin" date_stop="date_end" string="Event Organization">
                     <field name="name"/>
                     <field name="type" widget="selection"/>
                 </calendar>
@@ -211,6 +211,7 @@
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
+                        <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
@@ -247,7 +248,7 @@
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
-           <field name="view_mode">tree,form,calendar,graph</field>
+           <field name="view_mode">calendar,tree,form,graph</field>
            <field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
diff --git a/addons/event_sale_order/__openerp__.py b/addons/event_sale_order/__openerp__.py
index 050de2c3f53..c7be214a2bd 100644
--- a/addons/event_sale_order/__openerp__.py
+++ b/addons/event_sale_order/__openerp__.py
@@ -32,6 +32,7 @@
     'update_xml': [
         'sale_order_view.xml',
     ],
+    'test':['test/confirm.yml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale_order/sale_order.py b/addons/event_sale_order/sale_order.py
index e790124e04f..bd33f8f8e36 100644
--- a/addons/event_sale_order/sale_order.py
+++ b/addons/event_sale_order/sale_order.py
@@ -40,6 +40,9 @@ class sale_order_line(osv.osv):
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
     uom=False, qty_uos=0, uos=False, name='', partner_id=False,
     lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
+        """
+        check product if event type 
+        """
         res = {}
         if product:
             product_res = self.pool.get('product.product').browse(cr, uid, product)
@@ -54,6 +57,10 @@ class sale_order_line(osv.osv):
         return super(sale_order_line,self).product_id_change(cr,uid,ids,res,context)
 
     def button_confirm(self,cr,uid,ids,context=None):
+        '''
+        create registration with sale order
+
+        '''
         registration = self.browse(cr,uid,ids,context=None)
         for registration in registration:    
             if registration.event.id:
diff --git a/addons/event_sale_order/sale_order_view.xml b/addons/event_sale_order/sale_order_view.xml
index cb9bb3391ff..e96c5a84f80 100644
--- a/addons/event_sale_order/sale_order_view.xml
+++ b/addons/event_sale_order/sale_order_view.xml
@@ -20,10 +20,10 @@
              <field name="type">form</field>
              <field name="inherit_id" ref="sale.view_order_form" />
              <field name="arch" type="xml">
-                <xpath expr="//field[@name='product_id']" position="after">
+                <xpath expr="//field[@name='discount']" position="after">
+                    <field name="event" colspan="3" domain="[('type', '=', event_type )]" attrs="{'invisible': [('event_ok', '=', False)]}"/>
                     <field name="event_type" invisible="1"/>
                     <field name="event_ok" invisible="1"/>
-                    <field name="event" domain="[('type', '=', event_type )]" attrs="{'invisible': [('event_ok', '=', False)]}"/>
                 </xpath>
              </field>
         </record>