[IMP] Apply pre-commit changes: Resolve conflicts
This commit is contained in:
parent
16f1ce9ddb
commit
f959dec61b
@ -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 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
Copyright 2015 Javier Iniesta <javieria@antiun.com>
|
||||
@ -9,13 +9,13 @@
|
||||
<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="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"/>
|
||||
<field name="partner_mandatory" />
|
||||
<field name="partner_category" />
|
||||
</group>
|
||||
</group>
|
||||
</xpath>
|
||||
|
Loading…
Reference in New Issue
Block a user