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 |
|
Pugazhendhi Velu
|
a5ec0e4f50
|
fix(stock-entry): prevent default warehouse from overriding parent warehouse
(cherry picked from commit 8b38578914)
|
2025-11-17 04:41:27 +00:00 |
|
mergify[bot]
|
8c98f1692a
|
feat: Add first and last name fields to quick entry customer creation (backport #46281) (#50522)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: maasanto <73234812+maasanto@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-11-13 21:58:34 +05:30 |
|
Diptanil Saha
|
182e84e94c
|
Merge pull request #50521 from frappe/mergify/bp/version-15-hotfix/pr-50498
fix(period closing voucher): add title to error log (backport #50498)
|
2025-11-13 21:50:21 +05:30 |
|
PUGAZHENDHI V
|
33962ac995
|
fix(period closing voucher): add title to error log (#50498)
(cherry picked from commit 4f720b3969)
|
2025-11-13 15:56:37 +00:00 |
|
mergify[bot]
|
3b636d5db7
|
fix: first and last name in supplier quick entry (backport #50510) (#50514)
Co-authored-by: ljain112 <ljain112@gmail.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-11-13 15:37:50 +05:30 |
|
rohitwaghchaure
|
3f0bea2d9f
|
Merge pull request #50488 from aerele/support-53076
fix: handle NoneType object error for packed_items
|
2025-11-12 22:50:37 +05:30 |
|
rohitwaghchaure
|
34ed9b455f
|
Merge pull request #50491 from frappe/mergify/bp/version-15-hotfix/pr-50487
fix: current qty in stock reconciliation (backport #50487)
|
2025-11-12 22:49:44 +05:30 |
|
Kavin
|
2b7abfb34b
|
fix: handle NoneType object error for product bundle
|
2025-11-12 18:26:19 +05:30 |
|
Diptanil Saha
|
2ba1731d3f
|
Merge pull request #50484 from frappe/mergify/bp/version-15-hotfix/pr-50409
|
2025-11-12 15:14:53 +05:30 |
|
Rohit Waghchaure
|
b4b8459f2c
|
fix: current qty in stock reco
(cherry picked from commit 58315bc963)
|
2025-11-12 08:26:01 +00:00 |
|
Diptanil Saha
|
d5160c4c86
|
test: delete outdated pos opening entry
|
2025-11-12 12:26:26 +05:30 |
|
Diptanil Saha
|
af19b81343
|
chore: resolve conflict
|
2025-11-12 11:35:02 +05:30 |
|
Diptanil Saha
|
650d2f74ba
|
chore: resolve conflict
|
2025-11-12 11:33:56 +05:30 |
|
diptanilsaha
|
68747b5818
|
fix: prevent pos opening entry creation for disabled pos profile
(cherry picked from commit e35e8968f0)
# Conflicts:
# erpnext/accounts/doctype/pos_opening_entry/test_pos_opening_entry.py
|
2025-11-12 05:44:01 +00:00 |
|
diptanilsaha
|
38848ff43b
|
test: added test to validate disabled pos profile
(cherry picked from commit 69016a284f)
# Conflicts:
# erpnext/accounts/doctype/pos_profile/test_pos_profile.py
|
2025-11-12 05:44:00 +00:00 |
|
diptanilsaha
|
87e8305753
|
feat(pos): prevent disabling POS Profile when open POS sessions exist
(cherry picked from commit c5219278fb)
|
2025-11-12 05:44:00 +00:00 |
|
Diptanil Saha
|
a2345d467e
|
Merge pull request #50483 from frappe/mergify/bp/version-15-hotfix/pr-50323
fix(payment entry): on changes of paid from/to account fetch company bank account (backport #50323)
|
2025-11-12 11:11:37 +05:30 |
|