From 12e4b33a1f8a9e66091f0531d19f50fff7dc649c Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Wed, 13 Oct 2021 11:26:24 -0400 Subject: [PATCH] fix: simplify merge condition statement Co-authored-by: gavin --- frappe/model/rename_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 9377ad74f8..de83b24cd8 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -471,7 +471,7 @@ def bulk_rename(doctype, rows=None, via_console = False): for row in rows: # if row has some content if len(row) > 1 and row[0] and row[1]: - merge = True if len(row) > 2 and (row[2] == "1" or row[2].lower() == "true") else False + merge = len(row) > 2 and (row[2] == "1" or row[2].lower() == "true") try: if rename_doc(doctype, row[0], row[1], merge=merge): msg = _("Successful: {0} to {1}").format(row[0], row[1])