nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-05 16:40:57 +05:30
committed by GitHub
parent a70296e9b5
commit 05778bb81a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/utilities/bulk_transaction.py
View File

@@ -16,16 +16,10 @@ def transaction_processing(data, from_doctype, to_doctype):
else: else:
deserialized_data = data 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")] 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")] 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) length_of_data = len(deserialized_data)
skipped_msg = "" skipped_msg = ""