[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:
parent
cf1f8acda1
commit
498a30bf62
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue