From 532a22667f207a585e59387acd27db595e8399e7 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 23 Oct 2020 14:06:54 +0000
Subject: [PATCH] [FIX] base, website_sale: vietnam zip not required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Zip cannot be required if not in format address.
It will break ecommerce, because the customer cannot
validate the adress because zip code is not displayed but required.

Fix case in JS where field is not display to avoid traceback.

This commit closes #58950

closes odoo/odoo#60704

X-original-commit: 2d31892081a48c521357cef974ea23fc9228a39e
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 addons/website_sale/static/src/js/website_sale.js | 12 ++++++++----
 odoo/addons/base/data/res_country_data.xml        |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 65fa4537a1c..20c17679cf9 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -383,10 +383,14 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(VariantMixin, {
                 });
             }
 
-            $("label[for='zip']").toggleClass('label-optional', !data.zip_required);
-            $("label[for='state_id']").toggleClass('label-optional', !data.state_required);
-            $("label[for='zip']").get(0).toggleAttribute('required', !!data.zip_required);
-            $("label[for='state_id']").get(0).toggleAttribute('required', !!data.state_required);
+            if ($("label[for='zip']").length) {
+                $("label[for='zip']").toggleClass('label-optional', !data.zip_required);
+                $("label[for='zip']").get(0).toggleAttribute('required', !!data.zip_required);
+            }
+            if ($("label[for='zip']").length) {
+                $("label[for='state_id']").toggleClass('label-optional', !data.state_required);
+                $("label[for='state_id']").get(0).toggleAttribute('required', !!data.state_required);
+            }
         });
     },
     /**
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index d290b25e6e3..8908768f987 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -1529,6 +1529,7 @@
             <field name="code">vn</field>
             <field name="currency_id" ref="VND" />
             <field eval="84" name="phone_code" />
+            <field name='zip_required'>0</field>
             <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s %(country_name)s'" name="address_format" />
         </record>
         <record id="vu" model="res.country">