Browse Source

[minor] fix help in email alert frappe/erpnext#3538

version-14
Rushabh Mehta 10 years ago
parent
commit
5ca8e26b75
2 changed files with 2 additions and 54 deletions
  1. +0
    -52
      frappe/data/conf.py
  2. +2
    -2
      frappe/email/doctype/email_alert/email_alert.json

+ 0
- 52
frappe/data/conf.py View File

@@ -1,52 +0,0 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt

# DEPRECATED only for reference

from __future__ import unicode_literals
# app configuration

# database config
db_name = '%(db_name)s'
db_password = '%(db_password)s'

# user attachments stored in
files_path = 'public/files'
public_path = 'public'

# max file attachment size (default 1MB)
max_file_size = 1000000

# max email size in bytes
max_email_size = 0

# total pop session timeout in seconds
pop_timeout = 0

# generate schema (.txt files)
developer_mode = 0

# clear cache on refresh
auto_cache_clear = 0

# email logs to admin (beta)
admin_email_notification = 0

# user timezone
user_timezone = 'Asia/Calcutta'

# outgoing mail settings
mail_server = None
mail_login = None
mail_password = None
mail_port = None
use_ssl = None
auto_email_id = None

# logging settings
log_file_name = 'logs/error_log.txt'
debug_log_dbs = []
log_level = 'logging.INFO'
log_file_size = 5000
log_file_backup_count = 5


+ 2
- 2
frappe/email/doctype/email_alert/email_alert.json View File

@@ -129,7 +129,7 @@
"fieldname": "message_examples",
"fieldtype": "HTML",
"label": "Message Examples",
"options": "<h5>Message Example (Markdown)</h5>\n<pre>Transaction {{ doc.name }} has exceeded Due Date. Please take relevant action\n\n#### Details\n\nCustomer: {{ doc.customer }}\nAmount: {{ doc.total_amount }}</pre>",
"options": "<h5>Message Example</h5>\n\n<pre>\n<h3>Order Overdue</h3>\n\n<p>Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.</p>\n\n<h4>Details</h4>\n\n<ul>\n<li>Customer: {{ doc.customer }}\n<li>Amount: {{ doc.total_amount }}\n</ul>\n</pre>",
"permlevel": 0
},
{
@@ -141,7 +141,7 @@
}
],
"icon": "icon-envelope",
"modified": "2015-03-25 06:20:07.472953",
"modified": "2015-07-09 00:27:00.169741",
"modified_by": "Administrator",
"module": "Email",
"name": "Email Alert",


Loading…
Cancel
Save