fixed a bug where stockunit are n ot blocked correctly
Merge origin/master