commit e4abaa7cddbdcfdf8f8d02182c8071375871fd02
author Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Mon Aug 05 14:45:30 2019 +0530
committer GitHub <noreply@github.com> Mon Aug 05 14:45:30 2019 +0530
tree fb53b9ba7772fac90b141fac90b8dfdbc190acc1
parent d9fa83b19679a59f9c1efdd13c3489c7679f09bf
parent 043f70e9a65b86375cc592604d51833a2dd2bad7

Merge pull request #18591 from deepeshgarg007/utils_fix_develop

fix: Ambigious column in query

erpnext/accounts/doctype/pricing_rule/utils.py

diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 5795b8f..bbabac4 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -382,7 +382,7 @@
 			`tab{child_doc}`.amount
 		FROM `tab{child_doc}`, `tab{parent_doc}`
 		WHERE
-			`tab{child_doc}`.parent = `tab{parent_doc}`.name and {date_field}
+			`tab{child_doc}`.parent = `tab{parent_doc}`.name and `tab{parent_doc}`.{date_field}
 			between %s and %s and `tab{parent_doc}`.docstatus = 1
 			{condition} group by `tab{child_doc}`.name
 	""".format(parent_doc = doctype,