Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 0e9fff9..fc9d7ef 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.18.3'
+__version__ = '6.18.4'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index f886b6f..8d1815a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.18.3"
+app_version = "6.18.4"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index cc80d1e..1c0acce 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -84,7 +84,7 @@
args.item_code = get_item_code(barcode=args.barcode)
elif not args.item_code and args.serial_no:
args.item_code = get_item_code(serial_no=args.serial_no)
-
+
set_transaction_type(args)
return args
@@ -200,7 +200,7 @@
or args.get("cost_center"))
def get_price_list_rate(args, item_doc, out):
- meta = frappe.get_meta(args.parenttype)
+ meta = frappe.get_meta(args.doctype)
if meta.get_field("currency"):
validate_price_list(args)
@@ -288,7 +288,7 @@
if args.transaction_type=="selling" and args.customer:
customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
out.customer_item_code = customer_item_code[0].ref_code if customer_item_code else None
-
+
if args.transaction_type=="buying" and args.supplier:
item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None
diff --git a/setup.py b/setup.py
index 4598671..edf2617 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.18.3"
+version = "6.18.4"
requirements = parse_requirements("requirements.txt", session="")
setup(