diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
| commit | 6dbd4e000dcb22d2ffcfeb7a9080eeffcbbcc7f8 (patch) | |
| tree | 5d1c3d763d9282312b22ca9e226515f20ce37d47 /addons/import_google/sync_google_calendar_view.xml | |
| parent | 4e08b80952c7f50357f8f97b69495562631e9d55 (diff) | |
| parent | f25ad676a34670f4ba1ac14bf2d6babd8ccc88b5 (diff) | |
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120710102201-h5mjjkoyprp70lf0
Diffstat (limited to 'addons/import_google/sync_google_calendar_view.xml')
| -rw-r--r-- | addons/import_google/sync_google_calendar_view.xml | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml index 84f0176c5ec..626d803d4df 100644 --- a/addons/import_google/sync_google_calendar_view.xml +++ b/addons/import_google/sync_google_calendar_view.xml @@ -1,30 +1,14 @@ <?xml version="1.0"?> <openerp> <data> - <record model="ir.ui.view" id="crm_case_form_view_meet_inherit"> + <record model="ir.ui.view" id="view_crm_meeting_form"> <field name="name">CRM - Meetings Form (Inherited)</field> <field name="model">crm.meeting</field> <field name="type">form</field> - <field name="inherit_id" ref="crm.crm_case_form_view_meet"/> + <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/> <field name="arch" type="xml"> <field name="categ_id" position="replace"> - <field name="categ_id" widget="selection" - string="Meeting Type" - domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" /> - </field> - </field> - </record> - - <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit"> - <field name="name">CRM - Meetings Tree (Inherited)</field> - <field name="model">crm.meeting</field> - <field name="type">tree</field> - <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/> - <field name="arch" type="xml"> - <field name="categ_id" position="replace"> - <field name="categ_id" widget="selection" - string="Meeting Type" - domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" /> + <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/> </field> </field> </record> |