Partner manage view: Merge the partner and address form

This is needed to get #1332 working, and kind of nice anyway. Note that
the view currently only works for the primary address.