Merge branch 'master' into develop

Author: sprankhub

src/app/code/community/AvS/FastSimpleImport/Model/Import/Entity/Product.php

@@ -1459,13 +1459,13 @@ protected function _saveProductCategories(array $categoriesData)
 
             foreach ($categoriesData as $delSku => $categories) {
                 $productId      = $this->_newSku[$delSku]['entity_id'];
-                $delProductId[] = $productId;
 
                 foreach ($categories as $categoryId => $position) {
+                    $delProductId[$productId] = $productId;
                     $categoriesIn[] = array('product_id' => $productId, 'category_id' => $categoryId, 'position' => (int) $position);
                 }
             }
-            if (Mage_ImportExport_Model_Import::BEHAVIOR_APPEND != $this->getBehavior()) {
+            if (Mage_ImportExport_Model_Import::BEHAVIOR_APPEND != $this->getBehavior() && sizeof($delProductId)) {
                 $this->_connection->delete(
                     $tableName,
                     $this->_connection->quoteInto('product_id IN (?)', $delProductId)

src/app/code/community/AvS/FastSimpleImport/Model/Import/Entity/Product/Type/Bundle.php

@@ -75,7 +75,7 @@ public function _initAttributes()
                         'code' => $attribute->getAttributeCode(),
                         'for_configurable' => $attribute->getIsConfigurable(),
                         'is_global' => $attribute->getIsGlobal(),
-                        'is_required' => $attribute->getIsRequired(),
+                        'is_required' => false,
                         'is_unique' => $attribute->getIsUnique(),
                         'frontend_label' => $attribute->getFrontendLabel(),
                         'is_static' => $attribute->isStatic(),

src/app/code/community/AvS/FastSimpleImport/Model/Import/Entity/Product/Type/Grouped.php

@@ -183,7 +183,6 @@ public function saveData()
                     $productData = $newSku[$rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_SKU]];
                 } else {
                     $colAttrSet = Mage_ImportExport_Model_Import_Entity_Product::COL_ATTR_SET;
-                    $productData = $newSku[$rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_SKU]];
                     $rowData[$colAttrSet] = $productData['attr_set_code'];
                     $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_TYPE] = $productData['type_id'];
                 }

src/app/code/community/AvS/FastSimpleImport/etc/config.xml

@@ -10,7 +10,7 @@
 <config>
     <modules>
         <AvS_FastSimpleImport>
-            <version>0.8.0</version>
+            <version>0.8.2</version>
         </AvS_FastSimpleImport>
     </modules>