schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for making stock entry against Pro Order (#12721)

Browse Source
This commit is contained in:
Nabin Hait
2018-02-01 10:51:27 +05:30
committed by GitHub
parent 9f29f60707
commit 7ba092eaf9
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/utils.py
View File

@@ -123,7 +123,7 @@ def update_bin(args, allow_negative_stock=False, via_landed_cost_voucher=False):
frappe.msgprint(_("Item {0} ignored since it is not a stock item").format(args.get("item_code")))
@frappe.whitelist()
def get_incoming_rate(args):
def get_incoming_rate(args, raise_error_if_no_rate=True):
"""Get Incoming Rate based on valuation method"""
from erpnext.stock.stock_ledger import get_previous_sle, get_valuation_rate
if isinstance(args, basestring):
@@ -146,7 +146,8 @@ def get_incoming_rate(args):
voucher_no = args.get('voucher_no') or args.get('name')
in_rate = get_valuation_rate(args.get('item_code'), args.get('warehouse'),
args.get('voucher_type'), voucher_no, args.get('allow_zero_valuation'),
currency=erpnext.get_company_currency(args.get('company')), company=args.get('company'))
currency=erpnext.get_company_currency(args.get('company')), company=args.get('company'),
raise_error_if_no_rate=True)
return in_rate