Merge branch 'develop'
This commit is contained in:
commit
f7e9a9d786
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '6.18.3'
|
||||
__version__ = '6.18.4'
|
||||
|
@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
|
||||
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"
|
||||
|
@ -200,7 +200,7 @@ def get_default_cost_center(args, item):
|
||||
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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user