From 2c5fe07fc760396af7d671131da1a5f8ee4d7b50 Mon Sep 17 00:00:00 2001
From: Ward Marissen <ward.marissen@gmail.com>
Date: Mon, 22 Jan 2018 20:21:54 +0100
Subject: [PATCH] [FIX] website_portal: Keep country changes

When a portal user changes his account details and presses the 'Save' button
when a mandatory field is not set, the selected country will be reset even when
the user did change the country in the form. This fix prevents this from
happening and leads to an improvement for the end user.

This commit closes #22439
---
 addons/website_portal/views/templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_portal/views/templates.xml b/addons/website_portal/views/templates.xml
index 592bf9a4f63..ec902564380 100644
--- a/addons/website_portal/views/templates.xml
+++ b/addons/website_portal/views/templates.xml
@@ -113,7 +113,7 @@
                                         <select name="country_id" class="form-control">
                                             <option value="">Country...</option>
                                             <t t-foreach="countries or []" t-as="country">
-                                                <option t-att-value="country.id" t-att-selected="country.id == partner.country_id.id">
+                                                <option t-att-value="country.id" t-att-selected="country.id == int(country_id) if country_id else country.id == partner.country_id.id">
                                                     <t t-esc="country.name" />
                                                 </option>
                                             </t>