ruthra kumar e46be25e9f chore: resolve conflicts ...

(cherry picked from commit df3c821f98)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt

2026-06-24 15:36:07 +05:30

..

accounts

chore: resolve conflicts

2026-06-24 15:36:07 +05:30

assets

fix: import DateTimeLikeObject

2026-05-29 15:21:58 +05:30

bulk_transaction

fix: Add likely missing escapes (backport #55574) (#55581)

2026-06-03 15:53:43 +00:00

buying

fix: resolve backport merge conflicts in supplier.json

2026-06-23 16:10:11 +05:30

change_log

fix: add change log for bug fix in Additional Discount functionality

2025-06-09 18:06:16 +05:30

commands

…

communication

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-03-27 16:06:04 +05:30

config

…

controllers

fix: update round off account functions to accept document context for regional overrides (backport #55758) (#55771)

2026-06-22 12:30:09 +00:00

crm

feat(crm_settings)!: enable frappe crm data synchronization (backport #56268) (#56384)

2026-06-23 22:02:23 +05:30

desktop_icon

fix(banking): include paid purchase invoices in reports and bank clearance (#52675)

2026-03-17 04:48:44 +00:00

domains

…

edi

fix(edi): restrict Code List imports to files and trusted backend URLs (backport #54137) (#54266)

2026-04-23 15:36:35 +00:00

erpnext_integrations

chore: migrate Address/Contact custom fields from JSON fixtures to install (backport #55084) (#55088)

2026-05-20 21:24:40 +05:30

gettext

feat: add extractor for setup wizard txt files

2024-08-17 01:50:55 +02:00

locale

chore: sync translations to version-16-hotfix (#56321)

2026-06-23 02:16:25 +05:30

maintenance

refactor(test): remove explicit call to master data setup

2026-03-19 12:57:12 +05:30

manufacturing

fix(manufacturing): make item_code mandatory in Job Card Item

2026-06-23 13:33:00 +00:00

patches

perf: composite index on (serial_no, warehouse, posting_datetime) for Serial and Batch Entry (backport #56032) (#56166)

2026-06-19 12:54:19 +00:00

portal

fix: set customer details on customer creation at login (backport #53509) (#53629)

2026-03-19 07:11:25 +00:00

projects

fix: company default handling in purchase transactions made from project

2026-06-23 07:08:07 +00:00

public

fix: update round off account functions to accept document context for regional overrides (backport #55758) (#55771)

2026-06-22 12:30:09 +00:00

quality_management

refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide

2026-03-19 12:57:07 +05:30

regional

fix: validate company region in uae vat 201 (backport #54899) (#55055)

2026-05-19 11:29:17 +00:00

report_center

feat: workspace sidebars and desktop icons for erpnext modules

2025-11-17 13:20:57 +05:30

selling

fix(pos): remove redundant opening balance dialog onchange handler (backport #54591) (#56403)

2026-06-24 02:24:23 +05:30

setup

fix: fetch party types based on account type in journal entry and refactor SQL to query builder

2026-06-20 18:32:30 +00:00

shopping_cart

…

startup

refactor: limit reposting to only supported doctypes

2026-04-16 16:55:38 +05:30

stock

fix: address product bundle review comments

2026-06-22 16:32:42 +05:30

subcontracting

fix: update weighted average rate calculation to consider returned and consumed quantities

2026-06-19 09:17:57 +00:00

support

fix: add validation and tests for set_status

2026-06-22 07:51:06 +00:00

telephony

refactor(test): move commits inside test guard clause

2026-03-24 12:14:03 +00:00

templates

fix: escape user image url on various templates (backport #56269) (#56271)

2026-06-22 03:00:39 +05:30

tests

fix: consider batchwise valuation in stock ageing report (backport #54919) (#55230)

2026-05-24 07:18:07 +00:00

utilities

fix(taxes): add category and add_deduct_tax fields to tax entries (backport #55753) (#55773)

2026-06-09 12:59:13 +00:00

workspace_sidebar

fix: spelling of Payment Reconciliation in sidebar (backport #55599) (#55602)

2026-06-03 19:48:34 +05:30

www

feat: new banking module (backport #54720) (#55917)

2026-06-15 16:31:22 +05:30

__init__.py

chore(release): Bumped to Version 16.24.0

2026-06-23 21:37:59 +00:00

.stylelintrc

…

deprecation_dumpster.py

feat: add more fine-grained deprecation warning control (#44307)

2024-11-24 00:37:42 +01:00

exceptions.py

fix(stock): define qi exception classes in exceptions file

2026-06-19 11:38:25 +05:30

hooks.py

feat: new banking module (backport #54720) (#55917)

2026-06-15 16:31:22 +05:30

modules.txt

feat: new DocTypes "Code List" and "Common Code" (#43425)

2024-11-17 15:05:33 +01:00

patches.txt

chore: resolve conflicts

2026-06-24 15:36:07 +05:30