Commit Graph

54421 Commits

Author SHA1 Message Date
Rohit Waghchaure
aa43715de6 chore: fix conflicts 2026-01-09 18:16:38 +05:30
Rohit Waghchaure
01af6c8762 fix: incoming rate calculation
(cherry picked from commit 8e143d68b4)
2026-01-09 12:17:32 +00:00
Rohit Waghchaure
ee9debe581 perf: SABB taking time to save the record
(cherry picked from commit 20320c4a6c)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
#	erpnext/stock/serial_batch_bundle.py
2026-01-09 12:17:32 +00:00
mergify[bot]
d83365734e Merge pull request #51624 from frappe/mergify/bp/version-15-hotfix/pr-50869
fix: do cancellation procedures on WO close (backport #50869)
2026-01-09 09:48:28 +00:00
ruthra kumar
1fb554c312 Merge pull request #51598 from frappe/mergify/bp/version-15-hotfix/pr-51534
fix(accounts): correct sales order item deletion message for MR and PO linkage (backport #51534)
2026-01-08 17:57:30 +05:30
Pandiyan5273
4c53af0494 fix(accounts): correct sales order item deletion message for MR and PO linkage
(cherry picked from commit 5a47503611)
2026-01-08 12:10:25 +00:00
rohitwaghchaure
e9c14e88df Merge pull request #51597 from frappe/mergify/bp/version-15-hotfix/pr-51574
fix(stock): enable allow on submit for tracking status field (backport #51574)
2026-01-08 16:50:29 +05:30
rohitwaghchaure
e6dbd06435 Merge pull request #51533 from nishkagosalia/gh-51381
fix: correct uom reflecting in sales order when fetching from..
2026-01-08 16:31:37 +05:30
Pandiyan5273
9d5a493609 fix(stock): enable allow on submit for tracking status field
(cherry picked from commit 1bfb62465f)
2026-01-08 11:01:03 +00:00
rohitwaghchaure
530c0b0bd6 Merge pull request #51588 from frappe/mergify/bp/version-15-hotfix/pr-51586
fix: negative stock issue for higher precision (backport #51586)
2026-01-08 15:03:48 +05:30
rohitwaghchaure
5193dbba9b chore: fix conflicts
Refactor test cases for delivery notes to handle negative stock and higher precision.
2026-01-08 14:45:39 +05:30
Mihir Kandoi
42658f7b1c Merge pull request #51587 from frappe/mergify/bp/version-15-hotfix/pr-51585
fix: closed WO becomes open when RM is returned (backport #51585)
2026-01-08 14:38:34 +05:30
Rohit Waghchaure
1bbeecff12 fix: negative stock issue for higher precision
(cherry picked from commit 87be020c78)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
2026-01-08 09:07:10 +00:00
Mihir Kandoi
7db6ae8bda fix: closed WO becomes open when RM is returned
(cherry picked from commit d0ba365aaa)
2026-01-08 08:53:28 +00:00
Mihir Kandoi
2bdd14c831 Merge pull request #51584 from frappe/mergify/bp/version-15-hotfix/pr-51583
fix: allow all users of supplier to create purchase invoices (backport #51583)
2026-01-08 13:47:24 +05:30
Frappe PR Bot
c805c7fac4 chore(release): Bumped to Version 15.94.1
## [15.94.1](https://github.com/frappe/erpnext/compare/v15.94.0...v15.94.1) (2026-01-08)

### Bug Fixes

* remove posting date & time on SRE batch validation ([69259c9](69259c9933))
v15.94.1
2026-01-08 08:16:29 +00:00
rohitwaghchaure
7238636766 Merge pull request #51578 from frappe/mergify/bp/version-15/pr-51553
fix: remove posting date & time on SRE batch validation (backport #51553)
2026-01-08 13:45:06 +05:30
Mihir Kandoi
8f1509dca1 fix: allow all users of supplier to create purchase invoices
(cherry picked from commit 190204a939)
2026-01-08 08:02:13 +00:00
ruthra kumar
a7f59fece3 Merge pull request #51580 from frappe/mergify/bp/version-15-hotfix/pr-51167
fix(accounting-dimension): System-generated round-off GL entries fail to set the accounting dimension (backport #51167)
2026-01-08 12:21:21 +05:30
Logesh Periyasamy
1179514118 fix(accounting-dimension): System-generated round-off GL entries fail to set the accounting dimension (#51167)
* chore: remove disabled condition statement

* fix: add default dimension for round off gle

* fix: validate report type to handle opening entries roundoff

(cherry picked from commit bc63c85daf)
2026-01-08 06:36:27 +00:00
kavin-114
69259c9933 fix: remove posting date & time on SRE batch validation
(cherry picked from commit d3f2da0d59)
2026-01-08 05:51:19 +00:00
rohitwaghchaure
7aee6bdaf8 Merge pull request #51553 from aerele/support-52652
fix: remove posting date & time on SRE batch validation
2026-01-07 11:41:32 +05:30
ruthra kumar
f11fb0e45f Merge pull request #51549 from frappe/mergify/bp/version-15-hotfix/pr-51528
fix: change float types in payment entry reference table to currency (backport #51528)
2026-01-07 11:39:37 +05:30
trustedcomputer
d17debabf7 fix: change float types in payment entry reference table to currency
(cherry picked from commit 8ba71300db)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
2026-01-07 11:24:25 +05:30
Frappe PR Bot
0b565026a4 chore(release): Bumped to Version 15.94.0
# [15.94.0](https://github.com/frappe/erpnext/compare/v15.93.2...v15.94.0) (2026-01-07)

### Bug Fixes

* add company filters to project ([d6511b0](d6511b0045))
* **journal entry:** use submission_queue to perform submit and cancel actions for rows over 100 ([1d58e9b](1d58e9b91a))
* not able to submit backdated stock reco ([4b60979](4b6097914a))
* precision issue causing reservation error ([2d49cc9](2d49cc9ab2))
* resolve conflict ([dbd2964](dbd2964139))
* SABB not cancelled on cancel of Stock Reco ([eebd885](eebd88529f))
* **stock:** prevent excess stock reservation ([4d31012](4d31012df2))
* **stock:** remove item image to avoid setting the image of previous item ([6f1cfdb](6f1cfdb1de))
* **trial balance party:** add check for parties with zero credit and debit ([a0566c9](a0566c9e98))
* update filters on period closing voucher ([728a8b0](728a8b0b7d))

### Features

* add default-age-range in accounts settings (backport [#51458](https://github.com/frappe/erpnext/issues/51458)) ([#51531](https://github.com/frappe/erpnext/issues/51531)) ([582db48](582db48ca5))
* allow data import for asset repair doctype ([dc10ef4](dc10ef4287))
v15.94.0
2026-01-07 05:01:14 +00:00
ruthra kumar
5fcf5d58f0 Merge pull request #51538 from frappe/version-15-hotfix
chore: release v15
2026-01-07 10:29:48 +05:30
rohitwaghchaure
fac865a1b4 Merge branch 'version-15' into version-15-hotfix 2026-01-07 09:58:13 +05:30
kavin-114
d3f2da0d59 fix: remove posting date & time on SRE batch validation 2026-01-07 01:00:29 +05:30
ruthra kumar
f8fb58feaf Merge pull request #51493 from frappe/mergify/bp/version-15-hotfix/pr-51326
fix(journal entry): use submission_queue to perform submit and cancel actions for rows over 100 (backport #51326)
2026-01-06 20:57:12 +05:30
ruthra kumar
9bba78f7a2 Merge pull request #51545 from frappe/mergify/bp/version-15-hotfix/pr-51424
fix(trial balance party): add check for parties with zero credit and debit (backport #51424)
2026-01-06 18:03:13 +05:30
Jatin3128
a0566c9e98 fix(trial balance party): add check for parties with zero credit and debit
(cherry picked from commit 83ddaf1696)
2026-01-06 12:18:06 +00:00
Khushi Rawat
64a7e3f683 Merge pull request #51541 from frappe/mergify/bp/version-15-hotfix/pr-51540
feat: allow data import for asset repair doctype (backport #51540)
2026-01-06 17:01:12 +05:30
Khushi Rawat
dbd2964139 fix: resolve conflict 2026-01-06 16:46:20 +05:30
khushi8112
dc10ef4287 feat: allow data import for asset repair doctype
(cherry picked from commit 49f1688a51)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
2026-01-06 10:39:53 +00:00
Nishka Gosalia
3cc41cf643 fix: correct uom reflecting in sales order when fetching from barcode 2026-01-06 12:51:47 +05:30
ruthra kumar
582db48ca5 feat: add default-age-range in accounts settings (backport #51458) (#51531)
Merge pull request #51458 from aerele/default-age-range

feat: add default-age-range in accounts settings
(cherry picked from commit f8f82ccf31)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sowmya <106989392+SowmyaArunachalam@users.noreply.github.com>
2026-01-06 12:43:35 +05:30
Sowmya
0452820ab0 Merge pull request #51458 from aerele/default-age-range
feat: add default-age-range in accounts settings
(cherry picked from commit f8f82ccf31)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
2026-01-06 11:33:25 +05:30
Navin-S-R
1d58e9b91a fix(journal entry): use submission_queue to perform submit and cancel actions for rows over 100
(cherry picked from commit fa8e80c6a0)
2026-01-05 06:52:05 +00:00
ruthra kumar
7bbcafed8d Merge pull request #51489 from frappe/mergify/bp/version-15-hotfix/pr-51457
fix: add company filters to project (backport #51457)
2026-01-05 11:19:33 +05:30
SowmyaArunachalam
d6511b0045 fix: add company filters to project
(cherry picked from commit 7c16db567b)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
2026-01-05 11:12:44 +05:30
ruthra kumar
0d790a6cd5 Merge pull request #51487 from frappe/mergify/bp/version-15-hotfix/pr-51467
fix: update filters on period closing voucher (backport #51467)
2026-01-05 10:53:31 +05:30
SowmyaArunachalam
728a8b0b7d fix: update filters on period closing voucher
(cherry picked from commit 7ab1e1f677)
2026-01-05 05:20:32 +00:00
rohitwaghchaure
d8cb65e440 Merge pull request #51477 from frappe/mergify/bp/version-15-hotfix/pr-51475
fix: SABB not cancelled on cancel of Stock Reco (backport #51475)
2026-01-03 16:34:11 +05:30
Rohit Waghchaure
eebd88529f fix: SABB not cancelled on cancel of Stock Reco
(cherry picked from commit b204853193)
2026-01-03 10:47:17 +00:00
Frappe PR Bot
1740fce6c8 chore(release): Bumped to Version 15.93.2
## [15.93.2](https://github.com/frappe/erpnext/compare/v15.93.1...v15.93.2) (2026-01-03)

### Bug Fixes

* not able to submit backdated stock reco ([9ef7d45](9ef7d45486))
v15.93.2
2026-01-03 10:31:34 +00:00
rohitwaghchaure
a01dc0e205 Merge pull request #51471 from frappe/mergify/bp/version-15/pr-51470
fix: not able to submit backdated stock reco (backport #51468) (backport #51470)
2026-01-03 15:59:59 +05:30
rohitwaghchaure
1ec2cc3820 chore: fix conflicts
Removed unused on_discard method and cleaned up code.

(cherry picked from commit 46f3ab1c39)
2026-01-03 10:12:09 +00:00
Rohit Waghchaure
9ef7d45486 fix: not able to submit backdated stock reco
(cherry picked from commit cccd34b06a)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
(cherry picked from commit 4b6097914a)
2026-01-03 10:12:09 +00:00
rohitwaghchaure
02203ca534 Merge pull request #51470 from frappe/mergify/bp/version-15-hotfix/pr-51468
fix: not able to submit backdated stock reco (backport #51468)
2026-01-03 15:41:07 +05:30
rohitwaghchaure
46f3ab1c39 chore: fix conflicts
Removed unused on_discard method and cleaned up code.
2026-01-03 15:23:29 +05:30