From 7f41ff26fa6f0bb69973ddc8dde7b64c4f7c7d59 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 26 Jun 2014 12:02:55 +0530 Subject: [PATCH] Fixes frappe/erpnext#1849 --- erpnext/hooks.py | 3 +-- erpnext/setup/install.py | 6 ++++++ erpnext/startup/__init__.py | 4 ---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index bddda2d601..1dde6386d2 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -19,8 +19,6 @@ notification_config = "erpnext.startup.notifications.get_notification_config" dump_report_map = "erpnext.startup.report_data_map.data_map" update_website_context = "erpnext.startup.webutils.update_website_context" -mail_footer = "erpnext.startup.mail_footer" - on_session_creation = "erpnext.startup.event_handlers.on_session_creation" before_tests = "erpnext.setup.utils.before_tests" @@ -76,3 +74,4 @@ scheduler_events = { "erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly" ] } + diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index ba1dfb70f9..946ee5f494 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -7,6 +7,9 @@ import frappe from frappe import _ +default_system_signature = """
Sent via + ERPNext
""" + def after_install(): frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert() set_single_defaults() @@ -79,3 +82,6 @@ def set_single_defaults(): pass frappe.db.set_default("date_format", "dd-mm-yyyy") + + frappe.db.set_value("Outgoing Email Settings", "Outgoing Email Settings", "system_signature", + default_system_signature) diff --git a/erpnext/startup/__init__.py b/erpnext/startup/__init__.py index e20ece3d10..576ab05627 100644 --- a/erpnext/startup/__init__.py +++ b/erpnext/startup/__init__.py @@ -27,10 +27,6 @@ user_defaults = { "Territory": "territory" } -# add startup propertes -mail_footer = """
Sent via - ERPNext
""" - def get_monthly_bulk_mail_limit(): import frappe # if global settings, then 500 or unlimited