[FIX] base_partner_merge: properly ignore computed fields when merging 2 partners