Mihir Kandoi
|
87ffbdf129
|
Merge pull request #50641 from frappe/mergify/bp/version-15-hotfix/pr-50502
fix(purchase_receipt): add internal_and_external_links field to show … (backport #50502)
|
2025-11-20 15:45:43 +05:30 |
|
rohitwaghchaure
|
5ef7b8c526
|
Merge pull request #50648 from frappe/mergify/bp/version-15-hotfix/pr-50646
fix: serial batch selector shown only once (backport #50646)
|
2025-11-20 15:12:51 +05:30 |
|
Mihir Kandoi
|
25cd230471
|
fix: serial batch selector shown only once
(cherry picked from commit aa6f09e9a9)
|
2025-11-20 09:38:37 +00:00 |
|
rohitwaghchaure
|
f05933e814
|
Merge pull request #50645 from frappe/mergify/bp/version-15-hotfix/pr-50644
fix: validation for SABB deletion (backport #50644)
|
2025-11-20 14:33:05 +05:30 |
|
Diptanil Saha
|
8df2612694
|
Merge pull request #50643 from frappe/mergify/bp/version-15-hotfix/pr-50289
|
2025-11-20 13:58:58 +05:30 |
|
Rohit Waghchaure
|
0bc98b609f
|
fix: validation for SABB deletion
(cherry picked from commit dd4bef0706)
|
2025-11-20 08:19:48 +00:00 |
|
l0gesh29
|
02a1f815da
|
feat(reports): preserve accounting dimension filters while navigating between reports
(cherry picked from commit fcfcaa76c6)
|
2025-11-20 07:46:55 +00:00 |
|
l0gesh29
|
6b6e017e36
|
feat: modify accounting dimension as multiselect field
(cherry picked from commit 3fcd8d84ac)
|
2025-11-20 07:46:55 +00:00 |
|
Karuppasamy B
|
89fcdbf56b
|
fix(purchase_receipt): add internal_and_external_links field to show purchase invoice connection count
(cherry picked from commit 6c1620ab8c)
|
2025-11-20 07:03:55 +00:00 |
|
rohitwaghchaure
|
eb2571492f
|
Merge pull request #50612 from aerele/fix/validate-reserved-stock
fix: ignore reserved batches from total available batches
|
2025-11-19 22:16:00 +05:30 |
|
Kavin
|
55f2f1c515
|
test: add unit test for reserved stock validation
|
2025-11-19 17:51:10 +05:30 |
|
Kavin
|
673b893942
|
fix: ignore reserved batches from total available batches
|
2025-11-19 17:51:10 +05:30 |
|
mergify[bot]
|
c85ce55f27
|
Merge pull request #50631 from frappe/mergify/bp/version-15-hotfix/pr-50629
fix: process loss % can be negative (backport #50629)
|
2025-11-19 11:30:39 +00:00 |
|
Mihir Kandoi
|
a19252e3b3
|
Merge pull request #50628 from frappe/mergify/bp/version-15-hotfix/pr-50627
fix: show current company warehouse only in get material from bom MR (backport #50627)
|
2025-11-19 16:29:17 +05:30 |
|
Mihir Kandoi
|
7ece6fd558
|
Merge pull request #50626 from frappe/mergify/bp/version-15-hotfix/pr-50625
fix: add filter company and status to job card employee (backport #50625)
|
2025-11-19 16:24:08 +05:30 |
|
Mihir Kandoi
|
1d6e3e4e7d
|
fix: show current company warehouse only in get material from bom MR
(cherry picked from commit 3271eaaf0e)
|
2025-11-19 10:46:47 +00:00 |
|
Mihir Kandoi
|
015f946a14
|
fix: add filter company and status to job card employee
(cherry picked from commit 3ca3a6d9bb)
|
2025-11-19 10:42:32 +00:00 |
|
rohitwaghchaure
|
533a2dbc32
|
Merge pull request #50607 from frappe/mergify/bp/version-15-hotfix/pr-50512
fix: add return status for purchase receipt (backport #50512)
|
2025-11-19 14:18:12 +05:30 |
|
rohitwaghchaure
|
99aeb8ecd1
|
Merge pull request #50606 from frappe/mergify/bp/version-15-hotfix/pr-50486
fix: validate sabb autocreation when disabled (backport #50486)
|
2025-11-19 14:18:00 +05:30 |
|
Mihir Kandoi
|
371030f8d4
|
Merge pull request #50615 from frappe/mergify/bp/version-15-hotfix/pr-50614
fix: redundant message on bom save (backport #50614)
|
2025-11-19 12:53:50 +05:30 |
|
Mihir Kandoi
|
2550b44db8
|
chore: resolve conflicts
|
2025-11-19 12:38:47 +05:30 |
|
Mihir Kandoi
|
5b1674018b
|
fix: redundant message on bom save
(cherry picked from commit 074f07694f)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.py
|
2025-11-19 07:06:11 +00:00 |
|
ruthra kumar
|
b4fd4812cd
|
Merge pull request #50527 from aerele/default-report-fiscal-year-v15
fix(financial reports): set fiscal year associated with the default company
|
2025-11-18 18:12:21 +05:30 |
|
rohitwaghchaure
|
876dec5077
|
chore: fix conflicts
|
2025-11-18 18:05:08 +05:30 |
|
rohitwaghchaure
|
36e9aae9d0
|
chore: fix conflicts
|
2025-11-18 18:04:29 +05:30 |
|
Pugazhendhi Velu
|
8ccb9a5ad2
|
fix: add return status for purchase receipt
(cherry picked from commit 3a0e1e8ef9)
|
2025-11-18 12:33:18 +00:00 |
|
Kavin
|
85c0c16964
|
fix: validate sabb autocreation when disabled
(cherry picked from commit 3ca1940881)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-11-18 12:29:01 +00:00 |
|
ruthra kumar
|
6a46045804
|
Merge pull request #50603 from frappe/mergify/bp/version-15-hotfix/pr-50524
fix: use dynamic account type to get average ratio balance (backport #50524)
|
2025-11-18 17:44:31 +05:30 |
|
ruthra kumar
|
befa4bef0d
|
Merge pull request #50601 from frappe/mergify/bp/version-15-hotfix/pr-50516
fix(general_ledger): add translation for accounting dimension (backport #50516)
|
2025-11-18 17:13:34 +05:30 |
|
mergify[bot]
|
f8294f1754
|
feat(Company): allow setting default sales contact, fetch into sales transaction (backport #50159) (#50599)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-11-18 17:05:58 +05:30 |
|
mergify[bot]
|
2d6640ac61
|
fix: add condition for allow negative stock in pos (backport #50369) (#50600)
Co-authored-by: Logesh Periyasamy <logeshperiyasamy24@gmail.com>
fix: add condition for allow negative stock in pos (#50369)
|
2025-11-18 17:05:47 +05:30 |
|
Navin-S-R
|
627b34a120
|
fix: correct profit after tax calculation by reducing expenses from income
(cherry picked from commit f420371a7e)
|
2025-11-18 11:22:38 +00:00 |
|
Navin-S-R
|
a2c82b4dc3
|
fix: use dynamic account type to get average ratio balance
(cherry picked from commit 9118f08e7b)
|
2025-11-18 11:22:38 +00:00 |
|
Logesh Periyasamy
|
799119ad3e
|
fix(general_ledger): add translation for accounting dimension
(cherry picked from commit 113ff17c71)
|
2025-11-18 11:15:37 +00:00 |
|
ruthra kumar
|
a4a0a2a0fb
|
Merge pull request #50554 from frappe/mergify/bp/version-15-hotfix/pr-50540
fix(stock-entry): prevent default warehouse from overriding parent warehouse (backport #50540)
|
2025-11-18 15:09:08 +05:30 |
|
ruthra kumar
|
35fb2b8ede
|
Merge pull request #50573 from frappe/mergify/bp/version-15-hotfix/pr-50496
fix: back calcalute total amount from rate and tax_amount in tax withholding details report (backport #50496)
|
2025-11-18 15:08:26 +05:30 |
|
ruthra kumar
|
c844bf5547
|
Merge pull request #50574 from frappe/mergify/bp/version-15-hotfix/pr-50439
fix: add doctype parameter to lead details for correct company details (backport #50439)
|
2025-11-18 15:07:15 +05:30 |
|
Kavin
|
81a16286a1
|
fix: unintended backported depends_on expression (#50529)
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
|
2025-11-18 10:07:26 +02:00 |
|
Khushi Rawat
|
3c8534c4cc
|
Merge pull request #50571 from aerele/fix/support-52685
fix: add cancelled option in status field
|
2025-11-18 11:15:53 +05:30 |
|
ravibharathi656
|
ac40b59665
|
fix(financial reports): set fiscal year associated with the default company
|
2025-11-18 11:14:40 +05:30 |
|
Pugazhendhi Velu
|
2db91ee67e
|
fix(asset repair): validate pi status
|
2025-11-17 14:06:26 +00:00 |
|
ljain112
|
f0eac47037
|
fix: add doctype parameter to lead details for correct company details
(cherry picked from commit 0b91338771)
|
2025-11-17 13:39:09 +00:00 |
|
ljain112
|
4df80c5b53
|
chore: typo in comment
(cherry picked from commit e056c0327d)
|
2025-11-17 13:36:08 +00:00 |
|
ljain112
|
c150e5795e
|
fix: improve precision in tax amount calculations in tax withholding details report
(cherry picked from commit 7c5f5405cc)
|
2025-11-17 13:36:08 +00:00 |
|
ljain112
|
57282999ad
|
fix: back calcalute total amount from rate and tax_amount in tax withholding details report
(cherry picked from commit d3751d9bb4)
|
2025-11-17 13:36:08 +00:00 |
|
Pugazhendhi Velu
|
623a0a932e
|
fix: add cancelled option in status field
|
2025-11-17 13:09:38 +00:00 |
|
rohitwaghchaure
|
9b06eaab78
|
Merge pull request #50535 from aerele/support-53360
fix: construct batch_nos and serial_nos to avoid NoneType error
|
2025-11-17 16:24:20 +05:30 |
|
Kavin
|
2a5c9b469c
|
fix: enable allow_negative_stock settings
|
2025-11-17 13:53:55 +05:30 |
|
Kavin
|
0a0177cb9e
|
fix: construct batch_nos and serial_nos to avoid NoneType error
|
2025-11-17 12:35:16 +05:30 |
|
Mihir Kandoi
|
eed144d7c9
|
Merge pull request #50231 from frappe/mergify/bp/version-15-hotfix/pr-40586
|
2025-11-17 10:26:43 +05:30 |
|