[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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2016 Tecnativa - Pedro M. Baeza <!-- Copyright 2016 Tecnativa - Pedro M. Baeza
Copyright 2016 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com> Copyright 2016 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
Copyright 2017 Tecnativa <vicent.cubellsn@tecnativa.com> Copyright 2017 Tecnativa <vicent.cubellsn@tecnativa.com>
@ -8,18 +8,44 @@
<record id="view_partner_form_mailgun" model="ir.ui.view"> <record id="view_partner_form_mailgun" model="ir.ui.view">
<field name="name">Partner Mailgun button</field> <field name="name">Partner Mailgun button</field>
<field name="model">res.partner</field> <field name="model">res.partner</field>
<field name="inherit_id" ref="mail_tracking.view_partner_form"/> <field name="inherit_id" ref="mail_tracking.view_partner_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="email_bounced" position="after"> <field name="email_bounced" position="after">
<label for="check_email_bounced" string="Mailgun" <label
attrs="{'invisible': [('email', '=', False)]}"/> for="check_email_bounced"
<div name="mailgun_buttons" attrs="{'invisible': [('email', '=', False)]}"> string="Mailgun"
<button name="check_email_bounced" type="object" string="Check Mailgun" class="oe_link"/> attrs="{'invisible': [('email', '=', False)]}"
<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" <div
attrs="{'invisible': [('email_bounced', '=', True)]}"/> name="mailgun_buttons"
<button name="force_unset_bounced" type="object" string="Unset Bounced" class="oe_link" attrs="{'invisible': [('email', '=', False)]}"
attrs="{'invisible': [('email_bounced', '=', 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> </div>
</field> </field>
</field> </field>