nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into refactor-call-popup

Browse Source
This commit is contained in:
Suraj Shetty
2019-08-09 18:18:17 +05:30
committed by GitHub
parent 7e818067eb ca5fdeb9bb
commit b282f1f154
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/controllers/buying.js
View File

@@ -452,7 +452,8 @@ erpnext.buying.get_items_from_product_bundle = function(frm) {
company: frm.doc.company, company: frm.doc.company,
is_subcontracted: frm.doc.is_subcontracted, is_subcontracted: frm.doc.is_subcontracted,
transaction_date: frm.doc.transaction_date || frm.doc.posting_date, 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, freeze: true,

2
erpnext/tests/test_search.py
View File

@@ -7,7 +7,7 @@ class TestSearch(unittest.TestCase):
#Search for the word "cond", part of the word "conduire" (Lead) in french. #Search for the word "cond", part of the word "conduire" (Lead) in french.
def test_contact_search_in_foreign_language(self): def test_contact_search_in_foreign_language(self):
frappe.local.lang = 'fr' 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] result = [['found' for x in y if x=="Lead"] for y in output]
self.assertTrue(['found'] in result) self.assertTrue(['found'] in result)