MAGETWO-69496: Impossible specify Bundle option title on store view level with changes to more than one store view

Author: Oleksandr Iegorov

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -67,7 +67,8 @@ public function execute($entity, $arguments = [])
             $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
             $this->processExistedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
 
-            $this->saveOptions($entity, $options);
+            $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
+            $this->saveOptions($entity, $options, $newOptionsIds);
         } else {
             //save only labels and not selections + product links
             $this->saveOptions($entity, $options);
@@ -97,13 +98,17 @@ protected function removeOptionLinks($entitySku, $option)
      * Perform save for all options entities
      * @param object $entity
      * @param array $options
+     * @param array $newOptionsIds
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
      * @return void
      */
-    private function saveOptions($entity, $options)
+    private function saveOptions($entity, $options, $newOptionsIds = [])
     {
         foreach ($options as $option) {
+            if (in_array($option->getOptionId(), $newOptionsIds)) {
+                $option->setOptionId(null);
+            }
             $this->optionRepository->save($entity, $option);
         }
     }