diff -Naur orig/asterisk360/asterisk360.py new/asterisk360/asterisk360.py --- orig/asterisk360/asterisk360.py 2012-06-02 20:52:52.519162786 +0100 +++ new/asterisk360/asterisk360.py 2012-06-02 20:53:12.926906140 +0100 @@ -113,7 +113,7 @@ _inherit = "asterisk.server" _columns = { - 'ws_address': fields.char('Asterisk WebSocket Server Full Address or DNS', size=150, help="Full URI of the WebSockets Server including port.") + 'ws_address': fields.char('Asterisk WebSocket Server Full Address or DNS', size=150, help="Full URI of the WebSockets Server including port e.g ws://:") } asterisk_server() @@ -122,7 +122,7 @@ _name = "res.users" _inherit = "res.users" _columns = { - 'asterisk_chan_type': fields.selection([('SIP', 'SIP'), ('IAX2', 'IAX2'), ('DAHDI', 'DAHDI'), ('Zap', 'Zap'), ('Skinny', 'Skinny'), ('MGCP', 'MGCP'), ('mISDN', 'mISDN'), ('H323', 'H323'), ('USTM', 'USTM')], 'Asterisk channel type', help="Asterisk channel type, as used in the Asterisk dialplan. If the user has a regular IP phone, the channel type is 'SIP'."), + 'asterisk_chan_type': fields.selection([('SIP', 'SIP'), ('IAX2', 'IAX2'), ('DAHDI', 'DAHDI'), ('Zap', 'Zap'), ('Skinny', 'Skinny'), ('MGCP', 'MGCP'), ('mISDN', 'mISDN'), ('H323', 'H323'), ('USTM', 'USTM'), ('SCCP', 'SCCP')], 'Asterisk channel type', help="Asterisk channel type, as used in the Asterisk dialplan. If the user has a regular IP phone, the channel type is 'SIP'."), 'screen_pop': fields.boolean('Screen Pop', help="Check to enable screen pops for this user") } res_users()