Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 5440c3d..4e3fa17 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.21.5'
+__version__ = '6.21.6'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d42d43e..aa4ae96 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.21.5"
+app_version = "6.21.6"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index b6698df..5c93ef0 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -280,7 +280,7 @@
var party_type = "Supplier";
var party_account_field = 'credit_to';
}
-
+
var party = me.frm.doc[frappe.model.scrub(party_type)];
if(party) {
return frappe.call({
@@ -643,7 +643,9 @@
"item_code": d.item_code,
"item_group": d.item_group,
"brand": d.brand,
- "qty": d.qty
+ "qty": d.qty,
+ "parenttype": d.parenttype,
+ "parent": d.parent
});
}
};
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 5548350..22dbe51 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -196,7 +196,7 @@
or args.get("cost_center"))
def get_price_list_rate(args, item_doc, out):
- meta = frappe.get_meta(args.doctype)
+ meta = frappe.get_meta(args.parenttype or args.doctype)
if meta.get_field("currency"):
validate_price_list(args)
diff --git a/setup.py b/setup.py
index ab62def..b91fd22 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.21.5"
+version = "6.21.6"
requirements = parse_requirements("requirements.txt", session="")
setup(