From 1202e64403eb50222e6012347ba76c0f56553c4d Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Wed, 18 Dec 2019 11:43:16 +0530
Subject: [PATCH] fix: Training Event Email Tenplate (#19652)
---
.../training_scheduled.html | 51 ++++++++++++++++---
.../training_scheduled.json | 6 ++-
.../training_scheduled/training_scheduled.md | 51 ++++++++++++++++---
3 files changed, 90 insertions(+), 18 deletions(-)
diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.html b/erpnext/hr/notification/training_scheduled/training_scheduled.html
index b1aeb2c873..374038ac20 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.html
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.html
@@ -1,9 +1,44 @@
-
+
+
+ |
+
+
+ {{ doc.introduction }}
+
+ - {{_("Event Location")}}: {{ doc.location }}
+ {% set start = frappe.utils.get_datetime(doc.start_time) %}
+ {% set end = frappe.utils.get_datetime(doc.end_time) %}
+ {% if start.date() == end.date() %}
+ - {{_("Date")}}: {{ start.strftime("%A, %d %b %Y") }}
+ -
+ {{_("Timing")}}: {{ start.strftime("%I:%M %p") + ' to ' + end.strftime("%I:%M %p") }}
+
+ {% else %}
+ - {{_("Start Time")}}: {{ start.strftime("%A, %d %b %Y at %I:%M %p") }}
+
+ - {{_("End Time")}}: {{ end.strftime("%A, %d %b %Y at %I:%M %p") }}
+
+ {% endif %}
+ - {{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.json b/erpnext/hr/notification/training_scheduled/training_scheduled.json
index c07e1a6285..966b887572 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.json
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.json
@@ -1,5 +1,7 @@
{
"attach_print": 0,
+ "channel": "Email",
+ "condition": "",
"creation": "2017-08-11 03:13:40.519614",
"days_in_advance": 0,
"docstatus": 0,
@@ -9,8 +11,8 @@
"event": "Submit",
"idx": 0,
"is_standard": 1,
- "message": "\n
\n \n | \n \n \n \n - {{ doc.introduction }}
\n - {{_(\"Event Location\")}}: {{ doc.location }}
\n {% set start = frappe.utils.get_datetime(doc.start_time) %}\n {% set end = frappe.utils.get_datetime(doc.end_time) %}\n {% if start.date() == end.date() %}\n - {{_(\"Date\")}}: {{ start.strftime(\"%A, %d %b %Y\") }}
\n - \n {{_(\"Timing\")}}: {{ start.strftime(\"%I:%M %p\") + ' to ' + end.strftime(\"%I:%M %p\") }}\n
\n {% else %}\n - {{_(\"Start Time\")}}: {{ start.strftime(\"%A, %d %b %Y at %I:%M %p\") }}\n
\n - {{_(\"End Time\")}}: {{ end.strftime(\"%A, %d %b %Y at %I:%M %p\") }}\n
\n {% endif %}\n \n {{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n \n | \n | \n
\n
\n
",
+ "modified": "2019-11-29 15:38:31.805409",
"modified_by": "Administrator",
"module": "HR",
"name": "Training Scheduled",
diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.md b/erpnext/hr/notification/training_scheduled/training_scheduled.md
index bcadf7df59..374038ac20 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.md
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.md
@@ -1,9 +1,44 @@
-
+
+
+ |
+
+
+ {{ doc.introduction }}
+
+ - {{_("Event Location")}}: {{ doc.location }}
+ {% set start = frappe.utils.get_datetime(doc.start_time) %}
+ {% set end = frappe.utils.get_datetime(doc.end_time) %}
+ {% if start.date() == end.date() %}
+ - {{_("Date")}}: {{ start.strftime("%A, %d %b %Y") }}
+ -
+ {{_("Timing")}}: {{ start.strftime("%I:%M %p") + ' to ' + end.strftime("%I:%M %p") }}
+
+ {% else %}
+ - {{_("Start Time")}}: {{ start.strftime("%A, %d %b %Y at %I:%M %p") }}
+
+ - {{_("End Time")}}: {{ end.strftime("%A, %d %b %Y at %I:%M %p") }}
+
+ {% endif %}
+ - {{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}
+
+
+ |
+ |
+
+
+
\ No newline at end of file