Merge commit 'refs/pull/1274/head' of https://github.com/magento/magento2 into MAGETWO-37499

Leonid Poluyanov · Leonid Poluyanov · commit 40a12adb5bef · 2015-05-18T14:51:38.000+03:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1682,6 +1682,7 @@ protected function _saveValidatedBunches()
             }
             $rowData = $source->current();
             $this->validateRow($rowData, $source->key());
+            $this->_processedRowsCount++;
             $source->next();
         }
         $this->getOptionEntity()->validateAmbiguousData();
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -270,7 +270,7 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
                         ))
                     ) {
                         $this->_entityModel->addRowError(
-                            \Magento\CatalogImportExport\Model\Import\Product::ERROR_VALUE_IS_REQUIRED,
+                            \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface::ERROR_VALUE_IS_REQUIRED,
                             $rowNum,
                             $attrCode
                         );

Original file line number	Diff line number	Diff line change
`@@ -1682,6 +1682,7 @@ protected function _saveValidatedBunches()`
`1682`	`1682`	`}`
`1683`	`1683`	`$rowData = $source->current();`
`1684`	`1684`	`$this->validateRow($rowData, $source->key());`
	`1685`	`+ $this->_processedRowsCount++;`
`1685`	`1686`	`$source->next();`
`1686`	`1687`	`}`
`1687`	`1688`	`$this->getOptionEntity()->validateAmbiguousData();`