- option to allow the use of phone numbers in National format,
as discussed with Albert. This option is on the definition of the server.
-> required a large change of the reformat number process
- added exact link to documentation in module description
- some clean-up
# In fact, maybe it the waittime for external correspondants !
# -> if yes, default waittime should be changed from 15 to 30
fromosvimportosv,fields
fromosvimportosv,fields
# Lib required to open a socket towards Asterisk
# Lib required to open a socket (needed to communicate with Asterisk server)
importsocket
importsocket
# Lib required to print logs
# Lib required to print logs
importnetsvc
importnetsvc
classasterisk_server(osv.osv):
classasterisk_server(osv.osv):
_name="asterisk.server"
_name="asterisk.server"
_description="Asterisk Servers"
_description="Asterisk Servers"
@ -39,12 +42,13 @@ class asterisk_server(osv.osv):
'national_prefix':fields.char('National prefix',size=4,help="Prefix for national phone calls (don't include the 'out prefix'). For e.g., in France, the phone numbers look like '01 41 98 12 42' : the National prefix is '0'."),
'national_prefix':fields.char('National prefix',size=4,help="Prefix for national phone calls (don't include the 'out prefix'). For e.g., in France, the phone numbers look like '01 41 98 12 42' : the National prefix is '0'."),
'international_prefix':fields.char('International prefix',size=4,help="Prefix to add to make international phone calls (don't include the 'out prefix'). For e.g., in France, the International prefix is '00'."),
'international_prefix':fields.char('International prefix',size=4,help="Prefix to add to make international phone calls (don't include the 'out prefix'). For e.g., in France, the International prefix is '00'."),
'country_prefix':fields.char('My country prefix',size=4,help="Phone prefix of the country where the Asterisk server is located. For e.g. the phone prefix for France is '33'. If the phone number to dial starts with the 'My country prefix', OpenERP will remove the country prefix from the phone number and add the 'out prefix' followed by the 'national prefix'. If the phone number to dial doesn't start with the 'My country prefix', OpenERP will add the 'out prefix' followed by the 'international prefix'."),
'country_prefix':fields.char('My country prefix',size=4,help="Phone prefix of the country where the Asterisk server is located. For e.g. the phone prefix for France is '33'. If the phone number to dial starts with the 'My country prefix', OpenERP will remove the country prefix from the phone number and add the 'out prefix' followed by the 'national prefix'. If the phone number to dial doesn't start with the 'My country prefix', OpenERP will add the 'out prefix' followed by the 'international prefix'."),
'national_format_allowed':fields.boolean('National format allowed ?',help="Do we allow to use click2dial on phone numbers written in national format, e.g. 01 41 98 12 42, or only in the international format, e.g. +33 1 41 98 12 42 ?"),
'login':fields.char('AMI login',size=30,required=True,help="Login that OpenERP will use to communicate with the Asterisk Manager Interface. Refer to /etc/asterisk/manager.conf on your Asterisk server."),
'login':fields.char('AMI login',size=30,required=True,help="Login that OpenERP will use to communicate with the Asterisk Manager Interface. Refer to /etc/asterisk/manager.conf on your Asterisk server."),
'password':fields.char('AMI password',size=30,required=True,help="Password that Asterisk will use to communicate with the Asterisk Manager Interface. Refer to /etc/asterisk/manager.conf on your Asterisk server."),
'password':fields.char('AMI password',size=30,required=True,help="Password that Asterisk will use to communicate with the Asterisk Manager Interface. Refer to /etc/asterisk/manager.conf on your Asterisk server."),
'context':fields.char('Dialplan context',size=50,required=True,help="Asterisk dialplan context from which the calls will be made. Refer to /etc/asterisk/extensions.conf on your Asterisk server."),
'context':fields.char('Dialplan context',size=50,required=True,help="Asterisk dialplan context from which the calls will be made. Refer to /etc/asterisk/extensions.conf on your Asterisk server."),
'wait_time':fields.integer('Wait time (sec)',required=True,help="Amount of time (in seconds) Asterisk will try to reach the user's phone before hanging up."),
'wait_time':fields.integer('Wait time (sec)',required=True,help="Amount of time (in seconds) Asterisk will try to reach the user's phone before hanging up."),
'extension_priority':fields.integer('Extension priority',required=True,help="Priority of the extension in the Asterisk dialplan. Refer to /etc/asterisk/extensions.conf on your Asterisk server."),
'extension_priority':fields.integer('Extension priority',required=True,help="Priority of the extension in the Asterisk dialplan. Refer to /etc/asterisk/extensions.conf on your Asterisk server."),
'alert-info':fields.char('Alert-Info SIP header',size=40,help="Set Alert-Info header in SIP request to user's IP Phone. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial, for example you could choose a silent ring tone."),
'alert_info':fields.char('Alert-Info SIP header',size=40,help="Set Alert-Info header in SIP request to user's IP Phone. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial, for example you could choose a silent ring tone."),
'company_id':fields.many2one('res.company','Company',help="Company who uses the Asterisk server."),
'company_id':fields.many2one('res.company','Company',help="Company who uses the Asterisk server."),
}
}
@ -103,9 +107,6 @@ class asterisk_server(osv.osv):
returnFalse
returnFalse
returnTrue
returnTrue
# TODO : is it possible to read the field name inside the constraint
# function in order to avoid using as many functions as fields to
# check prefix ?
_constraints=[
_constraints=[
(_only_digits_out_prefix,"Only use digits for the 'out prefix' or leave empty",['out_prefix']),
(_only_digits_out_prefix,"Only use digits for the 'out prefix' or leave empty",['out_prefix']),
(_only_digits_country_prefix,"Only use digits for the 'country prefix'",['country_prefix']),
(_only_digits_country_prefix,"Only use digits for the 'country prefix'",['country_prefix']),
@ -116,6 +117,7 @@ class asterisk_server(osv.osv):
(_check_port,'TCP ports range from 1 to 65535',['port']),
(_check_port,'TCP ports range from 1 to 65535',['port']),
]
]
# This function is dedicated to the transformation of the number
# This function is dedicated to the transformation of the number
# available in OpenERP to the number that Asterisk should dial.
# available in OpenERP to the number that Asterisk should dial.
# You may have to inherit this function in another module specific
# You may have to inherit this function in another module specific
@ -123,29 +125,22 @@ class asterisk_server(osv.osv):
invalid_format_msg="The phone number is not written in valid international format. Example of valid international format : +33 1 41 98 12 42"
error_title_msg="Invalid phone number"
invalid_international_format_msg="The phone number is not written in valid international format. Example of valid international format : +33 1 41 98 12 42"
invalid_national_format_msg="The phone number is not written in valid national format."
invalid_format_msg="The phone number is not written in valid format."
# Let's call the variable tmp_number now
# Let's call the variable tmp_number now
tmp_number=erp_number
tmp_number=erp_number
logger.notifyChannel('asterisk_click2dial',netsvc.LOG_DEBUG,'Number before reformat = '+tmp_number)
logger.notifyChannel('asterisk_click2dial',netsvc.LOG_DEBUG,'Number before reformat = '+tmp_number)
@ -167,10 +172,19 @@ class asterisk_server(osv.osv):
tmp_number=international_prefix+tmp_number
tmp_number=international_prefix+tmp_number
logger.notifyChannel('asterisk_click2dial',netsvc.LOG_DEBUG,'International prefix = '+international_prefix+' - Number with international prefix = '+tmp_number)
logger.notifyChannel('asterisk_click2dial',netsvc.LOG_DEBUG,'International prefix = '+international_prefix+' - Number with international prefix = '+tmp_number)
# Add 'out prefix' to all numbers - Caution : out prefix can be False
Alexis de Lattre
14 years ago