From 1f59ed030e15467e8cfc46f722825e5fcae8089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 2 Nov 2022 15:05:14 +0000
Subject: [PATCH] [FIX] mail: fix mail template form view settings page display

Due to strange update, some fields are duplicated. Not sure why but having
fields displayed several times is not a good idea. Better cleanup the view.
Oversight of odoo/odoo@7c4da16b5961dd734b76127d79052112fde630db

X-original-commit: 89a3583bbe3355c10b2d3b2df87b167460f6b5c4
Part-of: odoo/odoo#104770
---
 addons/mail/views/mail_template_views.xml | 30 ++++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 66455434deb..021e0dde091 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -74,29 +74,13 @@
                                     <field name="scheduled_date" string="Scheduled Send Date"/>
                                 </group>
                             </page>
-                            <page string="Settings" name="email_configuration">
-                                <group col="2">
-                                    <group>
-                                        <field name="email_from"
-                                                placeholder="Override author's email"/>
-                                        <field name="use_default_to"/>
-                                        <field name="email_to" attrs="{'invisible': [('use_default_to', '=', True)]}"
-                                                placeholder="Comma-separated recipient addresses"/>
-                                        <field name="partner_to" attrs="{'invisible': [('use_default_to', '=', True)]}"
-                                                placeholder="Comma-separated ids of recipient partners"/>
-                                        <field name="email_cc" attrs="{'invisible': [('use_default_to', '=', True)]}"
-                                                placeholder="Comma-separated carbon copy recipients addresses"/>
-                                        <field name="reply_to"
-                                                placeholder="Email address to which replies will be redirected when sending emails in mass"/>
-                                        <field name="scheduled_date" string="Scheduled Send Date"/>
-                                    </group>
-                                    <group>
-                                        <field name="lang" placeholder="{{ object.partner_id.lang }}"/>
-                                        <field name="mail_server_id"/>
-                                        <field name="auto_delete"/>
-                                        <field name="report_template" domain="[('model','=',model)]"/>
-                                        <field name="report_name" attrs="{'invisible':[('report_template','=',False)]}"/>
-                                    </group>
+                            <page string="Settings" name="email_settings">
+                                <group>
+                                    <field name="lang" placeholder="{{ object.partner_id.lang }}"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="auto_delete"/>
+                                    <field name="report_template" domain="[('model','=',model)]"/>
+                                    <field name="report_name" attrs="{'invisible':[('report_template','=',False)]}"/>
                                 </group>
                             </page>
                         </notebook>