def s2f(s):
    """ Convert a string to a float even if it has + and , in it. """
    if s == None or s == '':
        return None
    if type(s) == type(0.0) or type(s) == type(0):
        # Already a number
        return s
    if s:
        return float(s.replace(',', ''))
    return None