MC-35253: Customer group is automatically changed when editing customer on customer grid is assigned to the company

Author: nikita-shcherbatykh

app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

@@ -127,6 +127,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if (!$this->_customerAddress->isVatValidationEnabled($customer->getStore())
             || $this->_coreRegistry->registry(self::VIV_PROCESSED_FLAG)
             || !$this->_canProcessAddress($customerAddress)
+            || $customerAddress->getShouldIgnoreValidation()
         ) {
             return;
         }
@@ -136,7 +137,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
             if ($customerAddress->getVatId() == ''
                 || !$this->_customerVat->isCountryInEU($customerAddress->getCountry())
-                || $customerAddress->getShouldIgnoreValidation()
             ) {
                 $defaultGroupId = $this->_groupManagement->getDefaultGroup($customer->getStore())->getId();
                 if (!$customer->getDisableAutoGroupChange() && $customer->getGroupId() != $defaultGroupId) {

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/InlineEditTest.php

@@ -144,8 +144,7 @@ public function inlineEditParametersDataProvider(): array
      */
     public function testInlineEditActionWithAddress(): void
     {
-        $customer = $this->customerRepository->get('customer_one_address@test.com');
-        $this->changeCustomerAddress((int)$customer->getDefaultShipping());
+        $customer = $this->getCustomer();
         $params = [
             'items' => [
                 $customer->getId() => []
@@ -166,17 +165,19 @@ public function testInlineEditActionWithAddress(): void
     /**
      * Change customer address with setting country from EU and setting VAT number
      *
-     * @param int $customerAddressId
-     * @return void
+     * @return CustomerInterface
      */
-    private function changeCustomerAddress(int $customerAddressId): void
+    private function getCustomer(): CustomerInterface
     {
-        $address = $this->addressRepository->getById($customerAddressId);
+        $customer = $this->customerRepository->get('customer_one_address@test.com');
+        $address = $this->addressRepository->getById((int)$customer->getDefaultShipping());
         $address->setVatId(12345);
         $address->setCountryId('DE');
         $address->setRegionId(0);
         $this->addressRepository->save($address);
         $this->coreRegistry->unregister(AfterAddressSaveObserver::VIV_PROCESSED_FLAG);
+        //return customer after address repository save
+        return $this->customerRepository->get('customer_one_address@test.com');
     }
 
     /**