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

Merge pull request #51338 from mihir-kandoi/gh43256

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-30 11:53:32 +05:30
committed by GitHub
parent e2e2e78b65 db9ce998e1
commit acb30dc6ac
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py
View File

@@ -45,7 +45,7 @@ class SupplierScorecardCriteria(Document):
mylist = re.finditer(regex, test_formula, re.MULTILINE | re.DOTALL) mylist = re.finditer(regex, test_formula, re.MULTILINE | re.DOTALL)
for _dummy1, match in enumerate(mylist): for _dummy1, match in enumerate(mylist):
for _dummy2 in range(0, len(match.groups())): for _dummy2 in range(0, len(match.groups())):
test_formula = test_formula.replace("{" + match.group(1) + "}", "0") test_formula = test_formula.replace("{" + match.group(1) + "}", "1")
try: try:
frappe.safe_eval(test_formula, None, {"max": max, "min": min}) frappe.safe_eval(test_formula, None, {"max": max, "min": min})

11
erpnext/buying/doctype/supplier_scorecard_criteria/test_supplier_scorecard_criteria.py
View File

@@ -17,7 +17,6 @@ class TestSupplierScorecardCriteria(IntegrationTestCase):
def test_formula_validate(self): def test_formula_validate(self):
delete_test_scorecards() delete_test_scorecards()
self.assertRaises(frappe.ValidationError, frappe.get_doc(test_bad_criteria[1]).insert) self.assertRaises(frappe.ValidationError, frappe.get_doc(test_bad_criteria[1]).insert)
self.assertRaises(frappe.ValidationError, frappe.get_doc(test_bad_criteria[2]).insert)
def delete_test_scorecards(): def delete_test_scorecards():
@@ -68,16 +67,8 @@ test_bad_criteria = [
"name": "Fake Criteria 2", "name": "Fake Criteria 2",
"weight": 40.0, "weight": 40.0,
"doctype": "Supplier Scorecard Criteria", "doctype": "Supplier Scorecard Criteria",
"formula": "(({cost_of_on_time_shipments} / {tot_cost_shipments}))* 100", # Force 0 divided by 0 "formula": "(({cost_of_on_time_shipments} {cost_of_on_time_shipments} / {tot_cost_shipments}))* 100", # Two variables beside eachother
"criteria_name": "Fake Criteria 2", "criteria_name": "Fake Criteria 2",
"max_score": 100.0, "max_score": 100.0,
}, },
{
"name": "Fake Criteria 3",
"weight": 40.0,
"doctype": "Supplier Scorecard Criteria",
"formula": "(({cost_of_on_time_shipments} {cost_of_on_time_shipments} / {tot_cost_shipments}))* 100", # Two variables beside eachother
"criteria_name": "Fake Criteria 3",
"max_score": 100.0,
},
] ]