[MERGE] MERGE with lp:~openerp-dev/openobject-addons/jam-dev-addons1

bzr revid: sbh@tinyerp.com-20110128110334-0gxuzfiywsvwwyt2

addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py

@@ -438,8 +438,7 @@ def TestConnection(btnProcessor,*args):
                 win32ui.MessageBox("Authentication Error !\nBad Database Name !", "OpenERP Connection", flag_excl)
                 return
         except Exception,e:
-            print "Exception %s: %s"%(type(e),str(e))
-    win32ui.MessageBox(str(dbname),"DBNAME")
+            pass
     if not dbname:
         win32ui.MessageBox("No database found on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
         return

addons/outlook/plugin/openerp-outlook-plugin/setup.iss

@@ -50,7 +50,7 @@ Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Files]
-Source: "C:\workspace\build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Messages]