Commit Graph

7599 Commits

Author SHA1 Message Date
mergify[bot]
1da781f2ae fix(stock entry): calculate transferred quantity using transfer_qty (backport #51656) (#51675)
* fix(stock entry): calculate transferred quantity using transfer_qty

(cherry picked from commit 4e6d86d6f0)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py

* test: allow from_warehouse while creating material request

(cherry picked from commit 7e99148357)

* test: validate transferred quantity for material transfer entry

(cherry picked from commit bf2ab32abf)

* chore: fix conflicts

---------

Co-authored-by: Navin-S-R <navin@aerele.in>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2026-01-16 10:42:01 +05:30
rohitwaghchaure
de46ac8b62 chore: fix conflicts 2026-01-15 19:27:46 +05:30
Rohit Waghchaure
6219d7d9a5 fix: Show non-SLE vouchers with GL entries in Stock vs Account Value Comparison report
(cherry picked from commit 1db9ce205f)

# Conflicts:
#	erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
2026-01-15 12:20:31 +00:00
rohitwaghchaure
eb0249310c Merge pull request #51751 from frappe/mergify/bp/version-15-hotfix/pr-51729
fix: valuation rate for non batchwise valuation (backport #51729)
2026-01-15 17:01:48 +05:30
mahsem
b3df300ea5 fix: docs_path
(cherry picked from commit 7ef8c81caf)
2026-01-14 15:59:59 +00:00
rohitwaghchaure
0a363f879d chore: fix conflicts
Removed multiple test cases related to purchase receipts and negative stock handling.
2026-01-14 19:43:39 +05:30
Rohit Waghchaure
3008c7ad82 fix: valuation rate for non batchwise valuation
(cherry picked from commit b6312bca9c)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
2026-01-14 14:06:35 +00:00
Mihir Kandoi
f9be364bd1 fix: pick list qty does not reset when pick list is cancelled
(cherry picked from commit 1d6d9c2040)
2026-01-10 12:44:16 +00:00
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
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
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
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
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
kavin-114
d3f2da0d59 fix: remove posting date & time on SRE batch validation 2026-01-07 01:00:29 +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
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
rohitwaghchaure
46f3ab1c39 chore: fix conflicts
Removed unused on_discard method and cleaned up code.
2026-01-03 15:23:29 +05:30
Rohit Waghchaure
4b6097914a fix: not able to submit backdated stock reco
(cherry picked from commit cccd34b06a)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
2026-01-03 09:52:09 +00:00
Rohit Waghchaure
2d49cc9ab2 fix: precision issue causing reservation error 2025-12-31 13:29:08 +05:30
rohitwaghchaure
5955b699c3 Merge pull request #51394 from frappe/mergify/bp/version-15-hotfix/pr-51375
fix(stock): prevent excess stock reservation (backport #51375)
2025-12-31 11:09:14 +05:30
Sudharsanan11
6f1cfdb1de fix(stock): remove item image to avoid setting the image of previous item
(cherry picked from commit 69e94248c1)
2025-12-30 11:21:11 +00:00
Sudharsanan11
4d31012df2 fix(stock): prevent excess stock reservation
(cherry picked from commit e1f9adf4e9)
2025-12-30 11:20:11 +00:00
khushi8112
6f3904a20a fix: expense_account query override in Purchase Receipt
(cherry picked from commit 292a51c160)
2025-12-30 07:27:01 +00:00
Rohit Waghchaure
24f6f1e434 fix: prevent reuse of serial no in manufacture and repack entry
(cherry picked from commit 48b537dc8c)
2025-12-28 04:57:30 +00:00
Sudharsanan11
d9888d5195 fix(stock): remove total bar in chart view
(cherry picked from commit 7df349844a)
2025-12-26 16:19:50 +00:00
Rohit Waghchaure
507a561922 perf: composite index for serial no
(cherry picked from commit 734d553338)
2025-12-25 03:40:05 +00:00
Abdeali Chharchhoda
fd718833b1 refactor: optimize picked quantity updates using bulk_update
(cherry picked from commit 5f986e4032)
2025-12-24 16:06:19 +00:00
rohitwaghchaure
35ae839ab7 chore: fix conflicts 2025-12-24 15:06:48 +05:30
Rohit Waghchaure
4753594a26 perf: index for warehouse field
(cherry picked from commit 23c70332df)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.json
2025-12-24 09:29:33 +00:00
Mihir Kandoi
d3f434b803 Merge pull request #51177 from aerele/fix/disassemble-serial-and-batch-bundle 2025-12-23 21:07:32 +05:30
SowmyaArunachalam
fe80d1d0e7 feat: add redirect button on report
(cherry picked from commit c0ac5f94b5)
2025-12-23 15:16:40 +00:00
Mihir Kandoi
5e7b674ee4 Merge pull request #51250 from frappe/mergify/bp/version-15-hotfix/pr-51215
fix: de-duplicate rows on disassembly with multiple manufacture entries (backport #51215)
2025-12-23 20:28:37 +05:30
Rohit Waghchaure
8a01a709a7 fix: use stock adjustment if the account has not set
(cherry picked from commit 9bbcbe0ac3)
2025-12-23 11:38:10 +00:00
Smit Vora
f0aefa4274 chore: v15 compatible get-all query 2025-12-23 16:22:06 +05:30
rohitwaghchaure
8f52f14505 chore: fix conflicts
Refactor based_on retrieval method and remove unused fields.
2025-12-22 18:04:47 +05:30
Rohit Waghchaure
425dcee5bf fix: limit condition to fetch serial nos
(cherry picked from commit da4b78491d)

# Conflicts:
#	erpnext/stock/get_item_details.py
2025-12-22 12:16:04 +00:00
rohitwaghchaure
c095938e69 chore: fix linters issue
(cherry picked from commit e9c37642c8)
2025-12-22 11:12:50 +00:00
rohitwaghchaure
aefde87a0c chore: fix test case
(cherry picked from commit d191b80587)
2025-12-22 11:12:50 +00:00
rohitwaghchaure
c89fe9f1ca Revert "fix: performance of the reposting"
(cherry picked from commit 280558efa2)
2025-12-22 11:12:50 +00:00
rohitwaghchaure
5200739d7b Merge pull request #51247 from frappe/mergify/bp/version-15-hotfix/pr-51244
fix: same serial number was picked in multiple sales invoices (backport #51244)
2025-12-22 13:07:47 +05:30
rohitwaghchaure
73643de612 fix: added limit 2025-12-22 12:02:38 +05:30
Smit Vora
72d77a5e99 fix: support disassemble of RMs other than in BOM
(cherry picked from commit ce123f1a89)
2025-12-22 06:09:07 +00:00
Smit Vora
dd19b95113 fix: don't fetch qty as it's unused
(cherry picked from commit df13308663)
2025-12-22 06:09:07 +00:00
Smit Vora
68eeba41c1 fix: de-duplicate rows on disassembly with multiple manufacture entries
(cherry picked from commit a091e47bd7)
2025-12-22 06:09:06 +00:00
rohitwaghchaure
c77c426652 chore: fix conflicts
Removed logic for handling reserved serial numbers in sales invoices.
2025-12-22 11:37:19 +05:30
Rohit Waghchaure
dc5faa8b71 fix: same serial number was picked in multiple sales invoices
(cherry picked from commit 61c31f0cd0)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
2025-12-22 04:09:59 +00:00
Pugazhendhi Velu
26a36d807e fix(stock-report): ignore reserved stock in batch qty calculation
(cherry picked from commit 9a1f551e53)
2025-12-21 16:57:51 +00:00