Fix if cost_price is null
Merge branch 'master' into 2-0-stable

* master:
  Fix if cost_price is null