Commit Graph

58461 Commits

Author SHA1 Message Date
Mihir Kandoi
56bbca0203 fix: allow delivery when a batch is reserved across multiple sales orders (backport #57169)
validate_reserved_batches compared the voucher's own qty against the
remaining batch qty, so delivering one order's reserved unit threw
Reserved Batch Conflict whenever the remainder exactly matched another
order's reservation. Compare the remaining batch qty against the
aggregated outstanding reserved qty (qty - delivered_qty) of other
vouchers instead, excluding reservations the voucher itself delivers.
2026-07-15 12:00:02 +05:30
Mihir Kandoi
478719b828 Merge pull request #57173 from frappe/mergify/bp/version-16-hotfix/pr-57137
feat: add on hold status to project (backport #57137)
2026-07-15 11:29:14 +05:30
Poovitha Palanivelu
57a49ce168 feat: add on hold status to project
(cherry picked from commit 672fadaa78)
2026-07-15 05:47:16 +00:00
Mihir Kandoi
6d47c51c5b Merge pull request #57166 from frappe/mergify/bp/version-16-hotfix/pr-57163
fix: hide job card field in purchase order item (backport #57163)
2026-07-15 11:03:06 +05:30
Mihir Kandoi
6ab1668b37 Merge pull request #57168 from frappe/mergify/bp/version-16-hotfix/pr-57164
fix: set correct currency in supplier quotation net rate field (backport #57164)
2026-07-15 10:58:18 +05:30
Mihir Kandoi
b256c76c3b chore: resolve conflicts 2026-07-15 10:48:51 +05:30
Mihir Kandoi
e24ef847dc fix: set correct currency in supplier quotation net rate field
(cherry picked from commit 27672851cd)
2026-07-15 05:17:11 +00:00
Mihir Kandoi
20f6ac81b9 fix: hide job card field in purchase order item
(cherry picked from commit f44bcae47d)

# Conflicts:
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
2026-07-15 05:13:39 +00:00
Mihir Kandoi
b1ca9c26cb Merge pull request #57136 from frappe/mergify/bp/version-16-hotfix/pr-57129
fix: prevent duplicate material request items in purchase order (backport #57129)
2026-07-14 16:43:09 +05:30
Mihir Kandoi
4d931a7108 test: remove test
(cherry picked from commit b2ec906ff3)
2026-07-14 11:01:57 +00:00
SandraFrappe
4d951c1cf8 fix: prevent duplicate material request items in purchase order
(cherry picked from commit 2d6f89a7f5)
2026-07-14 11:01:57 +00:00
Mihir Kandoi
3a38316c26 Merge pull request #57126 from aerele/fix/job-card-work-order-transferred-qty-v16
fix(manufacturing): preserve job card transferred quantity
2026-07-14 13:40:29 +05:30
Sudharsanan11
fd6c9a71cd test(manufacturing): cover transferred quantity across job cards 2026-07-14 13:23:49 +05:30
Sudharsanan11
d7e9321746 fix(manufacturing): preserve job card transferred quantity 2026-07-14 13:23:28 +05:30
mergify[bot]
e8a532587d fix(accounts): added permission checks on get_account_balances_coa (backport #57107) (#57122)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
2026-07-14 13:07:12 +05:30
Mihir Kandoi
8d7fe755e3 Merge pull request #57118 from frappe/mergify/bp/version-16-hotfix/pr-57116
fix(stock): fix sqlparse token limit in get_bundle_wise_serial_nos (backport #57116)
2026-07-14 12:33:43 +05:30
Khushi Rawat
2947f030e8 Merge pull request #57119 from frappe/mergify/bp/version-16-hotfix/pr-57111
chore: remove dead assets dashboard_fixtures with broken imports (backport #57111)
2026-07-14 12:14:47 +05:30
Afsal Syed
cec1e87c90 test(stock): add unit test for get_bundle_wise_serial_nos query
(cherry picked from commit e748bf512b)
2026-07-14 12:13:42 +05:30
khushi8112
345c508be7 chore: remove dead assets dashboard_fixtures with broken imports (#57079)
erpnext.accounts.dashboard_fixtures and erpnext.buying.dashboard_fixtures
were removed in 2020 when dashboards were exported to JSON fixtures.
The assets module's dashboard_fixtures.py was left behind unreferenced;
its dashboard, charts and number cards already exist as exported JSON.

(cherry picked from commit 14a15cc6f9)
2026-07-14 06:23:40 +00:00
Afsal Syed
5a99dd6016 fix(stock): fix sqlparse token limit in get_bundle_wise_serial_nos
(cherry picked from commit 4544a6c935)
2026-07-14 06:00:14 +00:00
Mihir Kandoi
3b7467daab Merge pull request #57113 from PranavDarade/fix/transfer-reservation-stock-uom
fix(stock): set stock_uom on transferred Stock Reservation Entries
2026-07-14 10:14:59 +05:30
Khushi Rawat
db737da22e Merge pull request #57077 from frappe/mergify/bp/version-16-hotfix/pr-55276
fix(asset): allow asset repair creation for fully depreciated assets (backport #55276)
2026-07-14 00:24:20 +05:30
Khushi Rawat
138a44e450 Merge pull request #56966 from frappe/mergify/bp/version-16-hotfix/pr-56964
fix: match depreciation schedule rows at currency precision to avoid duplicate JEs (backport #56964)
2026-07-14 00:09:32 +05:30
Diptanil Saha
40c85a0087 fix(tnc): get_terms_and_conditions render_template with safe_exec (backport #56944) (#56977) 2026-07-13 23:22:55 +05:30
Mihir Kandoi
4f59e57151 Merge pull request #57105 from frappe/mergify/bp/version-16-hotfix/pr-57091
fix(stock): show qty (company) and qty (warehouse) in sales transactions  (backport #57091)
2026-07-13 21:27:54 +05:30
Mihir Kandoi
0447a18217 Merge pull request #57103 from frappe/mergify/bp/version-16-hotfix/pr-57089
fix: allow barcode scan to add and increment items in pick list (backport #57089)
2026-07-13 21:27:40 +05:30
PranavDarade
5991ecfa3d 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.
2026-07-13 21:21:03 +05:30
Sudharsanan11
77cca4464d 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.

(cherry picked from commit 4e5e1f6596)
2026-07-13 15:34:10 +00:00
Sudharsanan11
0d9ace7ab8 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.

(cherry picked from commit ab30bab6cb)
2026-07-13 15:34:09 +00:00
pandiyan
00a646ac25 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

(cherry picked from commit 3ece4a615d)
2026-07-13 15:33:11 +00:00
ruthra kumar
aa1d50a914 Merge pull request #57100 from frappe/mergify/bp/version-16-hotfix/pr-56706
refactor: rename synced to snapshot report (backport #56706)
2026-07-13 20:02:49 +05:30
ruthra kumar
c03d115999 refactor: rename feature toggle in report master
(cherry picked from commit 981e90e4da)
2026-07-13 13:17:01 +00:00
ruthra kumar
97a7a2d6bc refactor: rename execute_synced_report to execute_snapshot_report
Match the framework rename of the standard report entry point in the
trial balance, P&L, balance sheet, and general ledger reports.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit ba7b6a47c5)
2026-07-13 13:17:01 +00:00
ruthra kumar
d784b9a7be Merge pull request #57098 from frappe/mergify/bp/version-16-hotfix/pr-56304
feat: faster (synced) financial statements using duckdb (backport #56304)
2026-07-13 18:08:15 +05:30
ruthra kumar
88b7a38be4 refactor: synced reports should be enabled on sites based on requirements
(cherry picked from commit 963bbc8729)
2026-07-13 12:16:28 +00:00
ruthra kumar
21ddb00e20 feat(profit-and-loss): implement execute_synced_report with full parity to normal report
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6a93baacf0)
2026-07-13 12:16:28 +00:00
ruthra kumar
636bcbedc0 feat(balance-sheet): implement execute_synced_report with full parity to normal report
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit bb19540816)
2026-07-13 12:16:27 +00:00
ruthra kumar
19ec095ff8 feat(general-ledger): implement execute_synced_report with full parity to normal report
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6b4895bcc9)
2026-07-13 12:16:27 +00:00
ruthra kumar
2f6ef7b2ec refactor: DB agnostic method names
(cherry picked from commit f40cd41801)
2026-07-13 12:16:26 +00:00
ruthra kumar
d41b9f11ff refactor: maintain sync dependency in report master
(cherry picked from commit 5c536b8ad1)
2026-07-13 12:16:25 +00:00
ruthra kumar
98a65f7529 refactor(trial-balance): execute_duckdb only reads GL Entry from duckdb
Replaces the previous over-engineered stub with 7 short functions.
Account data, Account Closing Balance, and all metadata come from
frappe.db as normal; only tabGL Entry is read from the duckdb_conn.

Reuses get_opening_balance() for Account Closing Balance unchanged,
reuses all downstream compute helpers (calculate_values, prepare_data,
etc.) unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 55862f98f4)
2026-07-13 12:16:24 +00:00
ruthra kumar
228418b05f feat(trial-balance): implement execute_duckdb with full parity to normal report
Replaces the placeholder stub with 8 focused functions that mirror the
normal execute() flow using parameterized DuckDB SQL queries: account
fetch, period GL entries, opening balances (with Period Closing Voucher
path), and all filters (cost center, project, finance book, accounting
dimensions). Reuses existing pure-Python processing functions unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit b1c8e2cb5c)
2026-07-13 12:16:24 +00:00
ruthra kumar
08e267271e refactor: reports on duckdb
(cherry picked from commit adb768505a)
2026-07-13 12:16:23 +00:00
mergify[bot]
bf1b7f2bea feat: weekly auto-repost of incorrect stock valuation entries (backport #56637) (#56700)
* feat: weekly auto-repost of incorrect stock valuation entries (#56637)

(cherry picked from commit adae0bd732)

# Conflicts:
#	erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py

* chore: fix conflicts

Removed merge conflict markers and cleaned up code.

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2026-07-13 10:11:12 +00:00
ruthra kumar
6bd903e45a Merge pull request #57085 from frappe/mergify/bp/version-16-hotfix/pr-56817
feat: restructure Philippines chart of accounts with amortization sup… (backport #56817)
2026-07-13 13:08:42 +05:30
ruthra kumar
5281d538ce Merge pull request #56817 from Soham-ambibuzz/philipinnes_localization_coa_v3
feat: restructure Philippines chart of accounts with amortization sup…
(cherry picked from commit 33abc53d7a)
2026-07-13 07:28:54 +00:00
ruthra kumar
5261566b41 Merge pull request #57081 from frappe/mergify/bp/version-16-hotfix/pr-56902
fix(budget-variance): correct month shift in comparison chart (backport #56902)
2026-07-13 12:55:57 +05:30
ruthra kumar
5bbb71ef76 Merge pull request #57083 from frappe/mergify/bp/version-16-hotfix/pr-56628
fix(journal-entry): fetch outstanding on foreign currency (backport #56628)
2026-07-13 12:50:49 +05:30
Ejaaz Khan
d453781374 Merge pull request #57080 from frappe/mergify/bp/version-16-hotfix/pr-57071
fix: guard company logo lookup in default letterheads (backport #57071)
2026-07-13 12:40:06 +05:30
SowmyaArunachalam
ec782ee20d fix(journal-entry): fetch outstanding on foreign currency
(cherry picked from commit 07f641c48c)
2026-07-13 07:07:59 +00:00