From 8d4b04e719d0ea195fbc37144fd5a1e927056ada Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 9 Aug 2019 14:34:09 +0530 Subject: [PATCH 1/2] fix: get item from product bundle --- erpnext/public/js/controllers/buying.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index acc09ed213b..118aee9a8c5 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -452,7 +452,8 @@ erpnext.buying.get_items_from_product_bundle = function(frm) { company: frm.doc.company, is_subcontracted: frm.doc.is_subcontracted, transaction_date: frm.doc.transaction_date || frm.doc.posting_date, - ignore_pricing_rule: frm.doc.ignore_pricing_rule + ignore_pricing_rule: frm.doc.ignore_pricing_rule, + doctype: frm.doc.doctype } }, freeze: true, From 7c7e9ecfcd579e0c133bed67866d5b43074376e7 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Fri, 9 Aug 2019 14:48:26 +0530 Subject: [PATCH 2/2] test: translation fix --- erpnext/tests/test_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/tests/test_search.py b/erpnext/tests/test_search.py index 8a93b6a5a80..b9665dbd765 100644 --- a/erpnext/tests/test_search.py +++ b/erpnext/tests/test_search.py @@ -7,7 +7,7 @@ class TestSearch(unittest.TestCase): #Search for the word "cond", part of the word "conduire" (Lead) in french. def test_contact_search_in_foreign_language(self): frappe.local.lang = 'fr' - output = filter_dynamic_link_doctypes("DocType", "cond", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'}) + output = filter_dynamic_link_doctypes("DocType", "prospect", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'}) result = [['found' for x in y if x=="Lead"] for y in output] self.assertTrue(['found'] in result)