MC-42704: Admin Checkout validation bug - Fixes as per CR comments done

Author: pradeep.rauthan

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -270,23 +270,16 @@ define([
                 resetShipping = true;
             }
 
-            if (type === 'billing' && !this.shippingAsBilling) {
-                resetSelectedBillingAddress = true;
-            }
-
             if (resetShipping) {
                 data['reset_shipping'] = true;
             }
 
-            if (this.selectAddressEvent === false) {
+            if (name !== 'customer_address_id' && this.selectAddressEvent === false) {
                 if (this.shippingAsBilling) {
                     $('order-shipping_address_customer_address_id').value = '';
                 }
-                // customer_address_id can not be set to blank, if changed to other saved addresses from dropdown list
-                // for both billing & shipping while no change made in other address fields
-                if (name !== 'customer_address_id') {
-                    $('order-' + type + '_address_customer_address_id').value = '';
-                }
+
+                $('order-' + type + '_address_customer_address_id').value = '';
             }
 
             data['order[' + type + '_address][customer_address_id]'] = null;