Commit Graph

60115 Commits

Author SHA1 Message Date
Mihir Kandoi
e8a61ecfbb Merge pull request #57073 from mihir-kandoi/gh57072
fix: make represents company field in purchase invoice ignore user pe…
2026-07-13 00:08:24 +05:30
Mihir Kandoi
6729a53fee fix: make represents company field in purchase invoice ignore user permissions 2026-07-12 23:56:23 +05:30
MochaMind
612a3f20d8 chore: update POT file (#57067) 2026-07-12 20:25:54 +02:00
Nabin Hait
7928608b0f Merge pull request #56973 from nabinhait/refactor-stock-gl-composer
refactor(stock): de-conditionalize BaseStockGLComposer via subclass hooks
2026-07-12 20:32:49 +05:30
Mihir Kandoi
4a160c10f8 Merge pull request #57070 from mihir-kandoi/fix-dimension-search-check-field
fix: accounting dimension search matching unrelated records
2026-07-12 20:26:26 +05:30
Mihir Kandoi
38e8c3b1fe fix: accounting dimension search matching unrelated records
#56871 routed any searchfield without a DocField meta — including
"name", which get_search_fields() always appends — into the
`= cint(txt)` branch. For non-numeric search text cint() yields 0, so
`is_group = 0` (Cost Center) matched every leaf record on both
engines, and `name = 0` matched every non-numeric name on MariaDB.

Skip Check fields from or_filters entirely — a checkbox can't match
search text — and keep LIKE for everything else, including "name".
2026-07-12 18:37:51 +05:30
Mihir Kandoi
8db4f82af5 Merge pull request #57069 from mihir-kandoi/fix-job-card-pick-list-project
fix(stock): propagate project from job card to stock entry
2026-07-12 17:51:26 +05:30
Mihir Kandoi
72492f5da2 fix(stock): propagate project from job card to stock entry 2026-07-12 17:32:30 +05:30
mergify[bot]
45102e12cc feat: explain FIFO allocation of fixed Discount Amount on Sales Order (backport #56436) (#57062)
* feat: explain FIFO allocation of fixed Discount Amount on Sales Order (#56436)

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
(cherry picked from commit 62fed1d562)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json

* chore: resolved conflicts

---------

Co-authored-by: Mohammad Umair Sayed <umair_sayyed@yahoo.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
2026-07-11 17:57:49 +00:00
Raghav Ruia
b96d6e2a93 fix: remove incorrect Payable account_type from Customer Deposits in Philippines CoA (#57018) 2026-07-11 23:09:14 +05:30
Pandiyan P
ad17efe243 fix(accounts): retain invoice table on opening invoice creation error (#56353)
Co-authored-by: diptanilsaha <diptanil@frappe.io>
2026-07-11 13:17:28 +00:00
Pandiyan P
0524a235d7 fix: update events order by date asc (#56963)
Co-authored-by: nareshkannasln <nareshkannashanmugam@gmail.com>
2026-07-11 18:24:49 +05:30
Nikhil Kothari
d449ad3b3f fix(banking): allow negative balance in bank statement import (#56959) 2026-07-11 12:28:03 +00:00
Vishnu Priya Baskaran
9b66382463 fix(financial_statement): render columnar financial statements instea… (#56921) 2026-07-11 16:09:26 +05:30
Vishnu Priya Baskaran
a721ad3948 fix(payment reconciliation): read user permissions from current session user (#56782) 2026-07-11 16:08:27 +05:30
Vishnu Priya Baskaran
199eeff22c fix: map stock_qty in apply_price_list_on_item (#56869) 2026-07-11 15:03:49 +05:30
Nabin Hait
df60d61402 Merge branch 'develop' into refactor-stock-gl-composer 2026-07-11 14:28:52 +05:30
Nabin Hait
0264202b42 Merge pull request #56978 from nabinhait/refactor-ac-services
refactor(accounts): extract deferred-accounting and document-schedule from AccountsController
2026-07-11 14:28:16 +05:30
MochaMind
4b6860de62 fix: sync translations from crowdin (#57010)
* fix: Swedish translations

* fix: Bosnian translations
2026-07-11 00:33:45 +02:00
Shllokkk
3cabf13abe Merge pull request #57045 from Shllokkk/work-order-mapper-method-path
fix: use correct mapper path for make_work_orders call
2026-07-10 21:01:06 +05:30
Shllokkk
394c9d80f9 fix: use correct mapper path for make_work_orders call 2026-07-10 20:59:08 +05:30
Mihir Kandoi
ad9430d17e Merge pull request #57035 from aerele/perf-bom-default-accounts-lookup
perf(bom): batch default account/cost-center/warehouse lookups in bom…
2026-07-10 17:15:01 +05:30
Vishnu Priya Baskaran
a30f72dae1 fix: fetch payment entry reference amounts from invoice (#56928) 2026-07-10 17:01:49 +05:30
Mihir Kandoi
51d7bf64a8 Merge pull request #57031 from mihir-kandoi/fix-job-card-pick-list-transfer
fix(stock): link job card in stock entry created from pick list
2026-07-10 16:54:31 +05:30
Mihir Kandoi
bf4e1a3ae0 Merge pull request #57033 from aerele/perf-bom-raw-material-warehouse-lookup
perf(stock): avoid n+1 queries for work order item source warehouse
2026-07-10 16:37:44 +05:30
Mihir Kandoi
2c03894e00 fix(stock): batch job card item lookup and honour semi_fg_bom
Fetch job_card_item for all pick list locations in one query instead
of one per row, and prefer the job card's semi_fg_bom over the work
order BOM, mirroring the direct Job Card -> Stock Entry mapper.
2026-07-10 16:36:44 +05:30
pandiyan
e88e63976a perf(bom): batch default account/cost-center/warehouse lookups in bom explosion 2026-07-10 16:35:43 +05:30
pandiyan
3e4d5e6745 perf(stock): avoid n+1 queries for work order item source warehouse
hoist the invariant work order lookup and batch-fetch work order item
source warehouses once instead of querying per raw material row in
get_bom_raw_materials
2026-07-10 16:03:18 +05:30
Mihir Kandoi
bdbb8481b0 fix(stock): link job card in stock entry created from pick list
A Stock Entry created from a Pick List against a job card's Material
Request never set job_card, job_card_item, fg_completed_qty or the
'Material Transfer for Manufacture' purpose, so the Job Card did not
recognize the transfer and blocked submission. The WIP warehouse was
also not populated.

Route such pick lists through a job-card-aware branch mirroring the
direct Material Request -> Stock Entry mapper, and set the purpose to
'Material Transfer for Manufacture' in the work order branch so the
WO -> MR -> Pick List flow updates the work order too.
2026-07-10 15:20:28 +05:30
ruthra kumar
4aabe3347f Merge pull request #56801 from ruthra-kumar/reversing_exchange_rate_revaluation
refactor: reversing exchange rate revaluation journals
2026-07-10 11:49:41 +05:30
Sudharsanan Ashok
9cb6610b9e fix(stock): correct stock ageing value for moving average and lifo items (#56693)
* fix(stock): recompute moving average item slots

* test(stock): add test to validate the stock value of moving average items

* fix(stock): support lifo valuation in stock ageing report

lifo items were aged as fifo (oldest consumed first), so the report kept the
newest lots on hand and reported the wrong stock value and average age. prefetch
each item's valuation method (it can't be resolved mid-stream without breaking the
unbuffered cursor) and consume from the tail for lifo items. also reuse that shared
lookup in the moving average revaluation pass. scoped to plain items; batch, serial
and same-voucher repack legs stay on fifo.

* test(stock): add test for lifo consumption in stock ageing report
2026-07-10 11:34:47 +05:30
ruthra kumar
65775e59a1 refactor(test): for reverse journals as well 2026-07-10 11:34:30 +05:30
ruthra kumar
6838242063 refactor: handle reverse ERR journals in AR / AP report 2026-07-10 10:38:54 +05:30
ruthra kumar
a0b14c0607 refactor: reversal capability on exchange rate revaluation 2026-07-10 10:38:52 +05:30
ruthra kumar
6a4c5b6062 refactor: add payment ledger to ignore link 2026-07-10 08:27:28 +05:30
Vishnu Priya Baskaran
38da3fc76e fix: display outstanding amount using company default currency (#56785)
Co-authored-by: S Sakthivel Murugan <s.sakthivelmurugan2003@gmail.com>
2026-07-10 00:57:20 +05:30
Mihir Kandoi
271f8cf1ca Merge pull request #56948 from aerele/feat/production-plan-group-rm-warehouse
feat(manufacturing): allow group warehouse for raw material availability in production plan
2026-07-09 20:52:18 +05:30
Mihir Kandoi
1eed00f5d4 Merge pull request #56428 from raghavisruia/item-allow-negative-stock-confirmation
feat: confirmation dialog when enabling negative stock on Item
2026-07-09 20:52:03 +05:30
Mihir Kandoi
4fbb20fbd9 Merge pull request #56255 from akhtarmohsin/fix-variant-of-filter-item-list
Fix Variant Of filter to show only template items
2026-07-09 20:41:54 +05:30
Mihir Kandoi
8583f0ba05 Merge pull request #56979 from harisansari008/fix/bom-routing-update-operations
fix: update BOM operations when routing is changed
2026-07-09 20:41:12 +05:30
Mihir Kandoi
1b6d3ee870 Merge pull request #56561 from aerele/fix/report-currency
fix: use company currency instead of global default in report
2026-07-09 20:38:55 +05:30
Sudharsanan11
2247ef9a50 test(manufacturing): add production plan group warehouse tests
verify child-stock aggregation, transfer sourcing from child warehouses,
that a for warehouse outside the group is rejected, and that a for
warehouse is required when raw materials are fetched.
2026-07-09 20:37:04 +05:30
Sudharsanan11
0574a0d95e feat(manufacturing): allow group warehouse for raw material availability in production plan
add an optional raw material group warehouse on production plan. when set,
raw material availability is checked across its child warehouses (bin rows
aggregated), while material is still received into for warehouse. for
warehouse is restricted to a child of the group and required when raw
materials are fetched; a group warehouse can never reach a material request
line. when the group is left blank, availability falls back to for warehouse
and the previous flow.
2026-07-09 20:37:04 +05:30
Sudharsanan11
b625525b03 fix(manufacturing): accept plain dict for doc in get_items_for_material_requests
the whitelisted endpoint typed doc as str | frappe._dict | Document, so a
json request body (a plain dict) failed pydantic type validation. widen to
str | dict | Document, matching the convention used elsewhere in erpnext.
2026-07-09 20:37:04 +05:30
Mihir Kandoi
87e7e53a6a Merge pull request #56932 from aerele/fix/work-order-planned-date-validation
fix: validate planned end date is not before planned start date in wo…
2026-07-09 20:34:57 +05:30
Mihir Kandoi
97533812e7 Merge pull request #56925 from aerele/fix/batch-bin-lookup-delivery-note
perf: batch bin lookups in delivery note stock update
2026-07-09 20:34:37 +05:30
Mihir Kandoi
508f03a73e Merge pull request #56923 from aerele/fix/reorder-item-warehouse-lookup-perf
perf: avoid per-row Warehouse doc fetches in auto reorder job
2026-07-09 20:33:56 +05:30
Mihir Kandoi
8dd56ecba5 Merge pull request #56913 from aerele/fix/trend-report-column-translations
fix: make trend report based-on and group-by column labels translatable
2026-07-09 20:33:13 +05:30
Mihir Kandoi
d6682703fb Merge pull request #56909 from aerele/fix/sync-variant-item-code-on-abbr-rename
fix(stock): rename variant item_code/item_name when attribute abbreviation changes
2026-07-09 20:32:50 +05:30
Mihir Kandoi
015fb61b10 Merge pull request #56984 from aerele/fix/apply-price-list-doc-dict
fix(stock): repair client calls broken by type-hint and module refactors
2026-07-09 20:31:24 +05:30