Thank you to Alexandr Usov and Stanislav Sinyagin for testing and ideas.

* Fix originate to handle Unicode via UTF-8.
* Fix Open Caller to handle more situations and channel types.
* get_caller_name.py and pop-up functionality now handle invalid numbers properly.
* Fix test connection.

freeswitch_click2dial/freeswitch_click2dial.py

@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    FreeSWITCH Click2dial module for OpenERP
-#    Copyright (C) 2014 Trever L. Adams
+#    Copyright (C) 2014-2016 Trever L. Adams
 #    Copyright (C) 2010-2013 Alexis de Lattre <alexis@via.ecp.fr>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -232,32 +232,38 @@ class freeswitch_server(orm.Model):
                         _("Check Host, Port and Password"))
                 else:
                     fs_manager.disconnect()
+            except Exception, e:
+                pass
         raise orm.except_orm(
              _("Connection Test Successfull!"),
              _("OpenERP can successfully login to the FreeSWITCH Event "
                "Socket."))
-            except Exception, e:
-                raise orm.except_orm(
-                    _("Connection Test Failed!"),
-                    _("Check Host, Port and Password"))
 
     def _get_calling_number(self, cr, uid, context=None):
-
         user, fs_server, fs_manager = self._connect_to_freeswitch(
             cr, uid, context=context)
         calling_party_number = False
         try:
-            request = "channels like /" + re.sub(r'/', r':', user.resource) + \
+            is_fq_res = user.resource.rfind('@')
+            if is_fq_res > 0:
+                resource = user.resource[0:is_fq_res]
+            else:
+                resource = user.resource
+            request = "channels like /" + re.sub(r'/', r':', resource) + \
                 ("/" if user.freeswitch_chan_type == "FreeTDM" else "@") + \
                 " as json"
             ret = fs_manager.api('show', str(request))
             f = json.load(StringIO.StringIO(ret.getBody()))
             if int(f['row_count']) > 0:
-                if (f['rows'][0]['cid_num'] == user.internal_number or
-                    len(f['rows'][0]['cid_num']) < 3):
-                        calling_party_number = f['rows'][0]['dest']
+                for x in range(0, int(f['row_count'])):
+                    if (is_fq_res and f['rows'][x]['presence_id'] !=
+                       user.resource):
+                            continue
+                    if (f['rows'][x]['cid_num'] == user.internal_number or
+                       len(f['rows'][x]['cid_num']) < 3):
+                            calling_party_number = f['rows'][x]['dest']
                     else:
-                    calling_party_number = f['rows'][0]['cid_num']
+                        calling_party_number = f['rows'][x]['cid_num']
         except Exception, e:
             _logger.error(
                 "Error in the Status request to FreeSWITCH server %s"
@@ -268,12 +274,14 @@ class freeswitch_server(orm.Model):
                 _('Error:'),
                 _("Can't get calling number from FreeSWITCH.\nHere is the "
                     "error: '%s'" % unicode(e)))
-
         finally:
             fs_manager.disconnect()
 
         _logger.debug("Calling party number: '%s'" % calling_party_number)
+        if isinstance(calling_party_number, int):
             return calling_party_number
+        else:
+            return False
 
     def get_record_from_my_channel(self, cr, uid, context=None):
         calling_number = self.pool['freeswitch.server']._get_calling_number(
@@ -303,7 +311,8 @@ class res_users(orm.Model):
             "auto answer."),
         'callerid': fields.char(
             'Caller ID', size=50,
-            help="Caller ID used for the calls initiated by this user."),
+            help="Caller ID used for the calls initiated by this user. "
+            "This must be in the form of 'Name <NUMBER>'."),
         'cdraccount': fields.char(
             'CDR Account', size=50,
             help="Call Detail Record (CDR) account used for billing this "
@@ -375,7 +384,7 @@ class res_users(orm.Model):
                         raise orm.except_orm(
                             _('Error:'),
                             _("The '%s' for the user '%s' should only have "
-                                "ASCII caracters")
+                                "ASCII characters")
                             % (check_string[0], user.name))
         return True
 
@@ -435,11 +444,12 @@ class PhoneCommon(orm.AbstractModel):
                 if len(variable):
                     variable += ','
                 caller_name = caller_name.replace(",", r"\,")
-                variable += 'effective_caller_id_name=' + caller_name
+                variable += 'effective_caller_id_name=\'' + caller_name + '\''
             if caller_number:
                 if len(variable):
                     variable += ','
-                variable += 'effective_caller_id_number=' + caller_number
+                variable += 'effective_caller_id_number=\'' + \
+                    caller_number + '\''
             if fs_server.wait_time != 60:
                 if len(variable):
                     variable += ','
@@ -457,10 +467,10 @@ class PhoneCommon(orm.AbstractModel):
             #    'Caller ID name showed to aleg' 90125
             dial_string = (('<' + variable + '>') if variable else '') + \
                 channel + ' ' + fs_number + ' ' + fs_server.context + ' ' + \
-                '\'' + self.get_name_from_phone_number(fs_number) + '\' ' + \
-                fs_number
+                '\'' + self.get_name_from_phone_number(cr, uid, fs_number) + \
+                '\' ' + fs_number
             # raise orm.except_orm(_('Error :'), dial_string)
-            fs_manager.api('originate', dial_string.encode("ascii"))
+            fs_manager.api('originate', dial_string.encode('utf-8'))
         except Exception, e:
             _logger.error(
                 "Error in the Originate request to FreeSWITCH server %s"

freeswitch_click2dial/scripts/get_caller_name.py

@@ -34,6 +34,8 @@
  comma (,) delimited, not :_: delimited. It is up to you to format the
  extensions list appropriately. The persons who are at extensions in the
  notify list will receive a poppup if so configured and if they are logged in.
+ The notify list actually shouldn't be in the cidlookup.conf, but should be
+ used when doing notify (in an on answer hook for example).
 
  From the dialplan, do something like this <action application="set"
  data="effective_caller_id_name=${cidlookup(${caller_id_number})}"/>.
@@ -81,6 +83,8 @@ import unicodedata
 # Name that will be displayed if there is no match
 # and no geolocalisation
 not_found_name = "Not in OpenERP"
+# Name used if name and number are both empty
+unknown_name = "unknown"
 
 # Set to 1 for debugging output
 verbose = 0
@@ -254,6 +258,8 @@ def application(environ, start_response):
         number = escape(parameters['number'][0])
     if 'name' in parameters:
         name = escape(parameters['name'][0])
+    else:
+        name = unknown_name
     if 'notify' in parameters:
         options["notify"] = []
         for item in parameters['notify'][0].split(','):
@@ -266,7 +272,10 @@ def application(environ, start_response):
         options["geoloc"] = True
     else:
         options["geoloc"] = False
-    output += main(name if name else False, number, options)
+    try:
+        output = main(name if name else False, number, options)
+    except:
+        output = name
 
     status = '200 OK'
     response_headers = [('Content-type', 'text/plain'),