adapt the views of po and tender to be consistent wrt customer addresses and picking type