From 676fc125914dbfb8f511f8b2784f50656bfb55a2 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 3 Aug 2010 17:41:46 +0530 Subject: [PATCH] [IMP] thunderbird bzr revid: hmo@tinyerp.com-20100803121146-ncmti6j0dq3uj6uy --- addons/thunderbird/partner/partner.py | 65 ++++-------------- addons/thunderbird/plugin/openerp_plugin.xpi | Bin 141487 -> 141434 bytes .../openerp_plugin/content/config_change.xul | 6 +- .../openerp_plugin/content/tiny_xmlrpc.js | 1 - .../locale/en-US/config_change.dtd | 1 - 5 files changed, 16 insertions(+), 57 deletions(-) diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index 986c9ae063d..8e1a577e9c0 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -79,25 +79,23 @@ class thunderbird_partner(osv.osv_memory): def update_contact(self,cr,user,vals): dictcreate = dict(vals) res_id = dictcreate.get('res_id',False) - result={} if res_id: - dictcreate.pop('res_id') address_obj = self.pool.get('res.partner.address') - address_data = address_obj.read(cr, user, int(res_id), []) - result={ 'partner_id': address_data['partner_id'] and address_data['partner_id'][0] or False, - 'country_id': dictcreate['country_id'] and int(dictcreate['country_id'][0]) or False, - 'state_id': dictcreate['state_id'] and int(dictcreate['state_id'][0]) or False, - 'name': dictcreate['name'], - 'street': dictcreate['street'], - 'street2': dictcreate['street2'], - 'zip': dictcreate['zip'], - 'city': dictcreate['city'], - 'phone': dictcreate['phone'], - 'fax': dictcreate['fax'], - 'mobile': dictcreate['mobile'], - 'email': dictcreate['email'], - } - address_obj.write(cr, user,res_id,result ) + result={ + 'partner_id': dictcreate.get('partner_id',False), + 'country_id': dictcreate.get('country_id', False), + 'state_id': dictcreate('state_id', False), + 'name': dictcreate.get('name', False), + 'street': dictcreate.get('street', False), + 'street2': dictcreate.get('street2', False), + 'zip': dictcreate.get('zip', False), + 'city': dictcreate.get('city', False), + 'phone': dictcreate.get('phone', False), + 'fax': dictcreate.get('fax', False), + 'mobile': dictcreate.get('mobile', False), + 'email': dictcreate.get('email', False), + } + address_obj.write(cr, user,res_id,result ) return True def create_partner(self,cr,user,vals): @@ -114,16 +112,6 @@ class thunderbird_partner(osv.osv_memory): search_id = self.pool.get('ir.model').search(cr, user,[('model','=',dictcreate['model'])]) return (search_id and search_id[0]) or 0 -# def thunderbird_searchcontact(self,cr,user,vals): -# address_obj = self.pool.get('res.partner.address') -# search_id1 = address_obj.search(cr,user,[('name','ilike',vals)]) -# search_id2 = address_obj.search(cr,user,[('email','=',vals)]) -# if search_id1: -# return address_obj.name_get(cr, user, search_id1) -# elif search_id2: -# return address_obj.name_get(cr, user, search_id2) -# return [] - def search_checkbox(self,cr,user,vals): if vals[0]: value = vals[0][0] @@ -172,29 +160,6 @@ class thunderbird_partner(osv.osv_memory): create_id = self.pool.get('ir.attachment').create(cr,user,dictcreate) return 0 -# def thunderbird_login(self,cr,user,vals): -# dictcreate = dict(vals) -# service = netsvc.LocalService('common') -# res = service.login(dictcreate['db'],dictcreate['login'],dictcreate['passwd']) -# return res or 0 - - def read(self, cr, user, ids, fields=None, context={}, load='_classic_read'): - ret_read = super(tinythunderbird_partner, self).read(cr, user, ids,fields,context,load) - attach_obj = self.pool.get('ir.attachment') - for read_data in ret_read: - attachments = attach_obj.search(cr,user,[('res_model','=',self._name),('res_id','=',read_data['id'])]) - attechments_data = sattach_obj.read(cr,user,attachments,['name']) - file_names = [a['name'] for a in attechments_data] - text_atteched = '\n'.join(file_names) - read_data['attachments'] = text_atteched - return ret_read - - def unlink(self, cr, uid, ids, context={}): - attach_obj = self.pool.get('ir.attachment') - attachments = attach_obj.search(cr,uid,[('res_model','=',self._name),('res_id','in',ids)]) - attach_obj.unlink(cr,uid,attachments) - return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context) - def list_alldocument(self,cr,user,vals): obj_list= [('crm.lead','Lead'),('project.issue','Project Issue'), ('hr.applicant','HR Recruitment')] object=[] diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi index 50a36b3c6e97f37f611ca7039ce5946063f280d9..b65feb03d7cbd3a540336bec04cab4adcc9c83ab 100644 GIT binary patch delta 1880 zcmZXVeKgc*6vuzRM_$4h(+rJahNkhFA&C$r+ejE0k#|WYv}~ld7aCz}y;Wj85o*(N zXpNQ~vz17-ScXX|MbSA?oZ4QFN=fW9{o2lS`s0~%?&p5*bMJlT-kG{ywW%9w$4-L% z+4*I5s!<@wJ01k(+b{||aqR*nycFbS7yODlsS1&&{F5hR8kbDtIEzKupRMF#tTv3< z0Srr5#xQG$bMXbR+!0rS-c&#m&c&4EH_FehJsKE3XG{shK7EJ_TayMBYaf!mq}6DZ zjreLDkFDa^J02@_D%;{|C&sPH1%5Y(D$}wTTf3`CWG|GMR}cj(uNFC9LKgr(?J{_ z75=g-XVo(!v${~{*W+shp8I|KC{RSOzRE(GsmTs7-lUJ?*i;h7&8TXbu%Jz-6e zpJ-BAr(`wH;%)P}OR@(E48Kjfl2P`Zp;-FlP)tl&`$9_im@7|nx*^x<1CyCse!yyX zd4B3YjM(J$JW1ivCtarPZi{r@F(2==XbW1gk?quVyeNI$*#KAmQ}+#mxTyg16UOg3 z{lTLp?gJU?6T;FOCZ2MhktSvaDKhTN)g+CJW@-%$#kvo++CQHKk{&i*c%G7rMz3?c zos)uLST8zD<)fzuBaHzGHVxsrLixO=eLHszg5)^atyy*p`aw4k_Pz9p6Xl<sAQgcauNr8Ec1 z*nloc?!ze>lFVV;crn^Mc#aIdlWz)qMFtPi#=$;q;Gu+CfHq`c0COlnTjEIpO}N(A zD+g&*q>~3Coo*2osKEVHzycyR?9~T!c*6u&gO{j)4^m9N5FNOT23$d# zxhY_zR)wqPgVliSp@2mKRDYcu`w70rB*>h($ delta 1797 zcmY+FcTiJV6vp2@!GscOAb}7{0wfj`unmd|t5S^M(rn;T9LtKjil_({KvcwnBGD^F znjoSeMM^|PSy@+QR+@l<7@CT>h$vQY-J5+gJL4aD$@e?wJNKUZ?wNdTP%UayJ(&tk zF^T79jN`mt?miorNI*Yn52z+dkxmi=rGeG{q%1U>SxBOxBRJFoILdJB7^)mY$kbFf zC5AD#vpsXpQlKacCPmrcZfhjO`(_~~=5at%MU7$<;0!OsjVhPbcpKZX57poIkzKm@m}hF<+d`F#on*N zMSH7mRLig5x)!CU@j6egQ~9Yfe7R$-hKB!Jo%YbzFARDG{6Qz95$y_os^6&kkqI7F zSJQP1{`xbkAl~m`pf%Sy_Etey)osswqXNE(+Wt$^YuK4DG9VMyAZ-J|ZJ#R;QP)dz3K%CedMEwy*XW}kfe zQ8th@XSN_mD_gB1cW~C+0ZC^>?%^7?Lcnelzs)O?y7@@_7HpOy7>+Z>8$? zTO@M*Grar|n}{fG>Y%+KXR!bDj;{}0ind3>l(?$+R93+6mJ`i~CQiP;raozB*qgyH zo>!mjs^AJnwzaGd}FKI4t2V28Bb^1=M;nr*?p)4lYX)`%^aei&~oJ%1@|Wm%wG(8}-^>7$8< zBVJLxae4tpXCEEB>AJ#XG$Yafn6s_v$&tzH#%EpXvbquE(iNIA977 zMR-^b%<+JTtd_(9CrA_1L@p)-^a*)kO_MeH;EpPBi9T!s;WQ-^VkZOehR_-Ri*dNh z09?>&jJU8Fq8(}HNiO(++kB-EV+|fSBOC0+BMIBQ=!7mFc)${0TKsGXo?sG)vkYN9 zoLH^=7UD@p;0lc)N@0QrLJ$Y%7?HhwJwp=)pX?(j8FvdwXOYQ>jpNKffSowxoX+z} zqpfK;R6y$V@j(h_(rH&wI_c5RnADMG(Bzsi3E$7Ag-8G%XfNI>fL~!p9?cT+h(*PO zSkx}k71x^(OG`c-ZZIK@R20&pz7T0(S5uN}Rzef|65=L16XPeQz=wHdG}bc%cj&F4 z#a=T~Z)+7T;;ZOZ#MscB7+kAq98^u}1elY`j2fEUG$*b*waNo9$BJ5{PA{`kNL-Hh z=$sYzh$}+~PUt=E62e9}Qjdj}V1+N&lU4SKK!o`gTzAG}H8m7M(35M`1yh zY-v@JJ@Boaj;KB*Wg9I?#P%so96HJSS!_kfyiS@ddPc|}RvSuc>qdA