diff --git a/.travis.yml b/.travis.yml index 5dfe813..4370009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly - - pip install phonenumbers py-Asterisk SOAPpy + - pip install phonenumbers py-Asterisk SOAPpy FreeSWITCH-ESL-Python - hg clone http://bitbucket.org/anybox/web_action_request -b ${VERSION} ${HOME}/dependencies/web_action_request - hg clone http://bitbucket.org/anybox/bus_enhanced ${HOME}/dependencies/bus_enhanced diff --git a/asterisk_click2dial/__openerp__.py b/asterisk_click2dial/__openerp__.py index edc59f9..97ee6dc 100644 --- a/asterisk_click2dial/__openerp__.py +++ b/asterisk_click2dial/__openerp__.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Asterisk Click2dial module for OpenERP diff --git a/asterisk_click2dial/asterisk_click2dial.py b/asterisk_click2dial/asterisk_click2dial.py index 8ddfeb0..73faa13 100644 --- a/asterisk_click2dial/asterisk_click2dial.py +++ b/asterisk_click2dial/asterisk_click2dial.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Asterisk Click2dial module for OpenERP diff --git a/asterisk_click2dial/controller.py b/asterisk_click2dial/controller.py index b48c66f..139018c 100644 --- a/asterisk_click2dial/controller.py +++ b/asterisk_click2dial/controller.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Asterisk click2dial module for OpenERP diff --git a/base_phone/__openerp__.py b/base_phone/__openerp__.py index 2037b4b..21cb97f 100644 --- a/base_phone/__openerp__.py +++ b/base_phone/__openerp__.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Base Phone module for OpenERP diff --git a/freeswitch_click2dial/__openerp__.py b/freeswitch_click2dial/__openerp__.py index 239251b..d525e78 100644 --- a/freeswitch_click2dial/__openerp__.py +++ b/freeswitch_click2dial/__openerp__.py @@ -22,73 +22,10 @@ { 'name': 'FreeSWITCH Click2dial', - 'version': '0.4', + 'version': '8.0.0.4.0', 'category': 'Phone', 'license': 'AGPL-3', 'summary': 'FreeSWITCH-OpenERP connector', - 'description': """ -FreeSWITCH-OpenERP connector -========================== - -The technical name of this module is *freeswitch_click2dial*, but this module -implements much more than a simple *click2dial* ! This module adds 3 -functionalities: - -1) It adds a *Dial* button in the partner form view so that users can directly - dial a phone number through FreeSWITCH. This feature is usually known as - *click2dial*. Here is how it works : - - * In OpenERP, the user clicks on the *Dial* button next to a phone number - field in the partner view. - - * OpenERP connects to the FreeSWITCH Event Socket and FreeSWITCH makes the - user's phone ring. - - * The user answers his own phone (if he doesn't, the process stops here). - - * FreeSWITCH dials the phone number found in OpenERP in place of the user. - - * If the remote party answers, the user can talk to his correspondent. - -2) It adds the ability to show the name of the calling party on the screen of - your IP phone on incoming phone calls if the presented phone number is - present in the partner/leads/employees/... of OpenERP. To understand how to - use this, please see get_caller_name.py, which should be installed per the - instructions in the script on the OpenERP/Odoo server. This works for - incoming and outgoing calls, per instructions in the script. - -3) It adds a phone icon (*Open Caller*) in the top menu bar - (next to the Preferences) to get the partner/lead/candidate/registrations - corresponding to the calling party in one click. Here is how it works : - - * When the user clicks on the phone icon, OpenERP sends a query to the - FreeSWITCH Manager Interface to get a list of the current phone calls - - * If it finds a phone call involving the user's phone, it gets the phone - number of the calling party - - * It searches the phone number of the calling party in the - Partners/Leads/Candidates/Registrations of OpenERP. If a record matches, - it takes you to the form view of this record. If no record matchs, it - opens a wizard which proposes to create a new Partner with the presented - phone number as *Phone* or *Mobile* number or update an existing Partner. - - It is possible to get a pop-up of the record corresponding to the calling - party without any action from the user via the module *base_phone_popup*. - - Additionally, you will need the FreeSWITCH ESL python module. You will - find it under ${FREESWITCH_SRC_TOP_DIR}/libs/esl/python. Go to - ${FREESWITCH_SRC_TOP_DIR}/libs/esl. Type make. Then make pymod. You will - then need to install ${FREESWITCH_SRC_TOP_DIR}/libs/esl/python/ESL.py and - ${FREESWITCH_SRC_TOP_DIR}/libs/esl/python/_ESL.so into the appropriate - places on your OpenERP/Odoo server. - (https://wiki.freeswitch.org/wiki/Event_Socket_Library#Installation for - more information.) An alternative method would involve - https://github.com/gurteshwar/freeswitch-esl-python. - -A detailed documentation for this module is available on the Akretion Web site: -http://www.akretion.com/products-and-services/openerp-freeswitch-voip-connector -""", 'author': "Trever L. Adams,Akretion,Odoo Community Association (OCA)", 'website': 'https://github.com/treveradams/connector-telephony', 'depends': ['base_phone'], @@ -104,5 +41,4 @@ http://www.akretion.com/products-and-services/openerp-freeswitch-voip-connector 'css': ['static/src/css/*.css'], 'application': True, 'installable': True, - 'active': False, } diff --git a/freeswitch_click2dial/freeswitch_click2dial.py b/freeswitch_click2dial/freeswitch_click2dial.py index 21afc3c..1265139 100644 --- a/freeswitch_click2dial/freeswitch_click2dial.py +++ b/freeswitch_click2dial/freeswitch_click2dial.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # FreeSWITCH Click2dial module for OpenERP diff --git a/freeswitch_click2dial_crm/README.rst b/freeswitch_click2dial_crm/README.rst new file mode 100644 index 0000000..2cb26d0 --- /dev/null +++ b/freeswitch_click2dial_crm/README.rst @@ -0,0 +1,13 @@ +FreeSWITCH Click2dial CRM +========================= + +This module is *EMPTY* ; so you should uninstall it now. +The code that used to be in this module has been moved to the module +*crm_phone* that is available in the same GitHub repository +https://github.com/OCA/connector-telephony + +This module will be removed from the repository in the near future. + +A detailed documentation for the OpenERP-FreeSWITCH connector is available on the +Akretion Web site : +http://www.akretion.com/products-and-services/openerp-freeswitch-voip-connector diff --git a/freeswitch_click2dial_crm/__openerp__.py b/freeswitch_click2dial_crm/__openerp__.py index ad61edd..65173b7 100644 --- a/freeswitch_click2dial_crm/__openerp__.py +++ b/freeswitch_click2dial_crm/__openerp__.py @@ -22,26 +22,11 @@ { "name": "FreeSWITCH Click2dial CRM", - "version": "0.1", + "version": "8.0.0.0.1", "author": "Akretion,Odoo Community Association (OCA)", "website": "http://www.akretion.com", "license": "AGPL-3", "category": "Phone", - "description": """ -FreeSWITCH Click2dial CRM -======================= - -This module is *EMPTY* ; so you should uninstall it now. -The code that used to be in this module has been moved to the module -*crm_phone* that is available in the same GitHub repository -https://github.com/OCA/connector-telephony - -This module will be removed from the repository in the near future. - -A detailed documentation for the OpenERP-FreeSWITCH connector is available on the -Akretion Web site : -http://www.akretion.com/products-and-services/openerp-freeswitch-voip-connector -""", "depends": [ 'freeswitch_click2dial', 'crm_phone',