Update on_hand scope to account for StockItems having deleted_at
Spree ~> 2.1.0 compatibility
Master now targets Spree 2.2.0.beta