From 1198d94904f29679d962822583137aca880cf25d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Jun 2018 13:18:21 +0530 Subject: [PATCH] [rename] Email Alert -> Notification --- .../notification_for_new_fiscal_year.json | 28 --------------- .../{email_alert => notification}/__init__.py | 0 .../__init__.py | 0 .../notification_for_new_fiscal_year.json | 28 +++++++++++++++ .../notification_for_new_fiscal_year.md | 0 .../notification_for_new_fiscal_year.py | 0 .../retention_bonus/retention_bonus.json | 26 -------------- .../{email_alert => notification}/__init__.py | 0 .../retention_bonus/__init__.py | 0 .../retention_bonus/retention_bonus.json | 26 ++++++++++++++ .../retention_bonus/retention_bonus.md | 0 .../retention_bonus/retention_bonus.py | 0 .../training_feedback/__init__.py | 0 .../training_feedback/training_feedback.html | 0 .../training_feedback/training_feedback.json | 34 +++++++++---------- .../training_feedback/training_feedback.md | 0 .../training_feedback/training_feedback.py | 0 .../training_scheduled/__init__.py | 0 .../training_scheduled.html | 0 .../training_scheduled.json | 30 ++++++++-------- .../training_scheduled/training_scheduled.md | 0 .../training_scheduled/training_scheduled.py | 0 22 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json rename erpnext/accounts/{email_alert => notification}/__init__.py (100%) rename erpnext/accounts/{email_alert => notification}/notification_for_new_fiscal_year/__init__.py (100%) create mode 100644 erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json rename erpnext/accounts/{email_alert => notification}/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md (100%) rename erpnext/accounts/{email_alert => notification}/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py (100%) delete mode 100644 erpnext/hr/email_alert/retention_bonus/retention_bonus.json rename erpnext/hr/{email_alert => notification}/__init__.py (100%) rename erpnext/hr/{email_alert => notification}/retention_bonus/__init__.py (100%) create mode 100644 erpnext/hr/notification/retention_bonus/retention_bonus.json rename erpnext/hr/{email_alert => notification}/retention_bonus/retention_bonus.md (100%) rename erpnext/hr/{email_alert => notification}/retention_bonus/retention_bonus.py (100%) rename erpnext/hr/{email_alert => notification}/training_feedback/__init__.py (100%) rename erpnext/hr/{email_alert => notification}/training_feedback/training_feedback.html (100%) rename erpnext/hr/{email_alert => notification}/training_feedback/training_feedback.json (51%) rename erpnext/hr/{email_alert => notification}/training_feedback/training_feedback.md (100%) rename erpnext/hr/{email_alert => notification}/training_feedback/training_feedback.py (100%) rename erpnext/hr/{email_alert => notification}/training_scheduled/__init__.py (100%) rename erpnext/hr/{email_alert => notification}/training_scheduled/training_scheduled.html (100%) rename erpnext/hr/{email_alert => notification}/training_scheduled/training_scheduled.json (59%) rename erpnext/hr/{email_alert => notification}/training_scheduled/training_scheduled.md (100%) rename erpnext/hr/{email_alert => notification}/training_scheduled/training_scheduled.py (100%) diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json deleted file mode 100644 index 2e524d6e0f..0000000000 --- a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "attach_print": 0, - "condition": "doc.auto_created", - "creation": "2018-04-25 14:19:05.440361", - "days_in_advance": 0, - "docstatus": 0, - "doctype": "Email Alert", - "document_type": "Fiscal Year", - "enabled": 1, - "event": "New", - "idx": 0, - "is_standard": 1, - "message": "

{{_(\"Fiscal Year\")}}

\n\n

{{ _(\"New fiscal year created :- \") }} {{ doc.name }}

", - "modified": "2018-04-25 14:30:38.588534", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Notification for new fiscal year", - "owner": "Administrator", - "recipients": [ - { - "email_by_role": "Accounts User" - }, - { - "email_by_role": "Accounts Manager" - } - ], - "subject": "Notification for new fiscal year {{ doc.name }}" -} \ No newline at end of file diff --git a/erpnext/accounts/email_alert/__init__.py b/erpnext/accounts/notification/__init__.py similarity index 100% rename from erpnext/accounts/email_alert/__init__.py rename to erpnext/accounts/notification/__init__.py diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/__init__.py b/erpnext/accounts/notification/notification_for_new_fiscal_year/__init__.py similarity index 100% rename from erpnext/accounts/email_alert/notification_for_new_fiscal_year/__init__.py rename to erpnext/accounts/notification/notification_for_new_fiscal_year/__init__.py diff --git a/erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json b/erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json new file mode 100644 index 0000000000..bd7a126517 --- /dev/null +++ b/erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json @@ -0,0 +1,28 @@ +{ + "attach_print": 0, + "condition": "doc.auto_created", + "creation": "2018-04-25 14:19:05.440361", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Notification", + "document_type": "Fiscal Year", + "enabled": 1, + "event": "New", + "idx": 0, + "is_standard": 1, + "message": "

{{_(\"Fiscal Year\")}}

\n\n

{{ _(\"New fiscal year created :- \") }} {{ doc.name }}

", + "modified": "2018-04-25 14:30:38.588534", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Notification for new fiscal year", + "owner": "Administrator", + "recipients": [ + { + "email_by_role": "Accounts User" + }, + { + "email_by_role": "Accounts Manager" + } + ], + "subject": "Notification for new fiscal year {{ doc.name }}" +} \ No newline at end of file diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md b/erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md similarity index 100% rename from erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md rename to erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py b/erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py similarity index 100% rename from erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py rename to erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.json b/erpnext/hr/email_alert/retention_bonus/retention_bonus.json deleted file mode 100644 index 90b8f0d87b..0000000000 --- a/erpnext/hr/email_alert/retention_bonus/retention_bonus.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "attach_print": 0, - "condition": "doc.docstatus==1", - "creation": "2018-05-15 18:52:36.362838", - "date_changed": "bonus_payment_date", - "days_in_advance": 14, - "docstatus": 0, - "doctype": "Email Alert", - "document_type": "Retention Bonus", - "enabled": 1, - "event": "Days Before", - "idx": 0, - "is_standard": 1, - "message": "

{{ _(\"Hello\") }},

\n\n

{{ _(\"Retention Bonus for\") }} {{ doc.employee_name }} {{ _(\"due on\") }} {{ doc.bonus_payment_date }}

", - "modified": "2018-05-15 19:00:24.294418", - "modified_by": "ranjith@earthianslive.com", - "module": "HR", - "name": "Retention Bonus", - "owner": "ranjith@earthianslive.com", - "recipients": [ - { - "email_by_role": "HR Manager" - } - ], - "subject": "Retention Bonus alert for {{ doc.employee }}" -} \ No newline at end of file diff --git a/erpnext/hr/email_alert/__init__.py b/erpnext/hr/notification/__init__.py similarity index 100% rename from erpnext/hr/email_alert/__init__.py rename to erpnext/hr/notification/__init__.py diff --git a/erpnext/hr/email_alert/retention_bonus/__init__.py b/erpnext/hr/notification/retention_bonus/__init__.py similarity index 100% rename from erpnext/hr/email_alert/retention_bonus/__init__.py rename to erpnext/hr/notification/retention_bonus/__init__.py diff --git a/erpnext/hr/notification/retention_bonus/retention_bonus.json b/erpnext/hr/notification/retention_bonus/retention_bonus.json new file mode 100644 index 0000000000..cbc8e2d078 --- /dev/null +++ b/erpnext/hr/notification/retention_bonus/retention_bonus.json @@ -0,0 +1,26 @@ +{ + "attach_print": 0, + "condition": "doc.docstatus==1", + "creation": "2018-05-15 18:52:36.362838", + "date_changed": "bonus_payment_date", + "days_in_advance": 14, + "docstatus": 0, + "doctype": "Notification", + "document_type": "Retention Bonus", + "enabled": 1, + "event": "Days Before", + "idx": 0, + "is_standard": 1, + "message": "

{{ _(\"Hello\") }},

\n\n

{{ _(\"Retention Bonus for\") }} {{ doc.employee_name }} {{ _(\"due on\") }} {{ doc.bonus_payment_date }}

", + "modified": "2018-05-15 19:00:24.294418", + "modified_by": "ranjith@earthianslive.com", + "module": "HR", + "name": "Retention Bonus", + "owner": "ranjith@earthianslive.com", + "recipients": [ + { + "email_by_role": "HR Manager" + } + ], + "subject": "Retention Bonus alert for {{ doc.employee }}" +} \ No newline at end of file diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.md b/erpnext/hr/notification/retention_bonus/retention_bonus.md similarity index 100% rename from erpnext/hr/email_alert/retention_bonus/retention_bonus.md rename to erpnext/hr/notification/retention_bonus/retention_bonus.md diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.py b/erpnext/hr/notification/retention_bonus/retention_bonus.py similarity index 100% rename from erpnext/hr/email_alert/retention_bonus/retention_bonus.py rename to erpnext/hr/notification/retention_bonus/retention_bonus.py diff --git a/erpnext/hr/email_alert/training_feedback/__init__.py b/erpnext/hr/notification/training_feedback/__init__.py similarity index 100% rename from erpnext/hr/email_alert/training_feedback/__init__.py rename to erpnext/hr/notification/training_feedback/__init__.py diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.html b/erpnext/hr/notification/training_feedback/training_feedback.html similarity index 100% rename from erpnext/hr/email_alert/training_feedback/training_feedback.html rename to erpnext/hr/notification/training_feedback/training_feedback.html diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.json b/erpnext/hr/notification/training_feedback/training_feedback.json similarity index 51% rename from erpnext/hr/email_alert/training_feedback/training_feedback.json rename to erpnext/hr/notification/training_feedback/training_feedback.json index 51f6cedfec..2cc064f34a 100644 --- a/erpnext/hr/email_alert/training_feedback/training_feedback.json +++ b/erpnext/hr/notification/training_feedback/training_feedback.json @@ -1,24 +1,24 @@ { - "attach_print": 0, - "creation": "2017-08-11 03:17:11.769210", - "days_in_advance": 0, - "docstatus": 0, - "doctype": "Email Alert", - "document_type": "Training Result", - "enabled": 1, - "event": "Submit", - "idx": 0, - "is_standard": 1, - "message": "

{{_(\"Training Event\")}}

\n

{{ message }}

\n\n

{{_(\"Details\")}}

\n{{_(\"Event Name\")}}: {{ name }}\n
{{_(\"Event Location\")}}: {{ location }}\n
{{_(\"Start Time\")}}: {{ start_time }}\n
{{_(\"End Time\")}}: {{ end_time }}\n
{{_(\"Attendance\")}}: {{ attendance }}\n", - "modified": "2017-08-11 04:26:58.194793", - "modified_by": "Administrator", - "module": "HR", - "name": "Training Feedback", - "owner": "Administrator", + "attach_print": 0, + "creation": "2017-08-11 03:17:11.769210", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Notification", + "document_type": "Training Result", + "enabled": 1, + "event": "Submit", + "idx": 0, + "is_standard": 1, + "message": "

{{_(\"Training Event\")}}

\n

{{ message }}

\n\n

{{_(\"Details\")}}

\n{{_(\"Event Name\")}}: {{ name }}\n
{{_(\"Event Location\")}}: {{ location }}\n
{{_(\"Start Time\")}}: {{ start_time }}\n
{{_(\"End Time\")}}: {{ end_time }}\n
{{_(\"Attendance\")}}: {{ attendance }}\n", + "modified": "2017-08-11 04:26:58.194793", + "modified_by": "Administrator", + "module": "HR", + "name": "Training Feedback", + "owner": "Administrator", "recipients": [ { "email_by_document_field": "employee_emails" } - ], + ], "subject": "Please Share your Feedback For {{ doc.training_event }}" } \ No newline at end of file diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.md b/erpnext/hr/notification/training_feedback/training_feedback.md similarity index 100% rename from erpnext/hr/email_alert/training_feedback/training_feedback.md rename to erpnext/hr/notification/training_feedback/training_feedback.md diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.py b/erpnext/hr/notification/training_feedback/training_feedback.py similarity index 100% rename from erpnext/hr/email_alert/training_feedback/training_feedback.py rename to erpnext/hr/notification/training_feedback/training_feedback.py diff --git a/erpnext/hr/email_alert/training_scheduled/__init__.py b/erpnext/hr/notification/training_scheduled/__init__.py similarity index 100% rename from erpnext/hr/email_alert/training_scheduled/__init__.py rename to erpnext/hr/notification/training_scheduled/__init__.py diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.html b/erpnext/hr/notification/training_scheduled/training_scheduled.html similarity index 100% rename from erpnext/hr/email_alert/training_scheduled/training_scheduled.html rename to erpnext/hr/notification/training_scheduled/training_scheduled.html diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.json b/erpnext/hr/notification/training_scheduled/training_scheduled.json similarity index 59% rename from erpnext/hr/email_alert/training_scheduled/training_scheduled.json rename to erpnext/hr/notification/training_scheduled/training_scheduled.json index 0782f0cfc1..c07e1a6285 100644 --- a/erpnext/hr/email_alert/training_scheduled/training_scheduled.json +++ b/erpnext/hr/notification/training_scheduled/training_scheduled.json @@ -1,24 +1,24 @@ { - "attach_print": 0, - "creation": "2017-08-11 03:13:40.519614", - "days_in_advance": 0, - "docstatus": 0, - "doctype": "Email Alert", - "document_type": "Training Event", - "enabled": 1, - "event": "Submit", - "idx": 0, - "is_standard": 1, - "message": "

{{_(\"Training Event\")}}

\n\n

{{ doc.introduction }}

\n\n

{{_(\"Details\")}}

\n{{_(\"Event Name\")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n
{{_(\"Event Location\")}}: {{ doc.location }}\n
{{_(\"Start Time\")}}: {{ doc.start_time }}\n
{{_(\"End Time\")}}: {{ doc.end_time }}\n", + "attach_print": 0, + "creation": "2017-08-11 03:13:40.519614", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Notification", + "document_type": "Training Event", + "enabled": 1, + "event": "Submit", + "idx": 0, + "is_standard": 1, + "message": "

{{_(\"Training Event\")}}

\n\n

{{ doc.introduction }}

\n\n

{{_(\"Details\")}}

\n{{_(\"Event Name\")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n
{{_(\"Event Location\")}}: {{ doc.location }}\n
{{_(\"Start Time\")}}: {{ doc.start_time }}\n
{{_(\"End Time\")}}: {{ doc.end_time }}\n", "modified": "2017-08-13 22:49:42.338881", "modified_by": "Administrator", - "module": "HR", - "name": "Training Scheduled", - "owner": "Administrator", + "module": "HR", + "name": "Training Scheduled", + "owner": "Administrator", "recipients": [ { "email_by_document_field": "employee_emails" } - ], + ], "subject": "Training Scheduled: {{ doc.name }}" } \ No newline at end of file diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.md b/erpnext/hr/notification/training_scheduled/training_scheduled.md similarity index 100% rename from erpnext/hr/email_alert/training_scheduled/training_scheduled.md rename to erpnext/hr/notification/training_scheduled/training_scheduled.md diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.py b/erpnext/hr/notification/training_scheduled/training_scheduled.py similarity index 100% rename from erpnext/hr/email_alert/training_scheduled/training_scheduled.py rename to erpnext/hr/notification/training_scheduled/training_scheduled.py