diff options
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/rng/calendar_view.rng | 2 | ||||
| -rw-r--r-- | odoo/addons/base/static/src/js/res_config_settings.js | 9 | ||||
| -rw-r--r-- | odoo/addons/base/static/tests/base_settings_tests.js | 4 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_module_views.xml | 4 | ||||
| -rw-r--r-- | odoo/addons/base/views/res_partner_views.xml | 10 |
5 files changed, 20 insertions, 9 deletions
diff --git a/odoo/addons/base/rng/calendar_view.rng b/odoo/addons/base/rng/calendar_view.rng index 949c3f48318..500a61b3389 100644 --- a/odoo/addons/base/rng/calendar_view.rng +++ b/odoo/addons/base/rng/calendar_view.rng @@ -32,7 +32,7 @@ <rng:ref name="field"/> </rng:zeroOrMore> <rng:optional> - <rng:element name="template"> + <rng:element name="templates"> <rng:oneOrMore> <rng:ref name="any"/> </rng:oneOrMore> diff --git a/odoo/addons/base/static/src/js/res_config_settings.js b/odoo/addons/base/static/src/js/res_config_settings.js index 855b03452ae..9514d431141 100644 --- a/odoo/addons/base/static/src/js/res_config_settings.js +++ b/odoo/addons/base/static/src/js/res_config_settings.js @@ -354,6 +354,15 @@ var BaseSettingController = FormController.extend({ this.disableAutofocus = true; this.renderer.activeSettingTab = this.initialState.context.module; }, + /** + * Settings view should always be in edit mode, so we have to override + * default behaviour + * + * @override + */ + willRestore: function () { + this.mode = 'edit'; + }, }); var BaseSettingsModel = BasicModel.extend({ diff --git a/odoo/addons/base/static/tests/base_settings_tests.js b/odoo/addons/base/static/tests/base_settings_tests.js index e0ee5dd6380..eb9726b9fa6 100644 --- a/odoo/addons/base/static/tests/base_settings_tests.js +++ b/odoo/addons/base/static/tests/base_settings_tests.js @@ -87,7 +87,7 @@ QUnit.module('base_settings_tests', { }); QUnit.test('settings views does not read existing id when coming back in breadcrumbs', function (assert) { - assert.expect(7); + assert.expect(8); var actions = [{ id: 1, @@ -127,6 +127,8 @@ QUnit.module('base_settings_tests', { actionManager.doAction(1); actionManager.$('button[name="4"]').click(); $('.o_control_panel .breadcrumb-item a').click(); + assert.ok(actionManager.$('.o_form_view').hasClass('o_form_editable'), + 'settings view should still be in edit mode'); assert.verifySteps([ 'load_views', // initial setting action 'default_get', // this is a setting view => create new record diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml index ebf6700ecea..7f1bb9727a9 100644 --- a/odoo/addons/base/views/ir_module_views.xml +++ b/odoo/addons/base/views/ir_module_views.xml @@ -37,8 +37,8 @@ <search string="Search modules"> <field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Module"/> - <filter name="app" string="Apps" domain="[('application', '=', 1)]"/> - <filter name="extra" string="Extra" domain="[('application', '=', 0)]"/> + <filter name="app" string="Apps" domain="[('application', '=', True)]"/> + <filter name="extra" string="Extra" domain="[('application', '=', False)]"/> <separator/> <filter name="installed" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/> <filter name="not_installed" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/> diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml index 9a86939782b..1880589a326 100644 --- a/odoo/addons/base/views/res_partner_views.xml +++ b/odoo/addons/base/views/res_partner_views.xml @@ -449,15 +449,15 @@ <search string="Search Partner"> <field name="name" filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/> - <field name="parent_id" domain="[('is_company','=',1)]" operator="child_of"/> + <field name="parent_id" domain="[('is_company','=',True)]" operator="child_of"/> <filter name="filter_my_partners" help="My Contacts" domain="[('user_id','=',uid)]"/> <separator/> - <filter string="Individuals" name="type_person" domain="[('is_company','=',0)]"/> - <filter string="Companies" name="type_company" domain="[('is_company','=',1)]"/> + <filter string="Individuals" name="type_person" domain="[('is_company','=',False)]"/> + <filter string="Companies" name="type_company" domain="[('is_company','=',True)]"/> <separator/> - <filter string="Customers" name="customer" domain="[('customer','=',1), ('parent_id', '=', False)]"/> - <filter string="Vendors" name="supplier" domain="[('supplier','=',1), ('parent_id', '=', False)]"/> + <filter string="Customers" name="customer" domain="[('customer','=',True), ('parent_id', '=', False)]"/> + <filter string="Vendors" name="supplier" domain="[('supplier','=',True), ('parent_id', '=', False)]"/> <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> <separator/> <field name="category_id" string="Tag" filter_domain="[('category_id','ilike', self)]"/> |