diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index c8d75a3a873..c775b97d520 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -136,8 +136,8 @@ class mailgate_thread(osv.osv): 'partner_id': partner_id, 'res_id': case.id, 'date': time.strftime('%Y-%m-%d %H:%M:%S'), - 'message_id': message_id, - 'description': details or (hasattr(case, 'description') and case.description or False), + 'message_id': message_id, + 'description': details or (hasattr(case, 'description') and case.description or False), 'attachment_ids': [(6, 0, attachments)] } @@ -283,7 +283,7 @@ class mailgate_tool(osv.osv_memory): 'description': msg.get('body', msg.get('from')), 'history': True, 'partner_id': partner_id, - 'res_model': model, + 'model': model, 'email_cc': msg.get('cc'), 'email_from': msg.get('from'), 'email_to': msg.get('to'), diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml index 203d9a942bf..de1a88c34c7 100644 --- a/addons/mail_gateway/mail_gateway_view.xml +++ b/addons/mail_gateway/mail_gateway_view.xml @@ -10,13 +10,13 @@ - + - + @@ -50,7 +50,9 @@ - + + + @@ -63,13 +65,21 @@ - - + + + + + + + + + + + - mailgate.thread.form mailgate.thread @@ -127,8 +137,9 @@ form [('history', '=', True)] + {"search_default_user_id":uid} - + Mailgateway Threads mailgate.thread @@ -149,7 +160,7 @@ - + Emails @@ -159,7 +170,7 @@ [('history', '=', True)] - + tree @@ -173,10 +184,6 @@ - - - + + + + + + + diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py index f042ce9c94e..84349a64d17 100755 --- a/addons/outlook/installer.py +++ b/addons/outlook/installer.py @@ -31,8 +31,7 @@ class outlook_installer(osv.osv_memory): def default_get(self, cr, uid, fields, context={}): data = super(outlook_installer, self).default_get(cr, uid, fields, context) - doc_file = open(config['addons_path'] + "/outlook/doc/Installation Guide to OpenERP Outlook Plug-in.doc", 'r') - data['doc_file'] = base64.encodestring(doc_file.read()) + data['doc_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_outlook.html' file = open(config['addons_path'] + "/outlook/plugin/openerp-outlook-plugin.zip", 'r') data['plugin_file'] = base64.encodestring(file.read()) return data @@ -42,7 +41,7 @@ class outlook_installer(osv.osv_memory): 'doc_name':fields.char('File name', size=64), 'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you’d like to add to your email and its attachments."), 'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."), - 'doc_file':fields.binary('Installation Manual', help="The documentation file :- how to install Outlook Plug-in.", readonly=True), + 'doc_file':fields.char('Installation Manual',size="264",help="The documentation file :- how to install Outlook Plug-in.", readonly=True), 'description':fields.text('Description', readonly=True) } @@ -63,7 +62,7 @@ How to install openerp-outlook plug-in? 3. Run “Register-plugin.bat” file. 4. Run Outlook and Check addon has been registered. 5. Tools->OpenERP Configuration and test your connection. - 6. See User Guide for more information. + 6. See User Guide for more information. 7. Keep All extratced files in some safe places (e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\" ). """ diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml index 99b440bf89a..e9fd756ff3d 100755 --- a/addons/outlook/outlook_installer.xml +++ b/addons/outlook/outlook_installer.xml @@ -38,7 +38,7 @@ - + @@ -74,20 +74,15 @@ {'menu':True} - - - - - diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc index 63fe9f64ba4..bef1c0ef516 100755 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc @@ -86,7 +86,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "About" FONT 8, "Tahoma", 400, 0, 0x0 BEGIN - GROUPBOX "About Plugin",IDC_STATIC,7,3,422,200 + GROUPBOX "About OpenERP Outlook Plugin",IDC_STATIC,7,3,422,200 CONTROL 1062,IDB_OPENERPLOGO,"Static",SS_BITMAP | SS_REALSIZEIMAGE,60,30,20,20 LTEXT "",IDC_ABOUT,80,90,250,100 END diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index cb963831218..62664fedccb 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -25,6 +25,7 @@ from tools import config import base64 import addons +import difflib class thunderbird_installer(osv.osv_memory): _name = 'thunderbird.installer' @@ -32,8 +33,7 @@ class thunderbird_installer(osv.osv_memory): def default_get(self, cr, uid, fields, context={}): data = super(thunderbird_installer, self).default_get(cr, uid, fields, context) - pdf_file = open(addons.get_module_resource('thunderbird','doc', 'Installation Guide to OpenERP Thunderbid Plug-in.pdf'),'rb') - data['pdf_file'] = base64.encodestring(pdf_file.read()) + data['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html' file = open(addons.get_module_resource('thunderbird','plugin', 'openerp_plugin.xpi'),'rb') data['plugin_file'] = base64.encodestring(file.read()) return data @@ -43,14 +43,13 @@ class thunderbird_installer(osv.osv_memory): 'pdf_name':fields.char('File name', size=64), 'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you’d like to add to your email and its attachments."), 'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."), - 'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), + 'pdf_file':fields.char('Installation Manual', size="264", help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), 'description':fields.text('Description', readonly=True) } _defaults = { 'thunderbird' : True, 'name' : 'openerp_plugin.xpi', - 'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf', 'description' : """ * Save the Thunderbird plug-­in. * Follow these steps to install Thunderbird plug-­in. diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index a7795d1a602..6421e239f2c 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -30,7 +30,7 @@ import tools import binascii class email_server_tools(osv.osv_memory): _inherit = "email.server.tools" - def history_message(self, cr, uid, model, res_id, message): + def history_message(self, cr, uid, model, res_id, message, context=None): #@param message: string of mail which is read from EML File attachment_pool = self.pool.get('ir.attachment') msg = self.parse_message(message) @@ -49,7 +49,7 @@ class email_server_tools(osv.osv_memory): return self.history(cr, uid, model, res_id, msg, att_ids) def parse_message(self, message): - #TOCHECK: put this function in mailgateway + #TOCHECK: put this function in mailgateway module msg_txt = email.message_from_string(message) message_id = msg_txt.get('message-id', False) msg = {} @@ -152,67 +152,78 @@ class thunderbird_partner(osv.osv_memory): dictcreate = dict(vals) ref_ids = str(dictcreate.get('ref_ids')).split(';') msg = dictcreate.get('message') + msg = self.pool.get('email.server.tools').parse_message(msg) server_tools_pool = self.pool.get('email.server.tools') + message_id = msg.get('message-id', False) + msg_pool = self.pool.get('mailgate.message') + msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)]) + res = {} + res_ids = [] + if msg_ids and len(msg_ids): + return 0 + for ref_id in ref_ids: + msg_new = dictcreate.get('message') ref = ref_id.split(',') model = ref[0] - res_id = int(ref[1]) - server_tools_pool.history_message(cr, uid, model, res_id, msg) - return True + model_obj = self.pool.get(model) + model_data = model_obj.search(cr, uid,[('name', 'ilike', ref[1])]) + if model_data: + res_id = int(model_data[0]) + server_tools_pool.history_message(cr, uid, model, res_id, msg_new) + res_ids.append(res_id) + return len(res_ids) - def process_email(self,cr,uid,vals): + def process_email(self, cr, uid, vals): dictcreate = dict(vals) model = str(dictcreate.get('model')) message = dictcreate.get('message') return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None) - def search_contact(self, cr, user, vals): - address_obj = self.pool.get('res.partner.address') - partner = address_obj.search(cr, user,[('email','=',vals)]) + def search_contact(self, cr, user, email): + address_pool = self.pool.get('res.partner.address') + address_ids = address_pool.search(cr, user, [('email','=',email)]) res = {} - res1 = {} - if not partner: - res1 = { - 'email': '', - } - return res1.items() - - if partner: - partner=partner[0] - data = address_obj.read(cr,user, partner) + if not address_ids: res = { - 'partner_name': data['partner_id'] and data['partner_id'][1] or '', - 'contactname': data['name'] or '', - 'street': data['street'] or '', - 'street2': data['street2'] or '', - 'zip': data['zip'] or '', - 'city': data['city'] or '', - 'country': data['country_id'] and data['country_id'][1] or '', - 'state': data['state_id'] and data['state_id'][1] or '', - 'email': data['email'] or '', - 'phone': data['phone'] or '', - 'mobile': data['mobile'] or '', - 'fax': data['fax'] or '', - 'res_id': str(partner), + 'email': '', + } + else: + address_id = address_ids[0] + address = address_pool.browse(cr, user, address_id) + res = { + 'partner_name': address.partner_id and address.partner_id.name or '', + 'contactname': address.name, + 'street': address.street or '', + 'street2': address.street2 or '', + 'zip': address.zip or '', + 'city': address.city or '', + 'country': address.country_id and address.country_id.name or '', + 'state': address.state_id and address.state_id.name or '', + 'email': address.email or '', + 'phone': address.phone or '', + 'mobile': address.mobile or '', + 'fax': address.fax or '', + 'partner_id': address.partner_id and str(address.partner_id.id) or '', + 'res_id': str(address.id), } return res.items() - def update_contact(self,cr,user,vals): + def update_contact(self, cr, user, vals): dictcreate = dict(vals) res_id = dictcreate.get('res_id',False) - result={} - - if not (dictcreate.get('partner_id')): + result = {} + address_pool = self.pool.get('res.partner.address') + if not (dictcreate.get('partner_id')): # TOCHECK: It should be check res_id or not dictcreate.update({'partner_id': False}) - create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate) + create_id = address_pool.create(cr, user, dictcreate) return create_id if res_id: - address_obj = self.pool.get('res.partner.address') - address_data = address_obj.read(cr, user, int(res_id), []) + address_data = address_pool.read(cr, user, int(res_id), []) result = { - 'partner_id': address_data['partner_id'] and address_data['partner_id'][0] or False, + 'partner_id': address_data['partner_id'] and address_data['partner_id'][0] or False, #TOFIX: parter_id should take from address_data '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'], @@ -225,7 +236,7 @@ class thunderbird_partner(osv.osv_memory): 'mobile': dictcreate['mobile'], 'email': dictcreate['email'], } - address_obj.write(cr, user,int(res_id),result ) + address_pool.write(cr, user, int(res_id), result ) return True def create_partner(self,cr,user,vals): diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi index f9e11ba939c..165781bb579 100644 Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar index de506007d3a..4afd40519d7 100644 Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul index 58514f39cbd..cacd522718e 100644 --- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul +++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul @@ -26,7 +26,6 @@