fix mistake
Merge remote-tracking branch 'upstream/master'
Add warehouse to Retailer edit form