[IMP]: improvement for Open Partner detail
bzr revid: ksa@tinyerp.co.in-20100728133459-sf23uwhnjtrome4u
This commit is contained in:
parent
3bf40de1a0
commit
f9718df0a0
|
@ -108,51 +108,51 @@ class tinythunderbird_partner(osv.osv):
|
||||||
res = {}
|
res = {}
|
||||||
if partner:
|
if partner:
|
||||||
partner=partner[0]
|
partner=partner[0]
|
||||||
|
print "partnert",partner
|
||||||
test = address_obj.read(cr,user, partner)
|
test = address_obj.read(cr,user, partner)
|
||||||
res = {
|
res = {
|
||||||
'partner_name': test['partner_id'] and test['partner_id'][1] or '',
|
'partner_name': test['partner_id'] and test['partner_id'][1] or '',
|
||||||
'contactname': test['name'] or '',
|
'contactname': test['name'] or '',
|
||||||
# 'type': test['type'] or '',
|
|
||||||
'street': test['street'] or '',
|
'street': test['street'] or '',
|
||||||
'street2': test['street2'] or '',
|
'street2': test['street2'] or '',
|
||||||
'zip': test['zip'] or '',
|
'zip': test['zip'] or '',
|
||||||
'city': test['city'] or '',
|
'city': test['city'] or '',
|
||||||
'country': test['country_id'] and test['country_id'][1] or '',
|
'country': test['country_id'] and test['country_id'][0] or '',
|
||||||
'state': test['state_id'] and test['state_id'][1] or '',
|
'state': test['state_id'] and test['state_id'][0] or '',
|
||||||
'email': test['email'] or '',
|
'email': test['email'] or '',
|
||||||
'phone': test['phone'] or '',
|
'phone': test['phone'] or '',
|
||||||
'mobile': test['mobile'] or '',
|
'mobile': test['mobile'] or '',
|
||||||
'fax': test['fax'] or '',
|
'fax': test['fax'] or '',
|
||||||
'res_id':test['id'] or '',
|
'res_id': str(partner),
|
||||||
}
|
}
|
||||||
return res.items()
|
return res.items()
|
||||||
|
|
||||||
|
def thunderbird_newcreatecontact(self,cr,user,vals):
|
||||||
def thunderbird_createcontact1(self,cr,user,vals):
|
|
||||||
dictcreate = dict(vals)
|
dictcreate = dict(vals)
|
||||||
email = dictcreate['email']
|
res_id = dictcreate.get('res_id',False)
|
||||||
add_obj = self.pool.get('res.partner.address')
|
result={}
|
||||||
partner_ids = add_obj.search(cr,user,[('email','ilike',email)])
|
if res_id:
|
||||||
if partner_ids:
|
dictcreate.pop('res_id')
|
||||||
partner_ids = partner_ids[0]
|
add_obj = self.pool.get('res.partner.address')
|
||||||
partner = add_obj.read(cr,user,partner_ids)
|
add_data = add_obj.read(cr, user, int(res_id), [])
|
||||||
res = {}
|
result={ 'partner_id': add_data['partner_id'] and add_data['partner_id'][0] or False,
|
||||||
res = dictcreate.update({'partner_id':partner['partner_id'][0],
|
'country_id': dictcreate['country_id'] and int(dictcreate['country_id'][0]) or False,
|
||||||
'name':partner['name'],
|
'state_id': dictcreate['state_id'] and int(dictcreate['state_id'][0]) or False,
|
||||||
'street':partner['street'],
|
'name': dictcreate['name'],
|
||||||
'street2':partner['street2'],
|
'street': dictcreate['street'],
|
||||||
'zip':partner['zip'],
|
'street2': dictcreate['street2'],
|
||||||
'city':partner['city'],
|
'zip': dictcreate['zip'],
|
||||||
'country_id':partner['country_id'][0],
|
'city': dictcreate['city'],
|
||||||
'state_id':partner['state_id'],
|
'country_id': dictcreate['country_id'][0],
|
||||||
'phone':partner['phone'],
|
'state_id': dictcreate['state_id'],
|
||||||
'fax':partner['fax'],
|
'phone': dictcreate['phone'],
|
||||||
'mobile':partner['mobile'],
|
'fax': dictcreate['fax'],
|
||||||
'email':partner['email'],
|
'mobile': dictcreate['mobile'],
|
||||||
'res_id':partner['id']})
|
'email': dictcreate['email'],
|
||||||
return res
|
}
|
||||||
# create_id = add_obj.create(cr, user, dictcreate)
|
add_obj.write(cr, user,res_id,result )
|
||||||
# return create_id
|
|
||||||
|
return True
|
||||||
|
|
||||||
def thunderbird_createpartner(self,cr,user,vals):
|
def thunderbird_createpartner(self,cr,user,vals):
|
||||||
dictcreate = dict(vals)
|
dictcreate = dict(vals)
|
||||||
|
@ -162,16 +162,6 @@ class tinythunderbird_partner(osv.osv):
|
||||||
return 0
|
return 0
|
||||||
create_id = address_obj.create(cr, user, dictcreate)
|
create_id = address_obj.create(cr, user, dictcreate)
|
||||||
return create_id
|
return create_id
|
||||||
|
|
||||||
# def thunderbird_createnewaddress(self,cr,user,vals):
|
|
||||||
# dictcreate = dict(vals)
|
|
||||||
# address_obj = self.pool.get('res.partner.address')
|
|
||||||
# search_id = address_obj.search(cr, user,[('name','=',dictcreate['name'])])
|
|
||||||
# if search_id:
|
|
||||||
# return 0
|
|
||||||
# create_id = address_obj.create(cr, user, dictcreate)
|
|
||||||
# return create_id
|
|
||||||
|
|
||||||
|
|
||||||
def thunderbird_searchobject(self,cr,user,vals):
|
def thunderbird_searchobject(self,cr,user,vals):
|
||||||
dictcreate = dict(vals)
|
dictcreate = dict(vals)
|
||||||
|
@ -268,6 +258,17 @@ class tinythunderbird_partner(osv.osv):
|
||||||
object.append(obj)
|
object.append(obj)
|
||||||
return object
|
return object
|
||||||
|
|
||||||
|
def thunderbird_objectcountry(self,cr,user,vals):
|
||||||
|
country_list = []
|
||||||
|
cr.execute("SELECT id, name from res_country")
|
||||||
|
country_list = cr.fetchall()
|
||||||
|
return country_list
|
||||||
|
|
||||||
|
def thunderbird_objectstate(self,cr,user,vals):
|
||||||
|
cr.execute("SELECT id, name from res_country_state")
|
||||||
|
state_country_list = cr.fetchall()
|
||||||
|
return state_country_list
|
||||||
|
|
||||||
def thunderbird_list_search_object(self,cr,user,vals):
|
def thunderbird_list_search_object(self,cr,user,vals):
|
||||||
model_obj = self.pool.get('ir.model')
|
model_obj = self.pool.get('ir.model')
|
||||||
object=''
|
object=''
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue