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 |
|
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 |
|
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 |
|
Abdeali Chharchhoda
|
3d8a344173
|
fix: on changes of paid from/to account fetch company bank account
(cherry picked from commit 4901dc2531)
|
2025-11-12 05:38:56 +00:00 |
|
rohitwaghchaure
|
0023476500
|
Merge pull request #50470 from frappe/mergify/bp/version-15-hotfix/pr-50187
fix: Update pick list locations quantity (backport #50187)
|
2025-11-11 16:11:03 +05:30 |
|
ruthra kumar
|
0c4295fb6f
|
Merge pull request #50472 from frappe/mergify/bp/version-15-hotfix/pr-50469
fix: automatically append taxes if taxes_and_charges is set in Buying controller (backport #50469)
|
2025-11-11 15:57:52 +05:30 |
|
Sagar Vora
|
13371275db
|
Merge pull request #50471 from frappe/mergify/bp/version-15-hotfix/pr-50155
fix: ensure that additional discount amount is not mapped repeatedly (backport #50155)
|
2025-11-11 15:13:48 +05:30 |
|
Sagar Vora
|
313e6af528
|
chore: resolve conflicts
|
2025-11-11 15:11:52 +05:30 |
|
ljain112
|
e2a0d6e5f6
|
test: add automatic tax addition for buying controller
(cherry picked from commit 3d0a668c50)
|
2025-11-11 09:34:16 +00:00 |
|
ljain112
|
25f5fb7637
|
fix: automatically append taxes if taxes_and_charges is set in Buying controller
(cherry picked from commit d171dc7328)
|
2025-11-11 09:34:16 +00:00 |
|
Sagar Vora
|
22848eb4da
|
chore: remove unused import
(cherry picked from commit 81ab15351e)
# Conflicts:
# erpnext/controllers/taxes_and_totals.py
|
2025-11-11 09:32:59 +00:00 |
|
Sagar Vora
|
b4df87e545
|
refactor: simplify logic
(cherry picked from commit 95f604457d)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
9ed40cc17d
|
fix: handle returns as well
(cherry picked from commit 0e026b9ccd)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
22b6760164
|
test: some tests to ensure correct discount mapping
(cherry picked from commit 0968f435d2)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
e559fafa83
|
fix: validate that discount amount cannot exceed total before discount
(cherry picked from commit f4f79d99e4)
# Conflicts:
# erpnext/controllers/taxes_and_totals.py
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
44539f0944
|
fix: ensure that additional discount amount is not mapped repeatedly
(cherry picked from commit feb62102d9)
|
2025-11-11 09:32:55 +00:00 |
|
Kavin
|
a0d94c38c1
|
test: add test for pending qty calculation in Pick List
(cherry picked from commit 3f7a60d56c)
|
2025-11-11 09:24:34 +00:00 |
|
Kavin
|
95ea9ca66b
|
fix: Pass stock_qty and picked_qty in transfer entry
(cherry picked from commit 6db605c443)
|
2025-11-11 09:24:34 +00:00 |
|
Kavin
|
ce7ab8df9a
|
fix: Update pick list locations quantity
(cherry picked from commit bd9e240ca5)
|
2025-11-11 09:24:34 +00:00 |
|