diff --git a/addons/l10n_es/data/account_account_template_data.xml b/addons/l10n_es/data/account_account_template_data.xml
index 4c86cb55442..455d8132f04 100644
--- a/addons/l10n_es/data/account_account_template_data.xml
+++ b/addons/l10n_es/data/account_account_template_data.xml
@@ -1568,28 +1568,28 @@
4700
Hacienda Pública, deudora por IVA
-
+
4708
Hacienda Pública, deudora por subvenciones concedidas
-
+
4709
Hacienda Pública, deudora por devolución de impuestos
-
+
471
Organismos de la Seguridad Social, deudores
-
+
@@ -1603,77 +1603,77 @@
473
Hacienda Pública, retenciones y pagos a cuenta
-
+
4740
Activos por diferencias temporarias deducibles
-
+
4742
Derechos por deducciones y bonificaciones pendientes de aplicar
-
+
4745
Crédito por pérdidas a compensar del ejercicio
-
+
4750
Hacienda Pública, acreedora por IVA
-
+
4751
Hacienda Pública, acreedora por retenciones practicadas
-
+
4752
Hacienda Pública, acreedora por impuesto sobre sociedades
-
+
4758
Hacienda Pública, acreedora por subvenciones a reintegrar
-
+
476
Organismos de la Seguridad Social, acreedores
-
+
477
Hacienda Pública. IVA repercutido
-
+
479
Pasivos por diferencias temporarias imponibles
-
+
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index c5987ed838c..8ab953305fb 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -427,8 +427,8 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
return;
}
var ds = new data.DataSetStatic(self, model, self.build_context());
- ds.call('search_count', [domain]).then(function (results) {
- self.$('.o_count').text(results + _t(' selected records'));
+ ds.call('search_count', [domain, ds.get_context()]).then(function (results) {
+ self.$('.o_count').text(results + ' ' + _t(' selected records'));
if (self.get('effective_readonly')) {
self.$('button').text(_t('See selection '));
}
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index bf7b6bbd4bb..6491c32c52a 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -142,10 +142,20 @@ msgid "You are not subscribed to any of our mailing list."
msgstr ""
#. module: website_mass_mailing
+#. openerp-web
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:155
#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
+#, python-format
msgid "Your changes have been saved."
msgstr ""
+#. module: website_mass_mailing
+#. openerp-web
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:158
+#, python-format
+msgid "Your changes have not been saved, try again later."
+msgstr ""
+
#. module: website_mass_mailing
#: model:ir.model,name:website_mass_mailing.model_mass_mailing_config_settings
msgid "mass.mailing.config.settings"
diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
index a9e8ea86273..ae499fe2438 100644
--- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
+++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
@@ -124,8 +124,11 @@ animation.registry.newsletter_popup = animation.Class.extend({
odoo.define('mass_mailing.unsubscribe', function (require) {
var ajax = require('web.ajax');
+ var core = require('web.core');
require('web_editor.base'); // wait for implicit dependencies to load
+ var _t = core._t;
+
if (!$('.o_unsubscribe_form').length) {
return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'");
}
@@ -148,10 +151,10 @@ odoo.define('mass_mailing.unsubscribe', function (require) {
ajax.jsonRpc('/mail/mailing/unsubscribe', 'call', {'opt_in_ids': checked_ids, 'opt_out_ids': unchecked_ids, 'email': email, 'mailing_id': mailing_id})
.then(function(result) {
- $('.alert-info').html('Your changes has been saved.').removeClass('alert-info').addClass('alert-success');
+ $('.alert-info').html(_t('Your changes have been saved.')).removeClass('alert-info').addClass('alert-success');
})
.fail(function() {
- $('.alert-info').html('You changes has not been saved, try again later.').removeClass('alert-info').addClass('alert-warning');
+ $('.alert-info').html(_t('Your changes have not been saved, try again later.')).removeClass('alert-info').addClass('alert-warning');
});
});
});
diff --git a/odoo/modules/loading.py b/odoo/modules/loading.py
index 7841b23fd0e..e9744844841 100644
--- a/odoo/modules/loading.py
+++ b/odoo/modules/loading.py
@@ -364,7 +364,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
for (model,) in cr.fetchall():
if model in registry:
env[model]._check_removed_columns(log=True)
- else:
+ elif _logger.isEnabledFor(logging.INFO): # more an info that a warning...
_logger.warning("Model %s is declared but cannot be loaded! (Perhaps a module was partially removed or renamed)", model)
# Cleanup orphan records
@@ -402,8 +402,10 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
if update_module:
View = env['ir.ui.view']
for model in registry:
- if not View._validate_custom_views(model):
- _logger.warning('invalid custom view(s) for model %s', model)
+ try:
+ View._validate_custom_views(model)
+ except Exception as e:
+ _logger.warning('invalid custom view(s) for model %s: %s', model, tools.ustr(e))
if report.failures:
_logger.error('At least one test failed when loading the modules.')