Merge branch 'MAGNIMEX-13-Import-history-asterisk' into 'master'

A-Komar · A-Komar · commit a4d7c5185441 · 2015-06-24T15:21:24.000+03:00
Magnimex 13 import history asterisk

Magnimex 13 import history asterisk

See merge request !182
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -677,7 +677,7 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)
         return $this->validateRow($rowData, $rowNumber) && !isset($this->_skippedRows[$rowNumber]);
     }
 
-     /**
+    /**
      * Is import need to log in history.
      *
      * @return bool

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)`
`677`	`677`	`return $this->validateRow($rowData, $rowNumber) && !isset($this->_skippedRows[$rowNumber]);`
`678`	`678`	`}`
`679`	`679`
`680`		`- /**`
	`680`	`+ /**`
`681`	`681`	`* Is import need to log in history.`
`682`	`682`	`*`
`683`	`683`	`* @return bool`