[FIX]fix conflict problem for event/event_view.xml in order to match current trunk

bzr revid: csn@openerp.com-20121031110228-pvnkce2c6fdsfkuv
This commit is contained in:
Cedric Snauwaert 2012-10-31 12:02:28 +01:00
parent cf1f8acda1
commit 498a30bf62
1 changed files with 1 additions and 1 deletions

View File

@ -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>