diff options
| author | fwi-odoo <fwi@odoo.com> | 2017-07-06 10:40:18 +0200 |
|---|---|---|
| committer | fwi-odoo <fwi@odoo.com> | 2017-09-06 15:18:19 +0200 |
| commit | c0ceae2f93df5d08e5c4a99812dd5629f2d433bf (patch) | |
| tree | eb755c481edff0484a2e6cf7ddf3de987b9b8cbe /addons | |
| parent | 7820d67210daf30394ed19d077ecd218979a52b0 (diff) | |
[FIX] crm: module crm_voip doesn't exist anymore
Since the refactoring of VOIP, there is no more a module crm_voip but only
voip.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/base_setup/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 2 | ||||
| -rw-r--r-- | addons/crm/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/crm/views/res_config_settings_views.xml | 14 | ||||
| -rw-r--r-- | addons/web/static/tests/fields/basic_fields_tests.js | 12 | ||||
| -rw-r--r-- | addons/web/static/tests/views/form_tests.js | 6 |
6 files changed, 11 insertions, 25 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py index b2da7ff378f..19511627002 100644 --- a/addons/base_setup/models/res_config_settings.py +++ b/addons/base_setup/models/res_config_settings.py @@ -23,6 +23,7 @@ class ResConfigSettings(models.TransientModel): module_base_gengo = fields.Boolean("Translate Your Website with Gengo") module_inter_company_rules = fields.Boolean("Manage Inter Company") module_pad = fields.Boolean("Collaborative Pads") + module_voip = fields.Boolean("Asterisk (VoIP)") company_share_partner = fields.Boolean(string='Share partners to all companies', help="Share your partners to all companies defined in your instance.\n" " * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n" diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index d83cc4d1d99..7f0932f3adb 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -118,7 +118,7 @@ </div> </div> <h2>Integrations</h2> - <div class="row mt16 o_settings_container"> + <div class="row mt16 o_settings_container" name="integration"> <div class="col-xs-12 col-md-6 o_setting_box"> <div class="o_setting_left_pane"> <field name="module_pad"/> diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py index b4550d1bd93..52d8f220d1f 100644 --- a/addons/crm/models/res_config_settings.py +++ b/addons/crm/models/res_config_settings.py @@ -11,7 +11,6 @@ class ResConfigSettings(models.TransientModel): generate_lead_from_alias = fields.Boolean('Manual Assignation of Emails') group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead') module_crm_phone_validation = fields.Boolean("Phone Validation") - module_crm_voip = fields.Boolean("Asterisk (VoIP)") module_web_clearbit = fields.Boolean("Customer Autocomplete") def _find_default_lead_alias_id(self): diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml index 98c6f890ba8..dd979b590ee 100644 --- a/addons/crm/views/res_config_settings_views.xml +++ b/addons/crm/views/res_config_settings_views.xml @@ -77,20 +77,6 @@ </div> </div> </div> - <h2>Integrations</h2> - <div class="row mt16 o_settings_container"> - <div class="col-md-6 o_setting_box"> - <div class="o_setting_left_pane"> - <field name="module_crm_voip" widget="upgrade_boolean"/> - </div> - <div class="o_setting_right_pane"> - <label for="module_crm_voip"/> - <div class="text-muted" id="crm_voip"> - Schedule & make calls from CRM app - </div> - </div> - </div> - </div> </div> </xpath> </field> diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js index 6347ed63432..2e98a634409 100644 --- a/addons/web/static/tests/fields/basic_fields_tests.js +++ b/addons/web/static/tests/fields/basic_fields_tests.js @@ -2646,10 +2646,10 @@ QUnit.module('basic_fields', { }); QUnit.test('phone field in form view on normal screens', function (assert) { - // The behavior of this widget is completely altered by crm_voip so this - // test is irrelevant and fails if crm_voip is installed. The enterprise + // The behavior of this widget is completely altered by voip so this + // test is irrelevant and fails if voip is installed. The enterprise // module is responsible for testing its own behavior in its own tests. - if ('crm.voip' in odoo.__DEBUG__.services) { + if ('voip.user_agent' in odoo.__DEBUG__.services) { assert.expect(0); return; } @@ -2701,10 +2701,10 @@ QUnit.module('basic_fields', { }); QUnit.test('phone field in editable list view on normal screens', function (assert) { - // The behavior of this widget is completely altered by crm_voip so this - // test is irrelevant and fails if crm_voip is installed. The enterprise + // The behavior of this widget is completely altered by voip so this + // test is irrelevant and fails if voip is installed. The enterprise // module is responsible for testing its own behavior in its own tests. - if ('crm.voip' in odoo.__DEBUG__.services) { + if ('voip.user_agent' in odoo.__DEBUG__.services) { assert.expect(0); return; } diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index f87eea2d154..33f763a9ecc 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -3584,10 +3584,10 @@ QUnit.module('Views', { }); QUnit.test('navigation with tab key in readonly form view', function (assert) { - // The behavior of the phone widget is completely altered by crm_voip so - // this test fails if crm_voip is installed. The enterprise module is + // The behavior of the phone widget is completely altered by voip so + // this test fails if voip is installed. The enterprise module is // responsible for testing its own behavior in its own tests. - if ('crm.voip' in odoo.__DEBUG__.services) { + if ('voip.user_agent' in odoo.__DEBUG__.services) { assert.expect(0); return; } |
