<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
     Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
     Copyright 2015 Javier Iniesta <javieria@antiun.com>
     Copyright 2020 Tecnativa - Manuel Calero
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
<odoo>

<record model="ir.ui.view" id="mailing_list_view_form">
    <field name="name">mailing.list.form</field>
    <field name="model">mailing.list</field>
    <field name="inherit_id" ref="mass_mailing.mailing_list_view_form"/>
    <field name="arch" type="xml">
        <xpath expr="//div[hasclass('oe_title')]" position="after">
            <group>
                <group>
                    <field name="partner_mandatory"/>
                    <field name="partner_category"/>
                </group>
            </group>
        </xpath>
    </field>
</record>

</odoo>

<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
     Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
     Copyright 2015 Javier Iniesta <javieria@antiun.com>
     Copyright 2020 Tecnativa - Manuel Calero
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
<odoo>

<record model="ir.ui.view" id="mailing_list_view_form">
    <field name="name">mailing.list.form</field>
    <field name="model">mailing.list</field>
    <field name="inherit_id" ref="mass_mailing.mailing_list_view_form" />
    <field name="arch" type="xml">
        <xpath expr="//div[hasclass('oe_title')]" position="after">
            <group>
                <group>
                    <field name="partner_mandatory" />
                    <field name="partner_category" />
                </group>
            </group>
        </xpath>
    </field>
</record>

</odoo>

Apply pre-commit changes: Resolve conflicts
[IMP] Apply pre-commit changes: Resolve conflicts
