Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32832 from rohitwaghchaure/fixed-customer-supplier-not-able-to-select

Browse Source 
fix: not able to select customer / supplier
This commit is contained in:
rohitwaghchaure 2022-11-03 11:54:58 +05:30 committed by GitHub
commit 7a5a500d29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/supplier/test_supplier.py
View File

@ -156,6 +156,8 @@ class TestSupplier(FrappeTestCase):
def test_serach_fields_for_supplier(self): def test_serach_fields_for_supplier(self):
from erpnext.controllers.queries import supplier_query from erpnext.controllers.queries import supplier_query
frappe.db.set_value("Buying Settings", None, "supp_master_name", "Naming Series")
supplier_name = create_supplier(supplier_name="Test Supplier 1").name supplier_name = create_supplier(supplier_name="Test Supplier 1").name
make_property_setter( make_property_setter(
@ -187,6 +189,8 @@ class TestSupplier(FrappeTestCase):
self.assertEqual(data[0].supplier_type, "Company") self.assertEqual(data[0].supplier_type, "Company")
self.assertTrue("supplier_type" in data[0]) self.assertTrue("supplier_type" in data[0])
frappe.db.set_value("Buying Settings", None, "supp_master_name", "Supplier Name")
def create_supplier(**args): def create_supplier(**args):
args = frappe._dict(args) args = frappe._dict(args)

4
erpnext/controllers/queries.py
View File

@ -85,7 +85,7 @@ def customer_query(doctype, txt, searchfield, start, page_len, filters, as_dict=
fields = ["name"] fields = ["name"]
if cust_master_name != "Customer Name": if cust_master_name != "Customer Name":
fields = ["customer_name"] fields.append("customer_name")
fields = get_fields(doctype, fields) fields = get_fields(doctype, fields)
searchfields = frappe.get_meta(doctype).get_search_fields() searchfields = frappe.get_meta(doctype).get_search_fields()
@ -123,7 +123,7 @@ def supplier_query(doctype, txt, searchfield, start, page_len, filters, as_dict=
fields = ["name"] fields = ["name"]
if supp_master_name != "Supplier Name": if supp_master_name != "Supplier Name":
fields = ["supplier_name"] fields.append("supplier_name")
fields = get_fields(doctype, fields) fields = get_fields(doctype, fields)

4
erpnext/selling/doctype/customer/test_customer.py
View File

@ -345,6 +345,8 @@ class TestCustomer(FrappeTestCase):
def test_serach_fields_for_customer(self): def test_serach_fields_for_customer(self):
from erpnext.controllers.queries import customer_query from erpnext.controllers.queries import customer_query
frappe.db.set_value("Selling Settings", None, "cust_master_name", "Naming Series")
make_property_setter( make_property_setter(
"Customer", None, "search_fields", "customer_group", "Data", for_doctype="Doctype" "Customer", None, "search_fields", "customer_group", "Data", for_doctype="Doctype"
) )
@ -369,6 +371,8 @@ class TestCustomer(FrappeTestCase):
self.assertEqual(data[0].territory, "_Test Territory") self.assertEqual(data[0].territory, "_Test Territory")
self.assertTrue("territory" in data[0]) self.assertTrue("territory" in data[0])
frappe.db.set_value("Selling Settings", None, "cust_master_name", "Customer Name")
def get_customer_dict(customer_name): def get_customer_dict(customer_name):
return { return {