From a70296e9b5806c01e26508f58c36e185a345d773 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Fri, 5 Dec 2025 16:31:54 +0530 Subject: [PATCH 1/2] Merge pull request #50931 from diptanilsaha/gh-49357 (cherry picked from commit 31d55248e4ea9bac625d889b5969a36a911f3899) # Conflicts: # erpnext/utilities/bulk_transaction.py --- erpnext/utilities/bulk_transaction.py | 29 ++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py index 51447e0591b..72d0ff15c0d 100644 --- a/erpnext/utilities/bulk_transaction.py +++ b/erpnext/utilities/bulk_transaction.py @@ -16,9 +16,36 @@ def transaction_processing(data, from_doctype, to_doctype): else: deserialized_data = data +<<<<<<< HEAD +======= + if isinstance(args, str): + args = frappe._dict(json.loads(args)) + + skipped_records = [d for d in deserialized_data if d.get("status") in ("On Hold", "Closed")] + + deserialized_data = [d for d in deserialized_data if d.get("status") not in ("On Hold", "Closed")] + +>>>>>>> 31d55248e4 (Merge pull request #50931 from diptanilsaha/gh-49357) length_of_data = len(deserialized_data) - frappe.msgprint(_("Started a background job to create {1} {0}").format(to_doctype, length_of_data)) + skipped_msg = "" + + if skipped_records: + skipped_msg = _("{0} creation for the following records will be skipped.").format(to_doctype) + + skipped_msg += ( + "

" + ) + + if not length_of_data: + frappe.msgprint(skipped_msg) + return + + frappe.msgprint( + _("Started a background job to create {1} {0}. {2}").format(to_doctype, length_of_data, skipped_msg) + ) frappe.enqueue( job, deserialized_data=deserialized_data, From 05778bb81ae74d845e28bc77e6d83c9c2fd2c889 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Fri, 5 Dec 2025 16:40:57 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- erpnext/utilities/bulk_transaction.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py index 72d0ff15c0d..1dc45b426b7 100644 --- a/erpnext/utilities/bulk_transaction.py +++ b/erpnext/utilities/bulk_transaction.py @@ -16,16 +16,10 @@ def transaction_processing(data, from_doctype, to_doctype): else: deserialized_data = data -<<<<<<< HEAD -======= - if isinstance(args, str): - args = frappe._dict(json.loads(args)) - skipped_records = [d for d in deserialized_data if d.get("status") in ("On Hold", "Closed")] deserialized_data = [d for d in deserialized_data if d.get("status") not in ("On Hold", "Closed")] ->>>>>>> 31d55248e4 (Merge pull request #50931 from diptanilsaha/gh-49357) length_of_data = len(deserialized_data) skipped_msg = ""