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

fix: do not use built-in "input", reload_doc

Browse Source
This commit is contained in:
Sagar Vora 2019-01-23 16:58:42 +05:30
parent f51661b225
commit e9778d9556
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
View File

@ -61,8 +61,8 @@ class SupplierScorecardPeriod(Document):
return weighed_score return weighed_score
def get_eval_statement(self, input): def get_eval_statement(self, formula):
my_eval_statement = input.replace("\r", "").replace("\n", "") my_eval_statement = formula.replace("\r", "").replace("\n", "")
for var in self.variables: for var in self.variables:
if var.value: if var.value:

4
erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py
View File

@ -5,6 +5,10 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_criteria')
frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_scoring_criteria')
frappe.reload_doc('buying', 'doctype', 'supplier_scorecard')
for criteria in frappe.get_all('Supplier Scorecard Criteria', fields=['name', 'formula'], limit_page_length=None): for criteria in frappe.get_all('Supplier Scorecard Criteria', fields=['name', 'formula'], limit_page_length=None):
frappe.db.set_value('Supplier Scorecard Criteria', criteria.name, frappe.db.set_value('Supplier Scorecard Criteria', criteria.name,
'formula', criteria.formula.replace('&lt;','<').replace('&gt;','>')) 'formula', criteria.formula.replace('&lt;','<').replace('&gt;','>'))