From d32469294aaf4c685700c8d01d88c75f61bd99d4 Mon Sep 17 00:00:00 2001
From: himanee <himanee@techreceptives.com>
Date: Mon, 26 Jul 2021 12:34:39 +0530
Subject: [PATCH] [MODIFIED]2.0 solve the email issue in helpdesk.

---
 .../data/ticket_mail_template.xml             | 21 +++++++++++--------
 .../helpdesk_basic/models/helpdesk_ticket.py  |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/helpdesk_basic/data/ticket_mail_template.xml b/addons/helpdesk_basic/data/ticket_mail_template.xml
index 2a7245058a..34e6be1aee 100644
--- a/addons/helpdesk_basic/data/ticket_mail_template.xml
+++ b/addons/helpdesk_basic/data/ticket_mail_template.xml
@@ -4,16 +4,17 @@
         <record id="ticket_mail_template" model="mail.template">
             <field name="name">Helpdesk Ticket : Send By Email</field>
             <field name="subject">Ticket Receive Mail</field>
-            <field name="email_from">${(user.email or '')|safe}</field>
-            <field name="email_to">${object.email}</field>
+            <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) | safe}</field>
+            <field name="email_to">${(object.partner_email if not object.sudo().partner_id.email or object.sudo().partner_id.email != object.partner_email else '') | safe}</field>
+            <field name="partner_to">${object.partner_id.id if object.sudo().partner_id.email and object.sudo().partner_id.email == object.partner_email else ''}</field>
             <field name="model_id" ref="helpdesk_basic.model_helpdesk_ticket"/>
             <field name="body_html" type="html">
                 <div style="margin: 0px; padding: 0px;">
                     <h2>Dear
                         % if object.partner_id:
-                            ${object.partner_id.name},
+                            ${object.partner_id.name}
                         % else:
-                            ${object.user_id.name},
+                            ${object.user_id.name}
                         % endif
                     </h2>
                     <p>Your request has been received and is being reviewed by our ${object.team_id.name}.<br/><br/>
@@ -34,15 +35,16 @@
         <field name="name">Helpdesk Ticket : Confirm By Email</field>
         <field name="subject">Confirm Ticket Mail</field>
         <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) | safe}</field>
-        <field name="email_to">${object.email}</field>
+        <field name="email_to">${(object.partner_email if not object.sudo().partner_id.email or object.sudo().partner_id.email != object.partner_email else '') | safe}</field>
+        <field name="partner_to">${object.partner_id.id if object.sudo().partner_id.email and object.sudo().partner_id.email == object.partner_email else ''}</field>
         <field name="model_id" ref="helpdesk_basic.model_helpdesk_ticket"/>
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
                 <h2>Dear
                     % if object.partner_id:
-                        ${object.partner_id.name},
+                        ${object.partner_id.name}
                     % else:
-                        ${object.user_id.name},
+                        ${object.user_id.name}
                     % endif
                 </h2>
                 <p>Your request flectra has been Confirm by our ${object.team_id.name}.<br/><br/>
@@ -61,8 +63,9 @@
     <record id="ticket_rating_mail_template" model="mail.template">
         <field name="name">Helpdesk Ticket : Rating By Email</field>
         <field name="subject">Rating Request Mail</field>
-        <field name="email_from">${(user.email or '')|safe}</field>
-        <field name="email_to">${object.email}</field>
+        <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) | safe}</field>
+        <field name="email_to">${(object.partner_email if not object.sudo().partner_id.email or object.sudo().partner_id.email != object.partner_email else '') | safe}</field>
+        <field name="partner_to">${object.partner_id.id if object.sudo().partner_id.email and object.sudo().partner_id.email == object.partner_email else ''}</field>
         <field name="model_id" ref="helpdesk_basic.model_helpdesk_ticket"/>
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
diff --git a/addons/helpdesk_basic/models/helpdesk_ticket.py b/addons/helpdesk_basic/models/helpdesk_ticket.py
index 3675639154..713070f40a 100644
--- a/addons/helpdesk_basic/models/helpdesk_ticket.py
+++ b/addons/helpdesk_basic/models/helpdesk_ticket.py
@@ -254,7 +254,7 @@ class HelpdeskTicket(models.Model):
                 }
             )
         if ticket.stage_id.stage_type == 'done':
-            if 'stage_id' in changes or ticket.team_id.mail_close_tmpl_id:
+            if 'stage_id' in changes and ticket.team_id.mail_close_tmpl_id:
                 res['team_id'] = (ticket.team_id.mail_close_tmpl_id, {
                     'auto_delete_message': True,
                     'subtype_id': self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note'),