pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: sbh@tinyerp.com-20110304060314-82o0zw293t05qtvt
This commit is contained in:
Bhumika (OpenERP)
2011-03-04 11:33:14 +05:30
parent 1c74497dfc b0e1c25b51
commit 4e00074297
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_base_account/google_base_account.py
+1 -10
View File
@@ -24,19 +24,10 @@ from osv import fields,osv
class res_users(osv.osv):
_inherit = "res.users"
_columns = {
'gmail_user': fields.char('Google Account', size=64,),
'gmail_user': fields.char('Username', size=64,),
'gmail_password': fields.char('Password', size=64),
}
res_users()
class ir_model_data(osv.osv):
_inherit = "ir.model.data"
_columns = {
'google_id': fields.char('Google Contact Id', size=128, readonly=True),
}
ir_model_data()
# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
addons/google_base_account/google_base_account_view.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<xpath expr="//notebook[last()]" position="inside">
<page string=" Synchronization ">
<separator string="Google User Detail" colspan="4" />
<separator string="Google Account" colspan="4" />
<field name="gmail_user"/>
<field name="gmail_password" password="True"/>
</page>
addons/sync_google_contact/wizard/google_contact_import.py
+6 -13
View File
@@ -85,9 +85,7 @@ class synchronize_google_contact(osv.osv_memory):
def create_partner(self, cr, uid, data={}, context=None):
partner_obj = self.pool.get('res.partner')
name = data.get('name','')
partner_id = partner_obj.search(cr, uid, [('name','ilike',name)], context=context)
if not partner_id:
partner_id.append(partner_obj.create(cr, uid, {'name': name, 'address' : [(6, 0, [data['address_id']])]}, context=context))
partner_id = partner_obj.create(cr, uid, {'name': name, 'address' : [(6, 0, [data['address_id']])]}, context=context)
return partner_id, data
def import_contact(self, cr, uid, ids, context=None):
@@ -137,22 +135,20 @@ class synchronize_google_contact(osv.osv_memory):
while contact:
for entry in contact.entry:
data = {}
google_id = entry.id.text
model_data = {
'name': 'google_contacts_information_%s' %(entry.id.text),
'name': google_id,
'model': 'res.partner.address',
'module': 'sync_google_contact',
}
name = tools.ustr(entry.title.text)
if name == "None":
name = entry.email[0].address
google_id = entry.id.text
emails = ','.join(email.address for email in entry.email)
if name and name != 'None':
data['name'] = name
if google_id:
model_data.update({'google_id': google_id})
if entry.phone_number:
for phone in entry.phone_number:
if phone.rel == gdata.contacts.REL_WORK:
@@ -162,7 +158,7 @@ class synchronize_google_contact(osv.osv_memory):
if phone.rel == gdata.contacts.PHONE_WORK_FAX:
data['fax'] = phone.text
data_ids = model_obj.search(cr, uid, [('google_id','=',google_id)])
data_ids = model_obj.search(cr, uid, [('model','=','res.partner.address'), ('name','=',google_id)])
if data_ids:
contact_ids = [model_obj.browse(cr, uid, data_ids[0], context=context).res_id]
elif emails:
@@ -172,16 +168,13 @@ class synchronize_google_contact(osv.osv_memory):
if contact_ids:
addresses.append(contact_ids[0])
self.update_contact(cr, uid, contact_ids, data, context=context)
data_ids = model_obj.search(cr, uid, [('res_id','=',contact_ids[0]), ('google_id','=','')])
model_data.update({'google_id': google_id})
model_obj.write(cr, uid, data_ids, model_data, context=context)
if not contact_ids:
#create or link to an existing partner only if it's a new contact
res_id = addresss_obj.create(cr, uid, data, context=context)
data['address_id'] = res_id
if option == 'create_all':
partner_id, data = self.create_partner(cr, uid, data, context=context)
partner_ids.append(partner_id[0])
partner_ids.append(partner_id)
addresses.append(res_id)
model_data.update({'res_id': res_id})
model_obj.create(cr, uid, model_data, context=context)