[FIX] hr: merge both override of Many2OneAvatarEmployeeField.extractProps

Both a07c6c55 and 41eaff0f were merged at the same time
without conflict

closes odoo/odoo#132221

Signed-off-by: Sofie Gvaladze (sgv) <sgv@odoo.com>

addons/hr/static/src/views/fields/many2one_avatar_employee_field/many2one_avatar_employee_field.js

@@ -8,17 +8,12 @@ export class Many2OneAvatarEmployeeField extends Many2OneAvatarUserField {}
 Many2OneAvatarEmployeeField.extractProps = ({ field, attrs }) => {
     return {
         ...Many2OneAvatarUserField.extractProps({ field, attrs }),
+        relation: (attrs.options && attrs.options.relation) || field.relation,
         canQuickCreate: false,
     }
 };
 
 Many2OneAvatarEmployeeField.additionalClasses = [...Many2OneAvatarUserField.additionalClasses, "o_field_many2one_avatar_user"];
-Many2OneAvatarEmployeeField.extractProps = ({ attrs, field }) => {
-    return {
-        ...Many2OneAvatarUserField.extractProps({ attrs, field }),
-        relation: (attrs.options && attrs.options.relation) || field.relation,
-    };
-};
 
 registry.category("fields").add("many2one_avatar_employee", Many2OneAvatarEmployeeField);