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

fix: Replace newlines with spaces before evaluation of condition and formula (#21165)

Browse Source
This commit is contained in:
Nabin Hait 2020-04-08 09:34:46 +05:30 committed by GitHub
parent da6806e6bc
commit 04870ae23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -356,13 +356,13 @@ class SalarySlip(TransactionBase):
def eval_condition_and_formula(self, d, data): def eval_condition_and_formula(self, d, data):
try: try:
condition = d.condition.strip() if d.condition else None condition = d.condition.strip().replace("\n", " ") if d.condition else None
if condition: if condition:
if not frappe.safe_eval(condition, self.whitelisted_globals, data): if not frappe.safe_eval(condition, self.whitelisted_globals, data):
return None return None
amount = d.amount amount = d.amount
if d.amount_based_on_formula: if d.amount_based_on_formula:
formula = d.formula.strip() if d.formula else None formula = d.formula.strip().replace("\n", " ") if d.formula else None
if formula: if formula:
amount = flt(frappe.safe_eval(formula, self.whitelisted_globals, data), d.precision("amount")) amount = flt(frappe.safe_eval(formula, self.whitelisted_globals, data), d.precision("amount"))
if amount: if amount: