schema.rb
fix conflicts schema.rb
mod findprint and stockout