← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #695038 OpenOfficeReportDesigner Group to Remove in Trunk
  https://bugs.launchpad.net/bugs/695038
  #695596 Audit trail module does not creating an audit log for users.
  https://bugs.launchpad.net/bugs/695596

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44948

Outlook Plugin Buidbot warning Fixes
Kindly Review them
Thank you 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44948
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.
=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-12-31 06:06:34 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-12-31 09:17:03 +0000
@@ -705,17 +705,12 @@
     b = check()
     if not b:
         return
-    # Get the selected mail and set the default value for search_text_control to mail.SenderEmailAddress
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
     try:
         global objects_with_match
         list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
         objects_with_match = NewConn.SearchPartners()
         setList(list_hwnd)
     except Exception,e:
-        msg=getMessage(e)
         win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
     txtProcessor.init_done=True
 

=== modified file 'outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py'
--- outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py	2010-12-31 06:06:34 +0000
+++ outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py	2010-12-31 09:17:03 +0000
@@ -104,19 +104,19 @@
         return db_list
 
     def login(self,dbname, user, pwd):
-    	self._dbname = dbname
-    	self._uname = user
-    	self._pwd = pwd
-    	conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-    	uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
-    	return uid
+        self._dbname = dbname
+        self._uname = user
+        self._pwd = pwd
+        conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
+        uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+        return uid
 
     def GetAllObjects(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
-    	objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
-    	obj_list = [item['model'] for item in objects]
-    	return obj_list
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
+        objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
+        obj_list = [item['model'] for item in objects]
+        return obj_list
 
     def GetObjList(self):
     	self._obj_list=list(self._obj_list)
@@ -288,7 +288,6 @@
                 headers[line[:split_here]] = line[split_here:]
             temp1 = headers.get('Message-ID')
             temp2 = headers.get('Message-Id')
-            referances = headers.get('References')
             if temp1 == None:    message_id = temp2
             if temp2 == None:    message_id = temp1
             startCut = message_id.find("<")


Follow ups