From 69236ada46ef38a81a33950eb7361afb625e5077 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 20 Jul 2017 16:11:01 +0200
Subject: [PATCH 1/2] [FIX] web: sorted saved filter lost in merge

In 3071ef16c sorted filter was added, but arround the same time with the
change of filter in 6c579354 the js part of the feature was lost.

This commit adds it back.

opw-749422
closes #18361
---
 addons/web/static/src/js/views/search_menus.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web/static/src/js/views/search_menus.js b/addons/web/static/src/js/views/search_menus.js
index 10ab44ef30c..427aebda39d 100644
--- a/addons/web/static/src/js/views/search_menus.js
+++ b/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) {

From da0eb25221f2149bb176c435f65fc649de195db8 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 26 Jul 2017 13:20:55 +0200
Subject: [PATCH 2/2] [FIX] l10n_be: VAT-IN-V81-12-EU

The tax 'VAT-IN-V81-12-EU' should be a group of taxes, similarly to
'VAT-IN-V81-06-EU' and 'VAT-IN-V81-21-EU'.

opw-752879
---
 addons/l10n_be/account_tax_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be/account_tax_template.xml b/addons/l10n_be/account_tax_template.xml
index 0785ba2269c..fb2b2e697ab 100644
--- a/addons/l10n_be/account_tax_template.xml
+++ b/addons/l10n_be/account_tax_template.xml
@@ -973,7 +973,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"/>