odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] import_google: adapt extension of crm.meeting.type 

bzr revid: rco@openerp.com-20120706124314-n8qinysgh9wjf3rn
This commit is contained in:
Raphael Collet 2012-07-06 14:43:14 +02:00
parent d177d9a2a9
commit 9195edf76c
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/import_google/partner.py
View File

@ -21,11 +21,11 @@
from osv import fields,osv
class crm_case_categ(osv.osv):
""" Category of Case """
_inherit = "crm.case.categ"
class crm_meeting_type(osv.osv):
""" Meeting Types """
_inherit = "crm.meeting.type"
_columns = {
'user_id': fields.many2one('res.users', 'User')
}
crm_case_categ()
# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:

20
addons/import_google/sync_google_calendar_view.xml
View File

@ -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="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="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 name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
</field>
</field>
</record>

8
addons/import_google/wizard/import_google.py
View File

@ -235,10 +235,10 @@ class google_import(import_framework):
def get_event_category(self, val, name):
fields = ['name', 'object_id']
nameid = 'event_category_'+name
data = [name, 'crm.meeting']
return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
nameid = 'event_category_' + name
fields = ['name']
data = [name]
return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
def get_rec(self, val):
if val.get("recurrency"):