[IMP] Apply pre-commit changes: Resolve conflicts

This commit is contained in:
Alexandre D. Díaz 2021-01-26 17:37:52 +01:00 committed by nicolas
parent 7186f72bae
commit de323bdccd

View File

@ -11,15 +11,41 @@
<field name="inherit_id" ref="mail_tracking.view_partner_form" />
<field name="arch" type="xml">
<field name="email_bounced" position="after">
<label for="check_email_bounced" string="Mailgun"
attrs="{'invisible': [('email', '=', False)]}"/>
<div name="mailgun_buttons" attrs="{'invisible': [('email', '=', False)]}">
<button name="check_email_bounced" type="object" string="Check Mailgun" class="oe_link"/>
<button name="check_email_validity" type="object" string="Check email validity" class="oe_link"/>
<button name="force_set_bounced" type="object" string="Set Bounced" class="oe_link"
attrs="{'invisible': [('email_bounced', '=', True)]}"/>
<button name="force_unset_bounced" type="object" string="Unset Bounced" class="oe_link"
attrs="{'invisible': [('email_bounced', '=', False)]}"/>
<label
for="check_email_bounced"
string="Mailgun"
attrs="{'invisible': [('email', '=', False)]}"
/>
<div
name="mailgun_buttons"
attrs="{'invisible': [('email', '=', False)]}"
>
<button
name="check_email_bounced"
type="object"
string="Check Mailgun"
class="oe_link"
/>
<button
name="check_email_validity"
type="object"
string="Check email validity"
class="oe_link"
/>
<button
name="force_set_bounced"
type="object"
string="Set Bounced"
class="oe_link"
attrs="{'invisible': [('email_bounced', '=', True)]}"
/>
<button
name="force_unset_bounced"
type="object"
string="Unset Bounced"
class="oe_link"
attrs="{'invisible': [('email_bounced', '=', False)]}"
/>
</div>
</field>
</field>