diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index 0fea0ea55b..6dac990a68 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -10,8 +10,8 @@ from erpnext.home import make_feed def on_session_creation(login_manager): """make feed""" - if frappe.session['user'] not in ('Guest'): + if frappe.session['user'] != 'Guest': # create feed make_feed('Login', 'User', login_manager.user, login_manager.user, - '%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), + '%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D') diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index be97228b0d..843f27eb87 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -35,8 +35,10 @@ def get_item_details(args): args = frappe._dict(args) if not args.get("transaction_type"): - args.transaction_type = "buying" if frappe.get_meta(args.get("doctype")).get_field("supplier") \ - else "selling" + if args.get("doctype")=="Material Request" or frappe.get_meta(args.get("doctype")).get_field("supplier"): + args.transaction_type = "buying" + else: + args.transaction_type = "selling" if not args.get("price_list"): args.price_list = args.get("selling_price_list") or args.get("buying_price_list")