nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2026-04-23 15:36:47 +05:30
parent 32d46b3e88
commit 34e94d6e7a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@@ -127,11 +127,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
else: else:
entries[key] = row entries[key] = row
out = list(entries.values()) 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"])) 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 return out