diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/event/event_view.xml | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'addons/event/event_view.xml')
| -rw-r--r-- | addons/event/event_view.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index baa553babaf..cc6edfbd9bd 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -89,7 +89,6 @@ <field name="type" on_change="onchange_event_type(type,context)" /> <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/> <field name="date_end"/> - <field name="date_tz" /> </group> </group> <notebook> |