[MERGE] forward port branch saas-11 up to 4bf6f5a7e3

addons/l10n_be/data/account_tax_template_data.xml

@@ -1007,7 +1007,7 @@
             <field name="name">TVA Déductible 12% Intracomm. - Approvisionn. et marchandises</field>
             <field name="price_include" eval="0"/>
             <field name="amount">12</field>
-            <field name="amount_type">percent</field>
+            <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
             <field name="children_tax_ids" eval="[(6, 0, [ref('attn_VAT-IN-V81-12-EU-C1'), ref('attn_VAT-IN-V81-12-EU-C2')])]"/>
             <field name="chart_template_id" ref="l10nbe_chart_template"/>

addons/web/static/src/js/views/search_menus.js

@@ -120,6 +120,7 @@ return Widget.extend({
             model_id: this.target_model,
             context: results.context,
             domain: results.domain,
+            sort: JSON.stringify(this.searchview.dataset._sort),
             is_default: default_filter,
             action_id: this.action_id,
         };
@@ -237,6 +238,13 @@ return Widget.extend({
         }
         this.query.reset([this.facet_for(filter)], {
             preventSearch: preventSearch || false});
+
+        // Load sort settings on view
+        if (!_.isUndefined(filter.sort)){
+            var sort_items = JSON.parse(filter.sort);
+            this.searchview.dataset.set_sort(sort_items);
+        }
+
         this.$filters[this.key_for(filter)].addClass('selected');
     },
     remove_filter: function (filter, $filter, key) {