Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1852 from anandpdoshi/anand-wip-4.1

Browse Source 
Fixes frappe/erpnext#1849
This commit is contained in:
Rushabh Mehta 2014-06-26 12:30:29 +05:30
commit 16e543e734
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hooks.py
View File

@ -19,8 +19,6 @@ notification_config = "erpnext.startup.notifications.get_notification_config"
dump_report_map = "erpnext.startup.report_data_map.data_map" dump_report_map = "erpnext.startup.report_data_map.data_map"
update_website_context = "erpnext.startup.webutils.update_website_context" 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" on_session_creation = "erpnext.startup.event_handlers.on_session_creation"
before_tests = "erpnext.setup.utils.before_tests" before_tests = "erpnext.setup.utils.before_tests"
@ -76,3 +74,4 @@ scheduler_events = {
"erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly" "erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly"
] ]
} }

6
erpnext/setup/install.py
View File

@ -7,6 +7,9 @@ import frappe
from frappe import _ from frappe import _
default_system_signature = """<div style="padding: 7px; text-align: right; color: #888"><small>Sent via
<a style="color: #888" href="http://erpnext.org">ERPNext</a></div>"""
def after_install(): def after_install():
frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert() frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert()
set_single_defaults() set_single_defaults()
@ -79,3 +82,6 @@ def set_single_defaults():
pass pass
frappe.db.set_default("date_format", "dd-mm-yyyy") frappe.db.set_default("date_format", "dd-mm-yyyy")
frappe.db.set_value("Outgoing Email Settings", "Outgoing Email Settings", "system_signature",
default_system_signature)

4
erpnext/startup/__init__.py
View File

@ -27,10 +27,6 @@ user_defaults = {
"Territory": "territory" "Territory": "territory"
} }
# add startup propertes
mail_footer = """<div style="padding: 7px; text-align: right; color: #888"><small>Sent via
<a style="color: #888" href="http://erpnext.org">ERPNext</a></div>"""
def get_monthly_bulk_mail_limit(): def get_monthly_bulk_mail_limit():
import frappe import frappe
# if global settings, then 500 or unlimited # if global settings, then 500 or unlimited