Commit Graph

60141 Commits

Author SHA1 Message Date
PranavDarade
e321e95e59 fix(stock): set stock_uom on transferred Stock Reservation Entries
StockReservation.transfer_reservation_entries_to() created the transferred SREs without copying stock_uom, in both the entries_to_reserve dict and the extra-items fallback. get_items_to_reserve() already selects the item's stock_uom, so entry.stock_uom is used.

On sites with a global default stock_uom (e.g. "Nos"), frappe's _set_defaults() backfilled the blank field, so the transfer silently stored the wrong UOM for any item whose stock UOM is not the default. On sites without that default the SRE's validate_mandatory() raised "Stock UOM is required", aborting Work Order submission for the Subcontracting Inward Order / Production Plan flows.

(cherry picked from commit 5991ecfa3d)
2026-07-14 11:27:07 +05:30
Mihir Kandoi
336970aa5a Merge pull request #57115 from mihir-kandoi/fix/supplier-scorecard-month-end-idempotency
fix: duplicate scorecard period when supplier is created on a month end
2026-07-14 10:55:59 +05:30
Mihir Kandoi
3aafda331b fix: duplicate scorecard period when supplier is created on a month end
make_all_scorecards' dedup query used strict bounds, so a single-day
period (supplier created on a month's last day -> start == end under
"Per Month") never matched its own window and was re-created on every
call. The daily refresh_scorecards job would insert a duplicate
submitted period each day for such suppliers, and
test_make_all_scorecards_is_idempotent fails on any date where
nowdate() - 75 days lands on a month end — both nightly server suites
went red on 2026-07-14 (75 days after April 30).

Inclusive bounds cannot false-match adjacent periods: each next period
starts at end_date + 1, so closed intervals never touch.
2026-07-14 10:20:41 +05:30
Mihir Kandoi
39b5c6ba2a Merge pull request #57101 from aerele/fix/job-card-work-order-transferred-qty
fix(manufacturing): preserve job card transferred quantity
2026-07-13 21:06:28 +05:30
Mihir Kandoi
3dba2d23b8 Merge pull request #57099 from aerele/fix-stock-entry-bom-query-redundancy
perf: avoid redundant bom cost_allocation_per query per finished item…
2026-07-13 21:05:13 +05:30
Mihir Kandoi
b23224b3d6 Merge pull request #57091 from aerele/fix/so-qty-company-warehouse
fix(stock): show qty (company) and qty (warehouse) in sales transactions
2026-07-13 21:03:07 +05:30
Mihir Kandoi
c0147e5a2e Merge pull request #57089 from aerele/fix-pick-list-barcode-scan-max-qty
fix: allow barcode scan to add and increment items in pick list
2026-07-13 21:02:08 +05:30
Sudharsanan11
51f9b70bfa test(manufacturing): cover transferred quantity across job cards 2026-07-13 19:40:20 +05:30
Sudharsanan11
951e432a1b fix(manufacturing): preserve job card transferred quantity 2026-07-13 19:40:20 +05:30
pandiyan
feb750f082 perf: avoid redundant bom cost_allocation_per query per finished item row in stock entry 2026-07-13 18:29:23 +05:30
Diptanil Saha
9c353741ad fix(tnc): using get_cached_doc to retrieve template for get_terms_and_conditions and permission checks (#57096) 2026-07-13 11:24:56 +00:00
Sudharsanan11
4e5e1f6596 test(stock): assert qty (company) and qty (warehouse) on item details
covers sales order, quotation, sales invoice, delivery note and
purchase order, asserting actual_qty from the row warehouse and
company_total_stock across all warehouses of the company.
2026-07-13 14:37:23 +05:30
Sudharsanan11
ab30bab6cb fix(stock): show qty (company) and qty (warehouse) in sales transactions
company was passed to get_bin_details only for purchase order, so
company_total_stock was never returned for sales order, quotation,
sales invoice and delivery note and the qty (company) column always
read zero. pass ctx.company for every doctype, which also drops the
dependency on doc being supplied.

on the client, set_actual_qty copied only actual_qty out of the
response, so qty (company) never refreshed on a warehouse change. use
frm.call with child so every bin field is applied, pass
include_child_warehouses to match the server, and include quotation.
2026-07-13 14:37:23 +05:30
pandiyan
3ece4a615d fix: allow barcode scan to add and increment items in pick list
- allow new rows on scan when pick manually is enabled, since only
  then are scanned rows not subject to being overridden by
  set_item_locations on save
- stop capping picked qty at the default demand qty (1) for rows
  added by the scanner itself, so repeat scans of the same barcode
  keep incrementing the row instead of failing with "maximum
  quantity scanned"
- ignore barcode uom when matching an existing row if new rows
  aren't allowed, since there's no alternate-uom row to fall back to
2026-07-13 13:54:54 +05:30
ruthra kumar
33abc53d7a Merge pull request #56817 from Soham-ambibuzz/philipinnes_localization_coa_v3
feat: restructure Philippines chart of accounts with amortization sup…
2026-07-13 12:56:31 +05:30
ruthra kumar
47341ff55c Merge pull request #56628 from aerele/multi-currency
fix(journal-entry): fetch outstanding on foreign currency
2026-07-13 12:35:15 +05:30
ruthra kumar
7144e5b29a Merge pull request #56458 from Shllokkk/psoa-restrict-jinja-globals
fix: restrict jinja globals in process statement of accounts templates
2026-07-13 12:34:04 +05:30
ruthra kumar
f0326aa6cf Merge pull request #56902 from frappe/fix-budget-variance-chart-month-shift
fix(budget-variance): correct month shift in comparison chart
2026-07-13 12:31:27 +05:30
Khushi Rawat
2580601937 Merge pull request #57071 from iamejaaz/fix-letterhead-company-guard
fix: guard company logo lookup in default letterheads
2026-07-13 11:58:31 +05:30
Khushi Rawat
14dac6ecc4 Merge pull request #55276 from aerele/fix/asset-repair-fully-depreciated
fix(asset): allow asset repair creation for fully depreciated assets
2026-07-13 02:09:13 +05:30
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
Ejaaz Khan
e39ca72997 fix: set explicit table and logo widths in grey letterhead 2026-07-12 22:03:32 +05:30
Ejaaz Khan
23c09fe0f3 fix: guard company logo lookup in default letterheads 2026-07-12 21:17:42 +05:30
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