nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,933 Commits 640 Branches 1,812 Tags
9c8fff648fd67316a3bee3510351bb28e7f06614
Commit Graph

8557 Commits

Author SHA1 Message Date
Mihir Kandoi
018f06d8d1 fix: prefetch batchwise valuations before streaming SLEs in stock ageing 
Stock Ageing iterates stock ledger entries through an unbuffered
(streaming) cursor. _get_batchwise_valuation() lazily queried
Batch.use_batchwise_valuation from inside that loop whenever a row
carried the legacy batch_no field, and the nested query invalidated
the active streaming result set — crashing the report (or silently
dropping the remaining rows, depending on the driver version).

Resolve the valuation flags in a single query before entering the
unbuffered cursor block; the lazy lookup now only serves callers that
pass stock ledger entries in directly, where no streaming is active.

Fixes https://github.com/frappe/erpnext/issues/55786

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
(cherry picked from commit 060a5c4eeb)
 2026-06-10 06:08:03 +00:00
rohitwaghchaure
01e90830f1 Merge pull request #55766 from rohitwaghchaure/fixed-github-55621-v16 
fix: Stock Reservation blocks Subcontracting operation within the same work order
 2026-06-09 20:00:20 +05:30
Rohit Waghchaure
1c0dace3d6 fix: Stock Reservation blocks Subcontracting operation within the same Work Order 2026-06-09 19:40:45 +05:30
Mihir Kandoi
e48ffe6ef0 fix: handle multi-select stock ageing filters (#55775) 2026-06-09 13:52:32 +00:00
mergify[bot]
7904385b90 fix: prevent leakage of party-derived fields in cross doctype transactions (backport #55336) (#55579) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix: prevent leakage of party-derived fields in cross doctype transactions (#55336)
 2026-06-09 18:03:26 +05:30
rohitwaghchaure
c5434e39d8 Merge pull request #55740 from rohitwaghchaure/fixed-support-67770-3-v16 
fix: validate fg and materials qty in the disassemble entry
 2026-06-08 19:30:34 +05:30
Rohit Waghchaure
4453c1072a fix: validate fg and materials qty in the disassemble entry 2026-06-08 17:42:04 +05:30
rohitwaghchaure
e6f6f2c173 Merge pull request #55735 from frappe/mergify/bp/version-16-hotfix/pr-55716 
fix: do not allow to make changes in SABB after submit (backport #55716)
 2026-06-08 16:02:51 +05:30
mergify[bot]
2ae6451f10 fix: Add authorization checks on internal functions (backport #55709) (#55726) 
* fix: Add authorization checks on internal functions (#55709)

(cherry picked from commit ba936eefab)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
#	erpnext/support/doctype/issue/issue.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-08 10:16:12 +00:00
rohitwaghchaure
5efeb2af18 chore: fix conflicts 
Removed unused import for StockReconciliationItem.
 2026-06-08 15:30:48 +05:30
Rohit Waghchaure
a03e3bfe9f fix: do not allow to make changes in SABB after submit 
(cherry picked from commit e36426e235)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
 2026-06-08 09:56:18 +00:00
Mihir Kandoi
8f85cce4cf feat: add item where used report (#55714) 2026-06-08 07:52:23 +00:00
mergify[bot]
4471666c8c fix: bypass project permission check when updating consumed material … (backport #55645) (#55707) 
* fix: bypass project permission check when updating consumed material cost

(cherry picked from commit 4b0b7adeee)

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

* chore: resolve conflicts

---------

Co-authored-by: pandiyan <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-08 07:11:04 +00:00
mergify[bot]
c6560be58d fix(stock): change valuation rate column label in stock ledger entry/report (backport #55323) (#55394) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
 2026-06-08 11:54:00 +05:30
rohitwaghchaure
7c46298fb6 chore: fix conflicts 
Removed unused import of DateTimeLikeObject from frappe.utils.data.
 2026-06-05 20:46:59 +05:30
Rohit Waghchaure
6eecf0701e fix: naming series issue 
(cherry picked from commit 3a50056968)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.py
 2026-06-05 15:14:22 +00:00
Mihir Kandoi
cfe5d07b4c [codex] Show in-transit status for add-to-transit Stock Entries (backport #55644 to version-16-hotfix) (#55658) 
[codex] Show in-transit status for add-to-transit Stock Entries (#55644)

(cherry picked from commit df03524b19)
 2026-06-05 11:32:21 +00:00
Khushi Rawat
12c1940e0b feat: item prices list view (#54853) 
* feat: add item prices tab to Item doctype

* feat: item form pricing tab

* fix: remove action button for edit item price

* fix: prevent stale item price rendering after form navigation

* fix: remove stale call to deleted edit_prices_button function

* fix: item price list fixes

* fix: show filtered price list

* fix: show filtered price list

(cherry picked from commit 5873f55cf0)
 2026-06-05 10:12:58 +00:00
Mihir Kandoi
743afc972d feat: create sales invoice from pick list (backport #55594) (#55635) 2026-06-04 17:17:26 +00:00
mergify[bot]
0274afe560 perf: batch status check for on-hold/closed documents, remove N+1 queries (backport #54798) (#55573) 
* perf: batch status check for on-hold/closed documents, remove N+1 queries (#54798)

(cherry picked from commit 5074597d00)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Shubh Doshi <124681920+shubhdoshi21@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 16:00:54 +00:00
mergify[bot]
6a503f834c fix: Add likely missing escapes (backport #55574) (#55581) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Add likely missing escaps (#55574)
 2026-06-03 15:53:43 +00:00
mergify[bot]
7de77a8916 fix(stock): add validation for work order seial nos and batch nos (backport #55604) (#55605) 
* fix(stock): add validation for work order seial nos and batch nos

(cherry picked from commit 6d3f9d3c6f)

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

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: pandiyan <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 15:50:50 +00:00
nishkagosalia
f6f542fadc fix(UX): stock settings form cleanup 
(cherry picked from commit 0b4e20ae98)
 2026-06-03 10:34:43 +00:00
nishkagosalia
7dfae51044 fix: item report view 
(cherry picked from commit bca917380d)
 2026-06-03 09:35:48 +00:00
Pandiyan P
90667b2de2 fix(stock): set stock received but not billed account for purchase (#55149) 
(cherry picked from commit c4d28a2612)
 2026-06-03 07:41:56 +00:00
mergify[bot]
fffba84868 fix(item): format integer numeric variant attributes without decimals (backport #55561) (#55564) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(item): format integer numeric variant attributes without decimals (#55561)
 2026-06-02 23:00:04 +02:00
mergify[bot]
d1b2425b2b chore(serial_and_batch_bundle): remove update_serial_or_batch method (backport #55481) (#55516) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-01 16:15:54 +00:00
khushi8112
2d554c05d6 fix: item master list view UI cleanup 
(cherry picked from commit 69ee7e93d8)
 2026-05-29 09:50:18 +00:00
mergify[bot]
faa15731cb fix(stock): get_actual_qty during cancellations (backport #55388) (#55392) 
Co-authored-by: archielister <archie.lister@lush.co.uk>
fix(stock): get_actual_qty during cancellations (#55388)
 2026-05-28 22:40:24 +05:30
nishkagosalia
b74e365421 fix: merge conflicts 2026-05-28 15:35:10 +05:30
nishkagosalia
20592fc25d fix(UX): Move title field to More Info 
(cherry picked from commit 34c24b86fa)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2026-05-28 09:39:37 +00:00
nishkagosalia
08eaaa5b83 feat: over order allowance setting 
(cherry picked from commit 355d71dbd2)
 2026-05-28 08:49:11 +00:00
mergify[bot]
8b4ad229e7 Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-55242 2026-05-27 06:18:17 +00:00
Rohit Waghchaure
356bb7878f fix: material transfer in transit issue 2026-05-27 10:29:46 +05:30
Rohit Waghchaure
67c922cdf3 fix: stock reco for legacy serial nos 
(cherry picked from commit 9d5fd11bcd)
 2026-05-26 10:29:25 +00:00
Rohit Waghchaure
bd4c24493c fix: inclusive tax amount not considered while setting LCV from purchase invoice 
(cherry picked from commit 048ddfc265)
 2026-05-26 10:15:26 +00:00
Mihir Kandoi
27db98d222 feat: allow creation of any number of variants in multiple item variant creation dialog 
(cherry picked from commit 090c25d848)
 2026-05-26 08:05:44 +00:00
Mihir Kandoi
82b0372d5b fix: single variant creation error 
(cherry picked from commit bda75135c3)
 2026-05-26 08:05:43 +00:00
mergify[bot]
ca6bcb57d3 refactor: remove unused customer field in Item DocType (backport #55277) (#55283) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-26 05:47:16 +00:00
mergify[bot]
9600ecd61c fix(stock): remove precision for valuation rate while creating sle (backport #55249) (#55260) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-05-26 10:29:39 +05:30
Rohit Waghchaure
7b6adce89a fix: fg valuation rate in repack entry when multiple FGs 
(cherry picked from commit a47e4c04f7)
 2026-05-25 06:15:29 +00:00
mergify[bot]
7752f703d2 refactor: stock ageing report (backport #55231) (#55237) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-24 18:30:45 +05:30
mergify[bot]
a1457c759d fix: consider batchwise valuation in stock ageing report (backport #54919) (#55230) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consider batchwise valuation in stock ageing report (#54919)
 2026-05-24 07:18:07 +00:00
mergify[bot]
ea863477a4 fix: invalid filter on item_group (backport #55186) (#55188) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: invalid filter on item_group (#55186)
 2026-05-22 16:49:23 +05:30
mergify[bot]
123b4ad563 fix: edit stock uom qty for purchase documents (backport #55135) (#55179) 
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
fix: edit stock uom qty for purchase documents (#55135)
 2026-05-22 09:14:32 +00:00
mergify[bot]
dfc91441b4 fix: consumed operation cost calculation (backport #54858) (#55133) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consumed operation cost calculation (#54858)
 2026-05-21 10:33:43 +00:00
Rohit Waghchaure
a7eb3acd1a fix: removed redundant code 
(cherry picked from commit 14b17cd8a6)
 2026-05-21 09:55:48 +00:00
mergify[bot]
cc438a4600 fix: item price with party condition (backport #55100) (#55107) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: item price with party condition (#55100)
 2026-05-20 20:24:56 +05:30
mergify[bot]
56a9b37fac fix(stock): remove recalculate current qty function (backport #54774) (#55075) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): remove recalculate current qty function (#54774)
 2026-05-20 14:41:55 +05:30
Rohit Waghchaure
0b3344bad9 fix: stock balance showing incorrect value because of incorrect SLE 
(cherry picked from commit 94b95d6c2f)
 2026-05-19 08:22:34 +00:00