diptanilsaha
|
2b0281c510
|
fix(point-of-sale): render payment methods only payment component is visible
(cherry picked from commit 7dc4306640)
|
2025-10-16 20:13:33 +00:00 |
|
rohitwaghchaure
|
03766e8980
|
Merge pull request #50117 from frappe/mergify/bp/version-15-hotfix/pr-50113
fix: adjustment entry (backport #50113)
|
2025-10-15 21:31:32 +05:30 |
|
Diptanil Saha
|
e7b7377b7e
|
Merge pull request #50120 from frappe/mergify/bp/version-15-hotfix/pr-50096
fix: added exception handling on service level agreement apply hook (backport #50096)
|
2025-10-15 19:51:23 +05:30 |
|
Diptanil Saha
|
a3a6d39436
|
fix: added exception handling on service level agreement apply hook (#50096)
* fix: added exception handling on service level agreement apply hook
* Revert "fix: added exception handling on service level agreement apply hook"
This reverts commit dae93aa96f.
* fix: Ignore missing SLA table during install/uninstall
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 182c9fd966)
|
2025-10-15 14:04:17 +00:00 |
|
Rohit Waghchaure
|
76cfa28a42
|
fix: adjustment entry
(cherry picked from commit c0851abaee)
|
2025-10-15 10:30:33 +00:00 |
|
Diptanil Saha
|
afa7d2b595
|
Merge pull request #50109 from frappe/mergify/bp/version-15-hotfix/pr-50095
fix: preview stock ledger for manual serial and batch values (backport #50095)
|
2025-10-15 13:14:13 +05:30 |
|
Kavin
|
c64dcf3423
|
fix: preview stock ledger for manual serial and batch values
(cherry picked from commit c5f68d0b27)
|
2025-10-15 05:47:41 +00:00 |
|
Mihir Kandoi
|
3fa38d0b4e
|
Merge pull request #50106 from frappe/mergify/bp/version-15-hotfix/pr-50078
fix: handle flt conversion for prev_ordered_qty (backport #50078)
|
2025-10-15 00:02:09 +05:30 |
|
mergify[bot]
|
abb210bd18
|
refactor: add supplier filter in buying (backport #50013) (#50107)
* refactor: add supplier filter in buying
(cherry picked from commit 108b108d64)
# Conflicts:
# erpnext/public/js/controllers/buying.js
* chore: resolve conflicts
---------
Co-authored-by: manikandan-s-18 <manikandansundar18@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-10-14 18:22:20 +00:00 |
|
Kavin
|
3d3e116797
|
fix: handle flt conversion for prev_ordered_qty
(cherry picked from commit 77c35ef47f)
|
2025-10-14 18:10:30 +00:00 |
|
mergify[bot]
|
bd3a132868
|
feat: set options for IBAN fields (backport #49377) (#49413)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-10-14 14:42:08 +00:00 |
|
rohitwaghchaure
|
6f02362765
|
Merge pull request #50098 from frappe/mergify/bp/version-15-hotfix/pr-50089
fix: sanitize projects field in tasks webform (backport #50089)
|
2025-10-14 19:07:50 +05:30 |
|
Akhil Narang
|
432201f634
|
fix: sanitize projects field in tasks webform (#50089)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit f8b50d3ffa)
|
2025-10-14 13:08:51 +00:00 |
|
rohitwaghchaure
|
f9dc00f8ad
|
Merge pull request #50094 from frappe/mergify/bp/version-15-hotfix/pr-50080
perf: optimize sql query (backport #50080)
|
2025-10-14 18:17:00 +05:30 |
|
rohitwaghchaure
|
0dd79e8c2b
|
Merge pull request #50092 from frappe/mergify/bp/version-15-hotfix/pr-50091
fix: negative error not throw for backdated entry (backport #50091)
|
2025-10-14 18:16:42 +05:30 |
|
Khushi Rawat
|
f70e61ab31
|
Merge pull request #50093 from frappe/mergify/bp/version-15-hotfix/pr-50033
fix: filter sales team to show only active individual salespersons (backport #50033)
|
2025-10-14 17:51:15 +05:30 |
|
mergify[bot]
|
b67b29200c
|
fix: prevent empty Create dropdown when In Process (backport #49891) (#50063)
|
2025-10-14 17:49:27 +05:30 |
|
mergify[bot]
|
fd72b55852
|
Merge pull request #50081 from frappe/mergify/bp/version-15-hotfix/pr-49960
Fix/Support 50220 (backport #49960)
|
2025-10-14 12:12:14 +00:00 |
|
Khushi Rawat
|
dccc561eec
|
fix: resolve conflict
|
2025-10-14 17:25:48 +05:30 |
|
rohitwaghchaure
|
8bf553bbce
|
chore: fix conflicts
|
2025-10-14 17:17:12 +05:30 |
|
Rohit Waghchaure
|
79a8e2656b
|
perf: optimize sql query
(cherry picked from commit e7b64175fd)
# Conflicts:
# erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
|
2025-10-14 11:44:04 +00:00 |
|
Rehan Ansari
|
38efd5cb0b
|
fix: filter sales team to show only active individual salespersons
(cherry picked from commit 2fcd406b18)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2025-10-14 11:40:00 +00:00 |
|
Rohit Waghchaure
|
1fc21d60c6
|
fix: negative error not throw for backdated entry
(cherry picked from commit 88a947ff4e)
|
2025-10-14 11:39:06 +00:00 |
|
Khushi Rawat
|
a777a11919
|
Merge pull request #50088 from khushi8112/composite-component-depr-jv-cancellation-issue
fix: skip auto-cancel of depreciation for components during asset capitalization
|
2025-10-14 16:57:50 +05:30 |
|
Diptanil Saha
|
6cc046362f
|
Merge branch 'version-15' into version-15-hotfix
|
2025-10-14 16:56:32 +05:30 |
|
khushi8112
|
02ebde43bf
|
refactor: Ensure flag cleanup with try-finally to prevent state corruption
|
2025-10-14 16:32:32 +05:30 |
|
khushi8112
|
6d5f2b5024
|
fix: skip auto-cancel of depreciation for components during asset capitalization
|
2025-10-14 15:19:07 +05:30 |
|
Mihir Kandoi
|
a50313f990
|
Merge pull request #50084 from frappe/mergify/bp/version-15-hotfix/pr-50004
fix: add GROUP BY for dn_detail and convert SQL query to QB (backport #50004)
|
2025-10-14 15:13:59 +05:30 |
|
Mihir Kandoi
|
7d533b7086
|
chore: resolve conflicts
|
2025-10-14 14:57:28 +05:30 |
|
l0gesh29
|
9aa9b181e5
|
fix: add GROUP BY for dn_detail and convert SQL query to QB
(cherry picked from commit fd9167f2af)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.py
|
2025-10-14 09:20:17 +00:00 |
|
l0gesh29
|
b426b8c07f
|
fix: hide sales invoice creation for fully returned delivery notes
(cherry picked from commit 1f831d8783)
|
2025-10-14 09:20:16 +00:00 |
|
Mihir Kandoi
|
6682a25532
|
Merge pull request #50082 from frappe/mergify/bp/version-15-hotfix/pr-50079
chore: replace broken links with correct ones (backport #50079)
|
2025-10-14 14:43:05 +05:30 |
|
Mihir Kandoi
|
01fe1c658e
|
chore: replace broken links with correct ones
(cherry picked from commit 11be07086f)
|
2025-10-14 08:58:06 +00:00 |
|
rohitwaghchaure
|
82e392bc0c
|
Merge pull request #50074 from frappe/mergify/bp/version-15-hotfix/pr-50070
fix: performance issue by adding index (backport #50070)
|
2025-10-14 13:57:10 +05:30 |
|
rohitwaghchaure
|
b6f99a127b
|
Merge pull request #50075 from frappe/mergify/bp/version-15-hotfix/pr-50065
fix(stock-reconciliation): include inventory dimensions in duplicate validation (backport #50065)
|
2025-10-14 13:56:55 +05:30 |
|
rohitwaghchaure
|
7d34a39137
|
Merge pull request #50076 from frappe/mergify/bp/version-15-hotfix/pr-50073
fix(stock-entry): fetch empty batch for finished item (backport #50073)
|
2025-10-14 13:56:41 +05:30 |
|
rohitwaghchaure
|
76fe4e26ea
|
Merge pull request #50077 from frappe/mergify/bp/version-15-hotfix/pr-50072
fix: swap warehouse labels for return entry (backport #50072)
|
2025-10-14 13:56:17 +05:30 |
|
Kavin
|
c5dc810642
|
fix: swap warehouse labels for return entry
(cherry picked from commit f0c3f0d0be)
|
2025-10-14 08:07:00 +00:00 |
|
venkat102
|
af3d7ef300
|
fix(stock-entry): fetch empty batch for finished item
(cherry picked from commit 74a7ddf66d)
|
2025-10-14 08:05:57 +00:00 |
|
rohitwaghchaure
|
61f7309695
|
chore: fix conflicts
|
2025-10-14 13:33:56 +05:30 |
|
Rohit Waghchaure
|
9854dedc06
|
fix: duplicate serial nos
(cherry picked from commit c95465cba1)
|
2025-10-14 08:03:44 +00:00 |
|
venkat102
|
21a972ad95
|
fix(stock-reconciliation): include inventory dimensions in duplicate validation
(cherry picked from commit 4b21c2cc46)
|
2025-10-14 08:03:43 +00:00 |
|
rohitwaghchaure
|
967ee78415
|
chore: fix conflicts
|
2025-10-14 13:33:24 +05:30 |
|
Rohit Waghchaure
|
e4fd49e991
|
fix: performance issue by adding index
(cherry picked from commit 1afc75b15a)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
|
2025-10-14 08:02:28 +00:00 |
|
rohitwaghchaure
|
b82f8648f1
|
Merge pull request #50068 from frappe/mergify/bp/version-15-hotfix/pr-50061
fix: do reposting of first transfer entry based on item-wh combination (backport #50061)
|
2025-10-14 13:21:13 +05:30 |
|
rohitwaghchaure
|
141b70ce8b
|
Merge pull request #50069 from frappe/mergify/bp/version-15-hotfix/pr-50027
fix: reset raw materials considering not available batches (backport #50027)
|
2025-10-14 13:21:03 +05:30 |
|
Rohit Waghchaure
|
2184a28e91
|
fix: reset raw materials considering not available batches
(cherry picked from commit ec1636db12)
|
2025-10-14 07:19:43 +00:00 |
|
Rohit Waghchaure
|
e9d71e013a
|
fix: do reposting of first transfer entry based on item-wh combination
(cherry picked from commit 2f25b445ab)
|
2025-10-14 07:19:08 +00:00 |
|
Mihir Kandoi
|
5909b0e1a2
|
Merge pull request #50064 from frappe/mergify/bp/version-15-hotfix/pr-49445
fix(production plan): filter sales orders by item (backport #49445)
|
2025-10-14 12:20:56 +05:30 |
|
Mihir Kandoi
|
525dd42e86
|
Merge pull request #50062 from frappe/mergify/bp/version-15-hotfix/pr-50058
fix: warehouse source reference in production report (backport #50058)
|
2025-10-14 12:10:53 +05:30 |
|