Master wmsstaging3 jco

Depends also on wmsstaging2.  See commits.  
could be written in a single line
dom = company_id and [('company_id', '=', company_id)] or []