Rohit Waghchaure
808ca06801
fix: permissions in workstation file
...
(cherry picked from commit cf127e89000fea93388d
2026-06-12 12:29:08 +00:00
Mihir Kandoi
74da3b8775
Merge pull request #55839 from frappe/mergify/bp/version-15-hotfix/pr-55838
...
fix(stock): make uom mandatory in item uom table (backport #55838 )
2026-06-12 07:34:20 +05:30
pandiyan
c3a3eb3df3
fix(stock): make uom mandatory in item uom table
...
(cherry picked from commit a0177fdbe8
2026-06-12 07:17:08 +05:30
Mihir Kandoi
d4baf0aeba
Merge pull request #55833 from frappe/mergify/bp/version-15-hotfix/pr-55820
...
fix: show user disable audit log (backport #55820 )
2026-06-11 21:50:07 +05:30
Mihir Kandoi
e40999c879
fix: sync employee user status after save
2026-06-11 20:58:35 +05:30
pandiyan
559585fb7b
fix: show user disable audit log
...
(cherry picked from commit 73d1852773
2026-06-11 15:01:32 +00:00
Mihir Kandoi
ee3f502538
Merge pull request #55814 from frappe/mergify/bp/version-15-hotfix/pr-55813
...
fix(bom): fetch routing operations when Routing is selected (backport #55813 )
2026-06-11 20:30:35 +05:30
Mihir Kandoi
f37727d399
chore: resolve conflicts
2026-06-11 20:28:55 +05:30
Mihir Kandoi
b8d507e496
chore: resolve conflicts
2026-06-11 20:28:31 +05:30
ruthra kumar
11359b0ac2
Merge pull request #55819 from frappe/mergify/bp/version-15-hotfix/pr-55696
...
fix: apply user permissions to receivable/payable reports (backport #55696 )
2026-06-11 16:59:48 +05:30
Kaushal Shriwas
7639a3360e
test: clean up receivable entries to avoid cross-report leakage
2026-06-11 16:43:05 +05:30
mergify[bot]
f1fc9e3261
fix: added doctype filter validation for sales person wise transaction summary report (backport #55812 ) ( #55817 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix: added doctype filter validation for sales person wise transaction summary report (#55812 )
2026-06-11 07:08:59 +00:00
Kaushal Shriwas
b9a694bb37
test: cover user permission scoping in receivable report
...
(cherry picked from commit 4200d17c9b
2026-06-11 06:58:06 +00:00
Kaushal Shriwas
c03a66a1bf
fix: apply user permissions to receivable/payable reports
...
(cherry picked from commit b05abbc53b
2026-06-11 06:58:06 +00:00
Mohammad Umair Sayed
02e38e80a7
fix(bom): fetch routing operations when Routing is selected ( #55813 )
...
fix(bom): fetch routing operations when routing is selected
frm.doc.operations is always an array in Frappe, so !frm.doc.operations
was always false (empty array [] is truthy in JS), causing get_routing()
to never fire when a Routing is selected on a BOM with no existing
operations.
Changed the guard to !frm.doc.operations.length so the fetch triggers
correctly when the operations table is empty.
Also wired the same fetch into the with_operations handler so that
enabling the checkbox after a Routing is already set will populate
operations without requiring the user to re-select the Routing.
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local >
(cherry picked from commit 9249fa89aa
2026-06-11 06:25:34 +00:00
Nabin Hait
2905669af4
Merge pull request #55794 from frappe/mergify/bp/version-15-hotfix/pr-55789
...
fix: prefetch batchwise valuations before streaming SLEs in stock ageing (backport #55789 )
2026-06-10 12:14:37 +05:30
Mihir Kandoi
c6176500d2
fix: prefetch batchwise valuations before streaming SLEs in stock ageing
...
Stock Ageing iterates stock ledger entries through an unbuffered
(streaming) cursor. _get_batchwise_valuation() lazily queried
Batch.use_batchwise_valuation from inside that loop whenever a row
carried the legacy batch_no field, and the nested query invalidated
the active streaming result set — crashing the report (or silently
dropping the remaining rows, depending on the driver version).
Resolve the valuation flags in a single query before entering the
unbuffered cursor block; the lazy lookup now only serves callers that
pass stock ledger entries in directly, where no streaming is active.
Fixes https://github.com/frappe/erpnext/issues/55786
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com >
(cherry picked from commit 060a5c4eeb
2026-06-10 06:07:48 +00:00
mergify[bot]
18ca96c36b
fix(process statement of accounts): validate pdf_name and validate permission before triggering send_auto_email (backport #55781 ) ( #55782 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(process statement of accounts): validate pdf_name and validate permission before triggering send_auto_email (#55781 )
2026-06-09 19:10:24 +00:00
Mihir Kandoi
95f46dfc01
fix: handle multi-select stock ageing filters ( #55776 )
2026-06-09 13:45:52 +00:00
mergify[bot]
0e64acb0fa
fix: prevent leakage of party-derived fields in cross doctype transactions (backport #55336 ) ( #55578 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
Co-authored-by: Lakshit Jain <ljain112@gmail.com >
fix: prevent leakage of party-derived fields in cross doctype transactions (#55336 )
2026-06-09 13:23:49 +00:00
Pandiyan P
a5c23a3d16
fix: restrict already invoiced qty in intercompany purchase invoice ( #55754 )
2026-06-09 13:13:23 +05:30
mergify[bot]
2f5b93e308
fix(cheque_print_template): print format creation from cheque print template requires system manager (backport #55708 ) ( #55711 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(cheque_print_template): print format creation from cheque print template requires system manager (#55708 )
2026-06-09 13:01:40 +05:30
rohitwaghchaure
aeed6a459f
Merge pull request #55751 from frappe/mergify/bp/version-15-hotfix/pr-55748
...
fix: sql injection (backport #55748 )
2026-06-09 09:49:16 +05:30
rohitwaghchaure
c0f56cd284
chore: fix conflicts
...
Removed conflicting code related to date_field assignment based on filters.
2026-06-09 09:31:58 +05:30
Rohit Waghchaure
a94e362b8c
fix: sql injection
...
(cherry picked from commit bd0acf4413
2026-06-09 03:58:13 +00:00
rohitwaghchaure
a121048f9b
Merge pull request #55741 from frappe/mergify/bp/version-15-hotfix/pr-55740
...
fix: validate fg and materials qty in the disassemble entry (backport #55740 )
2026-06-08 22:45:45 +05:30
mergify[bot]
cedd0a1903
fix: bypass project permission check when updating consumed material … (backport #55645 ) ( #55706 )
...
* fix: bypass project permission check when updating consumed material cost
(cherry picked from commit 4b0b7adeeepandiyanpalani37@gmail.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-06-08 14:22:54 +00:00
rohitwaghchaure
8bccc25b1a
chore: fix conflicts
...
Removed unused test cases related to sample retention stock entry.
2026-06-08 19:45:39 +05:30
rohitwaghchaure
335173c5ba
chore: fix conflicts
...
Reintroduce the _qty_tolerance function to handle float rounding.
2026-06-08 19:44:48 +05:30
Rohit Waghchaure
ba19a24526
fix: validate fg and materials qty in the disassemble entry
...
(cherry picked from commit 4453c1072a
2026-06-08 14:01:31 +00:00
rohitwaghchaure
2c4b89d1df
Merge pull request #55734 from frappe/mergify/bp/version-15-hotfix/pr-55716
...
fix: do not allow to make changes in SABB after submit (backport #55716 )
2026-06-08 16:02:35 +05:30
ruthra kumar
14bafe9dfd
Merge pull request #55728 from frappe/mergify/bp/version-15-hotfix/pr-55486
...
Validations in CRM-api endpoints (backport #55486 )
2026-06-08 15:50:23 +05:30
ruthra kumar
77d9849d16
Merge pull request #55730 from frappe/mergify/bp/version-15-hotfix/pr-55487
...
fix: add validations in accounts whitelisted methods (backport #55487 )
2026-06-08 15:49:34 +05:30
mergify[bot]
09453f883b
fix: remove item name from update items dialog item code column (backport #55718 ) ( #55722 )
...
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
Co-authored-by: Abdullah <frappe@LAPTOP-4E788RM4.localdomain >
fix: remove item name from update items dialog item code column (#55718 )
2026-06-08 15:42:09 +05:30
rohitwaghchaure
dc1fb3f804
chore: fix conflicts
...
Removed unused methods related to stock ledger entries and negative stock handling.
2026-06-08 15:28:44 +05:30
Rohit Waghchaure
07b61113af
fix: do not allow to make changes in SABB after submit
...
(cherry picked from commit e36426e235
2026-06-08 09:56:01 +00:00
Shllokkk
2d1c0dcb53
fix: add permission checks in accounts whitelisted methods
...
(cherry picked from commit 5dbf3fdde0
2026-06-08 15:17:26 +05:30
Shllokkk
45b232d369
fix: use new_doc with field allowlist in CRM integration endpoints
...
(cherry picked from commit e460e83516
2026-06-08 09:41:05 +00:00
mergify[bot]
7852ea65af
fix: update items respects workflow "Only Allow Edit For" role (backport #55667 ) ( #55705 )
...
* fix: update items respects workflow "Only Allow Edit For" role (#55667 )
(cherry picked from commit 76b9b6a34e64089478+kaulith@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-06-08 06:59:05 +00:00
ruthra kumar
999cfef619
Merge pull request #55703 from frappe/mergify/bp/version-15-hotfix/pr-55665
...
fix: drop ignore_permissions handling from add_ac (backport #55665 )
2026-06-08 12:01:48 +05:30
Shllokkk
2d0e3fd9af
fix: drop ignore_permissions handling from add_ac
...
(cherry picked from commit 37d2adc74b
2026-06-08 06:14:59 +00:00
mergify[bot]
4c9c2911a6
chore: remove unused whitelisted method from project (backport #55648 ) ( #55672 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-06-07 23:15:42 +05:30
rohitwaghchaure
e0a0b3eafc
Merge pull request #55663 from frappe/mergify/bp/version-15-hotfix/pr-55661
...
fix: naming series issue (backport #55661 )
2026-06-05 21:04:00 +05:30
rohitwaghchaure
8c9168595f
chore: fix conflicts
...
Removed unused import of DateTimeLikeObject.
2026-06-05 20:48:19 +05:30
Rohit Waghchaure
e7eaa87a77
fix: naming series issue
...
(cherry picked from commit 3a50056968
2026-06-05 15:14:02 +00:00
Mihir Kandoi
ffb36cff78
[codex] Show in-transit status for add-to-transit Stock Entries (backport #55644 to version-15-hotfix) ( #55659 )
...
[codex] Show in-transit status for add-to-transit Stock Entries (#55644 )
(cherry picked from commit df03524b19
2026-06-05 11:32:33 +00:00
Khushi Rawat
4fadc4aab6
Merge pull request #55652 from khushi8112/address-contacts-report-field-order
...
fix: correct field order in Address and Contacts report
2026-06-05 16:13:24 +05:30
khushi8112
bde46cffd0
fix: correct field order in Address and Contacts report
2026-06-05 15:33:39 +05:30
khushi8112
08f3cf98f9
fix: correct field order in Address and Contacts report
2026-06-05 15:31:43 +05:30
Mihir Kandoi
55b0715310
fix: work order status should be in process if material transfer is skipped (backport #55641 to version-15-hotfix) ( #55643 )
...
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com >
2026-06-05 05:36:10 +00:00
