From 49e0a687b3e6bf2e9d79bdba5fc48d1a3c5fee97 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 13 Mar 2014 20:44:10 +0530
Subject: [PATCH] Minor Fixes

---
 erpnext/hooks.txt                                  | 2 +-
 erpnext/setup/doctype/email_digest/email_digest.py | 7 ++++---
 erpnext/startup/event_handlers.py                  | 7 +------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/erpnext/hooks.txt b/erpnext/hooks.txt
index 679389014c..f07def6692 100644
--- a/erpnext/hooks.txt
+++ b/erpnext/hooks.txt
@@ -1,6 +1,6 @@
 app_name = erpnext
 app_title = ERPNext
-app_publisher = Web Notes Technologies
+app_publisher = Web Notes Technologies Pvt. Ltd. and Contributors
 app_description = Open Source Enterprise Resource Planning for Small and Midsized Organizations
 app_icon = icon-th
 app_color = #e74c3c
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index b94b77754e..a5dc92bde7 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -10,6 +10,7 @@ from frappe.utils.dateutils import datetime_in_user_format
 from datetime import timedelta
 from dateutil.relativedelta import relativedelta
 from frappe.utils.email_lib import sendmail
+from frappe.core.doctype.user.user import STANDARD_USERS
 
 content_sequence = [
 	["Income / Expenses", ["income_year_to_date", "bank_balance",
@@ -56,9 +57,9 @@ class DocType(DocListController):
 		"""get list of users"""
 		user_list = frappe.db.sql("""
 			select name, enabled from tabUser
-			where docstatus=0 and name not in ('Administrator', 'Guest')
-			and user_type = "System User"
-			order by enabled desc, name asc""", as_dict=1)
+			where name not in ({})
+			and user_type != "Website User"
+			order by enabled desc, name asc""".format(", ".join(["%s"]*len(STANDARD_USERS))), STANDARD_USERS, as_dict=1)
 
 		if self.doc.recipient_list:
 			recipient_list = self.doc.recipient_list.split("\n")
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index c4fc18f67d..448cbf0de3 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -7,16 +7,11 @@ import frappe
 from erpnext.home import make_feed
 
 def on_session_creation(login_manager):
-	"""
-		called after login
-		update login_from and delete parallel sessions
-	"""
+	"""make feed"""
 	if frappe.session['user'] not in ('Guest'):
 		# create feed
 		from frappe.utils import nowtime
 		from frappe.utils.user import get_user_fullname
-		frappe.db.begin()
 		make_feed('Login', 'User', login_manager.user, login_manager.user,
 			'%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), 
 			login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
-		frappe.db.commit()
\ No newline at end of file