nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-03-29 13:57:39 +05:30
parent 4d9e104284 1e989b35ad
commit ff2e4c898a
8 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/utils/item_quick_entry.js
View File

@@ -319,7 +319,8 @@ frappe.ui.form.ItemQuickEntryForm = frappe.ui.form.QuickEntryForm.extend({
["parent", "=", $(e.target).attr("data-fieldname")],
["attribute_value", "like", e.target.value + "%"]
],
fields: ["attribute_value"]
fields: ["attribute_value"],
parent: "Item"
},
callback: function(r) {
if (r.message) {