From 34e94d6e7abd4939bca0f2b1f340d60c11f39ba9 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Thu, 23 Apr 2026 15:36:47 +0530 Subject: [PATCH] chore: resolve conflicts --- .../report/tds_payable_monthly/tds_payable_monthly.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py index 650928e879b..710a557e909 100644 --- a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +++ b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py @@ -127,11 +127,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_ else: entries[key] = row out = list(entries.values()) -<<<<<<< HEAD:erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py - out.sort(key=lambda x: (x["section_code"], x["transaction_date"])) -======= out.sort(key=lambda x: (x["tax_withholding_category"], x["transaction_date"], x["ref_no"])) ->>>>>>> 7630c01e40 (refactor: use consistent report column names):erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py return out