diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index 1a72403b84b..f92a9eb5617 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -37,6 +37,7 @@ It defines a new kind of service products that offers you the possibility to cho
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
         'event_sale_view.xml',
+        'event_demo.xml',
     ],
     'test':['test/confirm.yml'],
     'installable': True,
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
new file mode 100644
index 00000000000..6dd696225a3
--- /dev/null
+++ b/addons/event_sale/event_demo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    <record id="event_technical_training" model="event.event">
+        <field name="name">Technical training in Grand-Rosiere</field>
+        <field eval="(DateTime.now() + timedelta(15)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
+        <field eval="(DateTime.now() + timedelta(20)).strftime('%Y-%m-%d 16:00:00')" name="date_end"/>
+        <field name="type" ref="event.event_type_4"/>
+        <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="event_product" model="product.product">
+        <field name="name">Technical Training</field>
+        <field name="event_ok">True</field>
+        <field name="event_type_id" ref="event.event_type_4"/>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="type">service</field>
+        <field name="list_price">2500.0</field>
+        <field name="standard_price">1000.0</field>
+        <field name="supply_method">produce</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+    </record>
+    </data>
+</openerp>
diff --git a/addons/event_sale_layout/__init__.py b/addons/event_sale_layout/__init__.py
new file mode 100644
index 00000000000..26c654db9dd
--- /dev/null
+++ b/addons/event_sale_layout/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
diff --git a/addons/event_sale_layout/__openerp__.py b/addons/event_sale_layout/__openerp__.py
new file mode 100644
index 00000000000..c81c4c83c7b
--- /dev/null
+++ b/addons/event_sale_layout/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Events Sales layout',
+    'version': '0.1',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+    This module ensures the compatibility of the changes made on the sale.order.line form view in event_sale with the sale_layout module (that is replacing the whole field in the view by another one). Its installation is automatically triggered when both modules are installed.
+    """,
+    'author': 'OpenERP SA',
+    'depends': ['event_sale','sale_layout'],
+    'update_xml': [
+        'event_sale_layout.xml',
+    ],
+    'installable': True,
+    'auto_install':True,
+    'category': 'Hidden',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_sale_layout/event_sale_layout.xml b/addons/event_sale_layout/event_sale_layout.xml
new file mode 100644
index 00000000000..26ba71b1938
--- /dev/null
+++ b/addons/event_sale_layout/event_sale_layout.xml
@@ -0,0 +1,18 @@
+<openerp>
+<data>
+    <record model="ir.ui.view" id="view_order_form_inherit_1">
+      <field name="name">event.sale.order</field>
+      <field name="model">sale.order</field>
+      <field name="type">form</field>
+      <field name="priority">10000</field>
+      <field name="inherit_id" ref="sale.view_order_form" />
+      <field name="arch" type="xml">
+         <xpath expr="//field[@name='discount']" position="after">
+             <field name="event_id" colspan="3" domain="[('type', 'in', list(set((event_type_id,False))))]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
+             <field name="event_type_id" invisible='1'/>
+             <field name="event_ok" invisible='1'/>
+         </xpath>
+      </field>
+ </record>
+</data>
+</openerp>