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

chore: Remove custom party queries

Browse Source 
(cherry picked from commit c9623b6fd6)
This commit is contained in:
Deepesh Garg
2024-03-13 11:59:43 +05:30
committed by Mergify
parent 823e377ef1
commit 2512d4c7f2
9 changed files with 28 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/buying/doctype/buying_settings/buying_settings.py
View File

@@ -54,9 +54,35 @@ class BuyingSettings(Document):
hide_name_field=False,
)
set_search_fields("Supplier", "supplier_name", self.get("supp_master_name") == "Naming Series")
def before_save(self):
self.check_maintain_same_rate()
def check_maintain_same_rate(self):
if self.maintain_same_rate:
self.set_landed_cost_based_on_purchase_invoice_rate = 0
def set_search_fields(doctype, fieldname, naming_series):
"""Change a doctype's naming to user naming series"""
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
searchfields = frappe.get_meta(doctype).get_search_fields()
if naming_series:
if fieldname not in searchfields:
searchfields.append(fieldname)
else:
if fieldname in searchfields:
searchfields.remove(fieldname)
make_property_setter(
doctype,
"",
"search_fields",
", ".join(searchfields),
"Data",
for_doctype=True,
validate_fields_for_doctype=False,
)

4
erpnext/buying/doctype/supplier/supplier.json
View File

@@ -485,7 +485,7 @@
"link_fieldname": "party"
}
],
"modified": "2023-10-19 16:55:15.148325",
"modified": "2024-03-13 11:14:06.516519",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
@@ -544,7 +544,7 @@
}
],
"quick_entry": 1,
"search_fields": "supplier_name, supplier_group",
"search_fields": "supplier_group",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",

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

@@ -154,44 +154,6 @@ class TestSupplier(FrappeTestCase):
# Rollback
address.delete()
def test_serach_fields_for_supplier(self):
from erpnext.controllers.queries import supplier_query
frappe.db.set_single_value("Buying Settings", "supp_master_name", "Naming Series")
supplier_name = create_supplier(supplier_name="Test Supplier 1").name
make_property_setter(
"Supplier", None, "search_fields", "supplier_group", "Data", for_doctype="Doctype"
)
data = supplier_query(
"Supplier", supplier_name, "name", 0, 20, filters={"name": supplier_name}, as_dict=True
)
self.assertEqual(data[0].name, supplier_name)
self.assertEqual(data[0].supplier_group, "Services")
self.assertTrue("supplier_type" not in data[0])
make_property_setter(
"Supplier",
None,
"search_fields",
"supplier_group, supplier_type",
"Data",
for_doctype="Doctype",
)
data = supplier_query(
"Supplier", supplier_name, "name", 0, 20, filters={"name": supplier_name}, as_dict=True
)
self.assertEqual(data[0].name, supplier_name)
self.assertEqual(data[0].supplier_group, "Services")
self.assertEqual(data[0].supplier_type, "Company")
self.assertTrue("supplier_type" in data[0])
frappe.db.set_single_value("Buying Settings", "supp_master_name", "Supplier Name")
def create_supplier(**args):
args = frappe._dict(args)