[FIX] import_google: adapt extension of crm.meeting.type
bzr revid: rco@openerp.com-20120706124314-n8qinysgh9wjf3rn
This commit is contained in:
parent
d177d9a2a9
commit
9195edf76c
|
@ -21,11 +21,11 @@
|
||||||
|
|
||||||
from osv import fields,osv
|
from osv import fields,osv
|
||||||
|
|
||||||
class crm_case_categ(osv.osv):
|
class crm_meeting_type(osv.osv):
|
||||||
""" Category of Case """
|
""" Meeting Types """
|
||||||
_inherit = "crm.case.categ"
|
_inherit = "crm.meeting.type"
|
||||||
_columns = {
|
_columns = {
|
||||||
'user_id': fields.many2one('res.users', 'User')
|
'user_id': fields.many2one('res.users', 'User')
|
||||||
}
|
}
|
||||||
crm_case_categ()
|
|
||||||
# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -1,30 +1,14 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<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="name">CRM - Meetings Form (Inherited)</field>
|
||||||
<field name="model">crm.meeting</field>
|
<field name="model">crm.meeting</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
|
<field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="categ_id" position="replace">
|
<field name="categ_id" position="replace">
|
||||||
<field name="categ_id" widget="selection"
|
<field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
|
||||||
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="base_calendar.view_crm_meeting_tree"/>
|
|
||||||
<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>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -235,10 +235,10 @@ class google_import(import_framework):
|
||||||
|
|
||||||
|
|
||||||
def get_event_category(self, val, name):
|
def get_event_category(self, val, name):
|
||||||
fields = ['name', 'object_id']
|
nameid = 'event_category_' + name
|
||||||
nameid = 'event_category_'+name
|
fields = ['name']
|
||||||
data = [name, 'crm.meeting']
|
data = [name]
|
||||||
return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
|
return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
|
||||||
|
|
||||||
def get_rec(self, val):
|
def get_rec(self, val):
|
||||||
if val.get("recurrency"):
|
if val.get("recurrency"):
|
||||||
|
|
Loading…
Reference in New Issue