pandiyan
569f82f0e5
fix: add partially transferred status and fix button visibility for partial material transfer on job card
...
(cherry picked from commit a22b83a97f )
# Conflicts:
# erpnext/manufacturing/doctype/job_card/job_card.js
# erpnext/manufacturing/doctype/job_card/job_card.json
# erpnext/manufacturing/doctype/job_card/job_card.py
2026-06-20 19:02:52 +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
nareshkannasln
81e05fc1f6
fix: update system manager permissions
...
(cherry picked from commit 501c8087cb )
2026-06-16 20:42:53 +05:30
Mihir Kandoi
ebdb23bdda
chore: resolve conflicts
2026-06-16 20:37:19 +05:30
Mihir Kandoi
75a8b9097c
Merge pull request #55553 from aerele/fix/support-#69882
...
fix(manufacturing): fetch raw materials from work order
2026-06-16 20:35:15 +05:30
Sudharsanan11
1ffef19957
fix(stock): enable quality inspection for all Stock Entry purposes
...
Backport of #55830 to version-15.
Allow creating a Quality Inspection from Stock Entries of any purpose
(not just Manufacture). check_item_quality_inspection now returns the
items for Stock Entry, and the inspection type is resolved as "Incoming"
for Manufacture / Material Receipt and "Outgoing" otherwise.
Ref: #70945
2026-06-16 20:26:21 +05:30
rohitwaghchaure
8a59385b22
Merge pull request #55995 from frappe/mergify/bp/version-15-hotfix/pr-55986
...
chore: removed redundant validation in SCR (backport #55986 )
2026-06-16 19:40:59 +05:30
rohitwaghchaure
b15b2e1b2a
Merge pull request #55990 from rohitwaghchaure/fixed-recalculate-valuation-rate-in-pr-v15
...
fix: provision to recalculate valuation rate during reposting
2026-06-16 19:38:50 +05:30
Rohit Waghchaure
df0c8ee21e
fix: provision to recalculate valuation rate during reposting
2026-06-16 19:09:07 +05:30
Rohit Waghchaure
71c7045b98
chore: removed redundant validation in SCR
...
(cherry picked from commit 1b4487450c )
2026-06-16 13:38:27 +00:00
Dharanidharan2813
7f30a2cfb6
fix(stock): show only batched items in batch item selector
...
(cherry picked from commit 62f6d18143 )
# Conflicts:
# erpnext/stock/doctype/batch/batch.json
2026-06-16 13:00:51 +00:00
Sudharsanan Ashok
ab8b74e3d8
Merge pull request #55975 from frappe/mergify/bp/version-15-hotfix/pr-55943
...
refactor: ignore cancelled GLE's while looking for account (backport #55943 )
2026-06-16 16:59:18 +05:30
Sudharsanan11
b22096a640
test(manufacturing): add test to validate the transferred raw materials from work order
2026-06-16 16:55:31 +05:30
ervishnucs
9546ab72e0
refactor: ignore cancelled GLE's while looking for account
...
(cherry picked from commit 40942401df )
2026-06-16 11:08:16 +00:00
Diptanil Saha
8f23f1f180
Revert "fix(budget): add root_type filter on account field (backport #55934 )" ( #55966 )
2026-06-16 15:30:51 +05:30
ruthra kumar
a3a945a12f
Merge pull request #55961 from frappe/mergify/bp/version-15-hotfix/pr-53152
...
fix: prevent exchange rate flow from transaction to payment (backport #53152 )
2026-06-16 14:38:29 +05:30
ruthra kumar
48bcfc78ea
Merge pull request #55954 from frappe/mergify/bp/version-15-hotfix/pr-55934
...
fix(budget): add root_type filter on account field (backport #55934 )
2026-06-16 14:10:04 +05:30