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

get_item_details fixed for Material Request

Browse Source
This commit is contained in:
Anand Doshi 2014-04-22 19:30:49 +05:30
parent 3e41fd1fd3
commit 68d0b7c7ff
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/startup/event_handlers.py
View File

@ -10,7 +10,7 @@ from erpnext.home import make_feed
def on_session_creation(login_manager): def on_session_creation(login_manager):
"""make feed""" """make feed"""
if frappe.session['user'] not in ('Guest'): if frappe.session['user'] != 'Guest':
# create feed # create feed
make_feed('Login', 'User', login_manager.user, login_manager.user, 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()),

6
erpnext/stock/get_item_details.py
View File

@ -35,8 +35,10 @@ def get_item_details(args):
args = frappe._dict(args) args = frappe._dict(args)
if not args.get("transaction_type"): if not args.get("transaction_type"):
args.transaction_type = "buying" if frappe.get_meta(args.get("doctype")).get_field("supplier") \ if args.get("doctype")=="Material Request" or frappe.get_meta(args.get("doctype")).get_field("supplier"):
else "selling" args.transaction_type = "buying"
else:
args.transaction_type = "selling"
if not args.get("price_list"): if not args.get("price_list"):
args.price_list = args.get("selling_price_list") or args.get("buying_price_list") args.price_list = args.get("selling_price_list") or args.get("buying_price_list")