ljain112 153df4eca5 chore: resolve conflicts

2025-07-13 18:16:49 +05:30

..

accounts

chore: resolve conflicts

2025-07-13 18:16:49 +05:30

assets

Merge pull request #48294 from frappe/mergify/bp/version-15-hotfix/pr-48293

2025-06-30 13:27:29 +05:30

bulk_transaction

…

buying

fix: incorrect pending qty when creating PI from PO and PI rates differ from PO (backport #48173) (#48340)

2025-07-06 21:40:26 +05:30

change_log

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

2025-06-10 06:04:08 +00:00

commands

…

communication

…

config

…

controllers

fix: no attribute error in old subcontracting flow

2025-07-10 17:33:10 +00:00

crm

Merge pull request #48267 from frappe/mergify/bp/version-15-hotfix/pr-48266

2025-06-30 10:48:20 +05:30

domains

…

edi

…

erpnext_integrations

…

maintenance

…

manufacturing

fix: use planned_qty instead of pending_qty to check if WO should be created against PP

2025-07-09 15:56:34 +00:00

patches

fix: add company field on POS Invoice Merge Log (backport #48357) (#48414)

2025-07-06 15:25:59 +05:30

portal

…

projects

feat: add subject field to project (#48368)

2025-07-04 16:10:19 +00:00

public

fix: update item reference in quality inspection

2025-07-08 17:16:50 +05:30

quality_management

…

regional

feat(regional): Address Template for Germany & Add Switzerland Template (#46737)

2025-03-31 10:34:00 +00:00

selling

fix: pos adding item multiple times on item group filter

2025-07-10 07:09:28 +00:00

setup

fix: employee_exit_translatability

2025-07-11 06:33:22 +00:00

shopping_cart

…

startup

…

stock

chore: return doc if item already exists for test

2025-07-13 11:51:32 +00:00

subcontracting

fix: fallback expense account and cost center in subcontracting receipt

2025-06-24 06:20:50 +00:00

support

perf: reduce query when validating any doc

2025-04-05 18:10:06 +00:00

telephony

fix: prevent unnecessary db.commit for contact insert [Linters]

2025-07-10 05:43:14 +00:00

templates

fix: timesheet portal showing total billing hours

2025-05-10 06:09:25 +00:00

tests

fix: improved indexing for SLE queries. (backport #47194) (#47822)

2025-05-30 15:36:51 +05:30

translations

chore: improve some german translations (#48283)

2025-06-26 20:23:35 +02:00

utilities

fix: consider empty string in previous doc validation

2025-07-08 07:11:51 +00:00

www

…

__init__.py

…

.stylelintrc

…

exceptions.py

…

hooks.py

refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (backport #47691) (#48223)

2025-06-24 14:51:15 +05:30

modules.txt

…

patches.txt

fix: add company field on POS Invoice Merge Log (backport #48357) (#48414)

2025-07-06 15:25:59 +05:30