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

Why don't we call super and then redo what is needed? This way, we should avoid side effects derived from other extensions trying to override it, or the changes on standard.