Commit Graph

55353 Commits

Author SHA1 Message Date
Mihir Kandoi
2db138a833 fix: use qty instead of stock qty dropship gross profit report (#54389)
(cherry picked from commit d6b379b936)

# Conflicts:
#	erpnext/accounts/report/gross_profit/gross_profit.py
2026-06-22 14:14:03 +00:00
Lakshit Jain
4048f0666e Merge pull request #55770 from frappe/mergify/bp/version-15-hotfix/pr-55758
fix: update round off account functions to accept document context for regional overrides (backport #55758)
2026-06-22 18:13:50 +05:30
ljain112
42121f2e36 fix: simplify get_round_off_applicable_accounts function signature 2026-06-22 17:40:57 +05:30
Mihir Kandoi
94d7d8f9d6 Merge pull request #56287 from aerele/backport-56203
fix: add partially transferred status and fix button visibility for p…
2026-06-22 16:48:04 +05:30
ruthra kumar
5ca37b8c37 Merge pull request #56298 from frappe/mergify/bp/version-15-hotfix/pr-55488
fix: add validation and tests for set_status (backport #55488)
2026-06-22 13:58:43 +05:30
Shllokkk
7bea925230 fix: add validation and tests for set_status
(cherry picked from commit b5a84c5e65)
2026-06-22 07:50:39 +00:00
pandiyan
1f5283da58 fix: add partially transferred status and fix button visibility for partial material transfer on job card 2026-06-22 11:51:33 +05:30
mergify[bot]
37d26222d7 fix: clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (backport #55903) (#56169)
fix: clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (#55903)

(cherry picked from commit 322d4dff25)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/accounts/doctype/sales_invoice/services/pos.py

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
2026-06-22 05:17:49 +05:30
mergify[bot]
42af4ce7b0 fix: escape user image url on various templates (backport #56269) (#56270)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: escape user image url on various templates (#56269)
2026-06-22 03:00:50 +05:30
Mihir Kandoi
67925bde42 Merge pull request #56264 from frappe/mergify/bp/version-15-hotfix/pr-56206
fix(stock): allow partial raw material picking/transfer from work order (backport #56206)
2026-06-22 01:12:01 +05:30
Sudharsanan11
e6d45e35c7 test(stock): add test to validate the partial transfer of raw material
(cherry picked from commit 4d055d374a)
2026-06-21 23:36:43 +05:30
Sudharsanan11
a858d77461 fix(stock): allow partial raw material picking/transfer from work order
(cherry picked from commit 8e3fbab94a)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/work_order.py
2026-06-21 23:36:43 +05:30
mergify[bot]
37f847e730 fix(stock): update voucher valuaion rate in sle (backport #55960) (#56262)
fix(stock): update voucher valuaion rate in sle (#55960)

(cherry picked from commit 130c2594e1)

Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
2026-06-21 22:07:38 +05:30
Mihir Kandoi
3d46ae7cbc Merge pull request #56248 from frappe/mergify/bp/version-15-hotfix/pr-56201
fix(stock): apply precision to the additional cost amount in stock entry (backport #56201)
2026-06-21 14:01:45 +05:30
Sudharsanan11
deb11745e5 test(stock): add test to validate the precision for additional cost amount
(cherry picked from commit 20b14395e3)
2026-06-21 08:14:47 +00:00
Sudharsanan11
acc1444c03 fix(stock): apply precision to the additional cost amount in stock entry
(cherry picked from commit 6ac699d3bb)
2026-06-21 08:14:47 +00:00
Diptanil Saha
a0c062af90 Merge pull request #56193 from frappe/mergify/bp/version-15-hotfix/pr-56191
fix: added missing permission validation on whitelisted function and removed unnecessary whitelisted decorator (backport #56191)
2026-06-20 20:19:27 +05:30
diptanilsaha
7a04f031d9 chore: resolve conflicts 2026-06-20 20:00:29 +05:30
diptanilsaha
0efebf5d8c fix(report_utils): remove unnecessary whitelist decorator on get_invoiced_item_gross_margin
(cherry picked from commit e29535f29c)

# Conflicts:
#	erpnext/accounts/report/utils.py
2026-06-20 20:00:29 +05:30
diptanilsaha
041a9adbbf fix(err): add missing permission check on get_account_details
(cherry picked from commit 9bf1e847d2)
2026-06-20 20:00:23 +05:30
ruthra kumar
7b6dd42aa1 Merge pull request #56158 from frappe/mergify/bp/version-15-hotfix/pr-55265
fix: update reference doctype mapping and field visibility in bank guarantee (backport #55265)
2026-06-19 17:54:27 +05:30
nareshkannasln
e556cbbe6a fix: update reference doctype mapping and field visibility in bank guarantee
(cherry picked from commit b1de654dfd)

# Conflicts:
#	erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
2026-06-19 16:57:18 +05:30
Mihir Kandoi
ad9c16073e Merge pull request #56035 from aerele/fix/dashboard-party-dynamic-links 2026-06-19 11:09:39 +05:30
Smit Vora
ce2560e2fe Merge pull request #56122 from frappe/mergify/bp/version-15-hotfix/pr-56104
fix: base_tax_amount as none when payment entry created using API (backport #56104)
2026-06-19 09:25:41 +05:30
vorasmit
37dffa7273 fix: tax.base_tax_amount as none when payment entry created using API
(cherry picked from commit b9b402f2ec)
2026-06-19 03:17:39 +00:00
Mihir Kandoi
3ef6475249 Merge pull request #56114 from frappe/mergify/bp/version-15-hotfix/pr-56055
fix: disable is_debit_note while creating credit note (backport #56055)
2026-06-18 22:53:32 +05:30
Mihir Kandoi
6deff470d8 Merge pull request #56065 from barredterra/item-update-attribute-value
fix(stock): propagate renamed attribute values to variant items
2026-06-18 22:35:17 +05:30
Mihir Kandoi
03cda066a5 Merge pull request #56116 from frappe/mergify/bp/version-15-hotfix/pr-56098
fix: apply docstatus filter to exclude cancelled Work Orders in Seria… (backport #56098)
2026-06-18 22:30:44 +05:30
pandiyan
90fd057fb3 fix: apply docstatus filter to exclude cancelled Work Orders in Serial No
(cherry picked from commit 3ba8f690a4)
2026-06-18 16:56:24 +00:00
pandiyan
e4370ab332 fix: disable is_debit_note while creating credit note
(cherry picked from commit 279c8dea06)
2026-06-18 16:54:01 +00:00
mergify[bot]
ce8fce78f1 fix: Add likely missing escapes (backport #55574) (#55580)
* fix: Add likely missing escaps (#55574)

(cherry picked from commit b72cde73ba)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.py
#	erpnext/controllers/website_list_for_contact.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
2026-06-18 11:32:54 +00:00
rohitwaghchaure
f3334eb2d3 Merge pull request #56080 from rohitwaghchaure/allow-negative-stock-for-batch-v15
feat: allow negative stock at batch level (backport to v15)
2026-06-18 14:31:21 +05:30
Rohit Waghchaure
5c4f19ebdc feat: add batch-level option to allow negative stock for batch 2026-06-18 14:00:25 +05:30
rohitwaghchaure
98caefea88 refactor: posting datetime for SABB (backport #49710 + #50248) (#56072)
* refactor: posting datetime for SABB (backport #49710 + #50248)

Backport of #49710 "refactor: posting datetime for SABB" to
version-15-hotfix, including the regression fix #50248
"fix: missed refactoring code".

Replaces Serial and Batch Bundle's `posting_date`/`posting_time` with a
single `posting_datetime` field and updates all readers/writers; adds a
patch to populate `posting_datetime` from the linked Stock Ledger Entry
and drop the now-unused single-column indexes.

Adapted to version-15-hotfix where the surrounding stock code had already
moved to `posting_datetime` (SLE) and diverged from develop.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore: fix conflicts

* chore: fixed formatting

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-18 05:51:13 +00:00
barredterra
c7acd88742 fix(stock): update variant attributes on value rename 2026-06-17 17:55:27 +02:00
barredterra
60f5de7ab8 test(stock): add cleanup for item attribute value changes in tests 2026-06-17 17:34:42 +02:00
barredterra
27d574dad5 fix(stock): propagate renamed attribute values to variant items 2026-06-17 17:04:58 +02:00
Mihir Kandoi
5c4220ee77 Merge pull request #56052 from aerele/backport-56002
fix(stock): update transfer status for mixed transfer flows
2026-06-17 17:42:07 +05:30
pandiyan
c13567228e test(stock): validate completed status for mixed transfer methods 2026-06-17 17:22:53 +05:30
pandiyan
3f9a88a5e2 fix(stock): update transfer status for mixed transfer flows 2026-06-17 17:22:48 +05:30
Mihir Kandoi
8b2204ce69 Merge pull request #56044 from mihir-kandoi/codex/fix-stock-ageing-reco-ageing-v15
fix: preserve stock ageing on non-serial reconciliation
2026-06-17 16:19:17 +05:30
Mihir Kandoi
19913127a7 fix: preserve stock ageing on non-serial reconciliation 2026-06-17 15:58:47 +05:30
S Sakthivel Murugan
690adf1051 fix: add dynamic links for customer and supplier dashboards 2026-06-17 12:51:35 +05:30
mergify[bot]
8c7a313a38 fix: Add authorization checks on internal functions (backport #55709) (backport #55726) (#55736)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Add authorization checks on internal functions (backport #55709) (#55726)
fix: Add authorization checks on internal functions (#55709)
2026-06-16 21:34:10 +00:00
mergify[bot]
5f5b2a6ae2 fix: updated role based permission for terms and conditions doctype (backport #55674) (#55675)
* fix: updated role based permission for terms and conditions doctype (#55674)

(cherry picked from commit 0ba2961103)

# Conflicts:
#	erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
2026-06-16 21:30:22 +00:00
mergify[bot]
8a9461ff45 fix(company): replaced "this company" with company name on delete transactions dialog (backport #56021) (#56022)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(company): replaced "this company" with company name on delete transactions dialog (#56021)
2026-06-17 02:14:05 +05:30
mergify[bot]
64bbc019ad fix(accounts): removed whitelist on get_balance_on (backport #55956) (#55964)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(accounts): removed whitelist on `get_balance_on` (#55956)
2026-06-16 22:46:15 +05:30
Mihir Kandoi
797e740aea Merge pull request #56001 from aerele/fix/qi-stock-entry-inspection-v15
fix(stock): enable quality inspection for all Stock Entry purposes
2026-06-16 21:27:22 +05:30
Mihir Kandoi
8f2bd2b77e Merge pull request #55991 from frappe/mergify/bp/version-15-hotfix/pr-55985
fix(stock): show only batched items in batch item selector (backport #55985)
2026-06-16 21:27:06 +05:30
Mihir Kandoi
776031b277 Merge pull request #56004 from frappe/mergify/bp/version-15-hotfix/pr-55978
fix: update system manager permissions (backport #55978)
2026-06-16 21:20:14 +05:30