Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Apply pre-commit changes: Resolve conflicts

Browse Source
This commit is contained in:
Alexandre D. Díaz 2021-01-26 17:37:52 +01:00 committed by emagdalenaC2i
parent 16f1ce9ddb
commit f959dec61b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mass_mailing_partner/views/mailing_view.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com> <!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com> Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
Copyright 2015 Javier Iniesta <javieria@antiun.com> Copyright 2015 Javier Iniesta <javieria@antiun.com>
@ -9,13 +9,13 @@
<record model="ir.ui.view" id="mailing_list_view_form"> <record model="ir.ui.view" id="mailing_list_view_form">
<field name="name">mailing.list.form</field> <field name="name">mailing.list.form</field>
<field name="model">mailing.list</field> <field name="model">mailing.list</field>
<field name="inherit_id" ref="mass_mailing.mailing_list_view_form"/> <field name="inherit_id" ref="mass_mailing.mailing_list_view_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[hasclass('oe_title')]" position="after"> <xpath expr="//div[hasclass('oe_title')]" position="after">
<group> <group>
<group> <group>
<field name="partner_mandatory"/> <field name="partner_mandatory" />
<field name="partner_category"/> <field name="partner_category" />
</group> </group>
</group> </group>
</xpath> </xpath>