Skip to content

Commit

Permalink
Merge pull request #941 from magento-east/MAGETWO-66366
Browse files Browse the repository at this point in the history
East 2.1.6 MAGETWO-66366
  • Loading branch information
Volodymyr Klymenko authored Mar 21, 2017
2 parents 81d30a9 + ccd8b1f commit 24024fb
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/code/Magento/CatalogInventory/Model/Stock/Status.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ protected function _construct()
}

//@codeCoverageIgnoreStart

/**
* @return int
*/
Expand All @@ -99,7 +100,7 @@ public function getWebsiteId()
*/
public function getStockId()
{
return $this->getData(self::KEY_WEBSITE_ID);
return $this->getData(self::KEY_STOCK_ID);
}

/**
Expand Down Expand Up @@ -128,6 +129,7 @@ public function getStockItem()
}

//@codeCoverageIgnoreStart

/**
* @param int $productId
* @return $this
Expand Down

0 comments on commit 24024fb

Please sign in to comment.