From 498a30bf627cf8e99b599bfb265d7868721f93cf Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 31 Oct 2012 12:02:28 +0100
Subject: [PATCH] [FIX]fix conflict problem for event/event_view.xml in order
 to match current trunk

bzr revid: csn@openerp.com-20121031110228-pvnkce2c6fdsfkuv
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 71425267df9..3face47de52 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -131,7 +131,7 @@
                             </group>
                             <group>
                                 <field name="type" on_change="onchange_event_type(type,context)" />
-                                <field name="date_begin"/>
+                                <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                 <field name="date_end"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>