openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

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

Requested reviews:
  OpenERP Core Team (openerp)

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

Hello,
   Changes with this Merge Proposal:
    + Outlook will allow to connect to sever even if the server is running with option --no-database-list
   Kindly Review this
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/47769
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'outlook/plugin/openerp-outlook-addin.exe'
Binary files outlook/plugin/openerp-outlook-addin.exe	2011-01-14 00:11:01 +0000 and outlook/plugin/openerp-outlook-addin.exe	2011-01-28 05:59:16 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2011-01-14 00:11:01 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2011-01-28 05:59:16 +0000
@@ -421,6 +421,7 @@
         return "Displays the %s dialog" % dd.caption
 
 def TestConnection(btnProcessor,*args):
+    dbname = None
     server = NewConn.getitem('_server')
     port = NewConn.getitem('_port')
     NewConn.GetDBList()
@@ -428,18 +429,20 @@
         btnProcessor.window.LoadAllControls()
         win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
         return
-    try:
-        dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, 7000)
-        if not dbname:
-            win32ui.MessageBox("Authentication Error !\nBad Database Name !", "OpenERP Connection", flag_excl)
-            return
-    except Exception,e:
-        print "Exception %s: %s"%(type(e),str(e))
+
     dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     if not dbname:
+        try:
+            dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, 7000)
+            if not dbname:
+                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")
+    if not dbname:
         win32ui.MessageBox("No database found on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
         return
-
     uname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
     pwd = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
 
@@ -470,7 +473,7 @@
             flag = flag_stop
             NewConn.setitem('_login', 'False')
     except Exception,e:
-        msg = "Authentication Error !\n\n" + getMessage(e)
+        msg = "Authentication Error !\n Invalid Configuration Please check server parameters and database name."
         flag = flag_error
     win32ui.MessageBox(msg, "OpenERP Connection", flag)
     return

=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py	2011-01-14 00:11:01 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py	2011-01-28 05:59:16 +0000
@@ -94,7 +94,7 @@
                                         "EDIT",
                                         db,
                                         dwStyle,
-                                        67,80,180,20,
+                                        127,80,235,20,
                                         parent,
                                         7000,
                                         0,

=== modified file 'outlook/plugin/openerp-outlook-plugin/setup.iss'
--- outlook/plugin/openerp-outlook-plugin/setup.iss	2010-12-31 06:06:34 +0000
+++ outlook/plugin/openerp-outlook-plugin/setup.iss	2011-01-28 05:59:16 +0000
@@ -50,7 +50,7 @@
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Files]
-Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\workspace\build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Messages]

=== modified file 'outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py'
--- outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py	2011-01-14 00:11:01 +0000
+++ outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py	2011-01-28 05:59:16 +0000
@@ -108,7 +108,10 @@
         self._uname = user
         self._pwd = pwd
         conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-        uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+        try:
+            uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+        except:
+            return False
         return uid
 
     def GetAllObjects(self):
@@ -288,7 +291,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("<")