[MERGE] forward port branch 9.0 up to e0d33ce07de

4 files changed, 32 insertions, 19 deletions

diff --git a/addons/l10n_es/account_account_common.xml b/addons/l10n_es/account_account_common.xml
index 0d0621c8d01..e1ac2a4866f 100644
--- a/addons/l10n_es/account_account_common.xml
+++ b/addons/l10n_es/account_account_common.xml
@@ -1570,28 +1570,28 @@
             <field name="code">4700</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, deudora por IVA</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4708_child" model="account.account.template">
             <field name="code">4708</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, deudora por subvenciones concedidas</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4709_child" model="account.account.template">
             <field name="code">4709</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, deudora por devolución de impuestos</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_471_child" model="account.account.template">
             <field name="code">471</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Organismos de la Seguridad Social, deudores</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_472_child" model="account.account.template">
@@ -1605,77 +1605,77 @@
             <field name="code">473</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4740_child" model="account.account.template">
             <field name="code">4740</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Activos por diferencias temporarias deducibles</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4742_child" model="account.account.template">
             <field name="code">4742</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Derechos por deducciones y bonificaciones pendientes de aplicar</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4745_child" model="account.account.template">
             <field name="code">4745</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Crédito por pérdidas a compensar del ejercicio</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4750_child" model="account.account.template">
             <field name="code">4750</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, acreedora por IVA</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4751_child" model="account.account.template">
             <field name="code">4751</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4752_child" model="account.account.template">
             <field name="code">4752</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, acreedora por impuesto sobre sociedades</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4758_child" model="account.account.template">
             <field name="code">4758</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública, acreedora por subvenciones a reintegrar</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_476_child" model="account.account.template">
             <field name="code">476</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Organismos de la Seguridad Social, acreedores</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_477_child" model="account.account.template">
             <field name="code">477</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Hacienda Pública. IVA repercutido</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_479_child" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pasivos por diferencias temporarias imponibles</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_480_child" model="account.account.template">
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 616e3e1aa07..41e0e6e8b02 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -430,8 +430,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 da4e68428db..90885759eeb 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -107,11 +107,21 @@ 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.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
 #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
 msgid "your email..."
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 bdc76baa2ae..e744eea5320 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
@@ -125,8 +125,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'");
 }
@@ -149,10 +152,10 @@ if(!$('.o_unsubscribe_form').length) {
 
         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');
             });
     });