nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,465 Commits 622 Branches 1,804 Tags
f3e1b3fca7e96e93ace7aed0f3a5099e547d8d24
Commit Graph

12906 Commits

Author SHA1 Message Date
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
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
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
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
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
SowmyaArunachalam
ec782ee20d fix(journal-entry): fetch outstanding on foreign currency 
(cherry picked from commit 07f641c48c)
 2026-07-13 07:07:59 +00:00
Mohd Haris
703e9a728c fix(budget-variance): correct month shift in comparison chart 
The Budget Variance Report chart plotted the actual expense one month
earlier than the table (e.g. July actual shown under June).

build_comparison_chart_data() collected budget columns using
fieldname.startswith("budget_"). The dimension column "budget_against"
also matches that prefix, so it was added as an extra leading entry to
budget_fields and labels, while actual_fields had no such leading entry.
This shifted every actual value one position ahead of its label.

Skip the "budget_against" dimension column so budget/actual values and
labels stay aligned per month.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit 48418eadb0)
 2026-07-13 07:02:18 +00:00
Ejaaz Khan
0d80fef3bf fix: set explicit table and logo widths in grey letterhead 
(cherry picked from commit e39ca72997)
 2026-07-13 06:29:01 +00:00
Ejaaz Khan
7b543142a2 fix: guard company logo lookup in default letterheads 
(cherry picked from commit 23c09fe0f3)
 2026-07-13 06:29:01 +00:00
Mihir Kandoi
90768c42d8 Merge pull request #57075 from frappe/mergify/bp/version-16-hotfix/pr-57073 2026-07-13 10:46:36 +05:30
ruthra kumar
fd3bebee02 Merge pull request #57023 from frappe/mergify/bp/version-16-hotfix/pr-56801 
refactor: reversing exchange rate revaluation journals (backport #56801)
 2026-07-13 10:13:57 +05:30
ruthra kumar
431ae6bc93 chore: resolve conflict 2026-07-13 10:02:18 +05:30
Khushi Rawat
9d6f15acd4 Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-56964 2026-07-13 02:10:42 +05:30
Mihir Kandoi
4aed77df0c fix: make represents company field in purchase invoice ignore user permissions 
(cherry picked from commit 6729a53fee)
 2026-07-12 18:39:28 +00:00
mergify[bot]
4136ca55a7 fix(accounts): retain invoice table on opening invoice creation error (backport #56353) (#57058) 
* fix(accounts): retain invoice table on opening invoice creation error (#56353)

Co-authored-by: diptanilsaha <diptanil@frappe.io>
(cherry picked from commit ad17efe243)

# Conflicts:
#	erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

* chore: resolve conflicts

---------

Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-07-12 07:45:18 +00:00
mergify[bot]
edfbc71135 fix: remove incorrect Payable account_type from Customer Deposits in Philippines CoA (backport #57018) (#57061) 
Co-authored-by: Raghav Ruia <168326921+raghavisruia@users.noreply.github.com>
 2026-07-11 17:52:48 +00:00
mergify[bot]
835e32cec7 fix(banking): allow negative balance in bank statement import (backport #56959) (#57054) 
fix(banking): allow negative balance in bank statement import (#56959)

(cherry picked from commit d449ad3b3f)

Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
 2026-07-11 18:18:17 +05:30
Vishnu Priya Baskaran
8eb92b8b18 fix(payment reconciliation): honour user permissions on accounting di… (#56560) 2026-07-11 15:04:44 +05:30
mergify[bot]
67c85ef0af fix: fetch payment entry reference amounts from invoice (backport #56928) (#57042) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-07-10 11:43:01 +00:00
mergify[bot]
bdba4c8091 fix: display outstanding amount using company default currency (backport #56785) (#57009) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: S Sakthivel Murugan <s.sakthivelmurugan2003@gmail.com>
 2026-07-10 15:36:34 +05:30
ruthra kumar
4711a28dd0 refactor(test): for reverse journals as well 
(cherry picked from commit 65775e59a1)

# Conflicts:
#	erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
 2026-07-10 06:20:54 +00:00
ruthra kumar
63e5117182 refactor: handle reverse ERR journals in AR / AP report 
(cherry picked from commit 6838242063)
 2026-07-10 06:20:53 +00:00
ruthra kumar
051757760f refactor: reversal capability on exchange rate revaluation 
(cherry picked from commit a0b14c0607)

# Conflicts:
#	erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
 2026-07-10 06:20:53 +00:00
ruthra kumar
277c651a9f refactor: add payment ledger to ignore link 
(cherry picked from commit 6a4c5b6062)
 2026-07-10 06:20:53 +00:00
khushi8112
d3a8e91cda fix: apply precision fix inline for v16-hotfix, drop develop-only asset_service refactor 2026-07-09 15:25:01 +05:30
khushi8112
a1fae959ed fix: match depreciation schedule rows at currency precision to avoid duplicate JEs 
(cherry picked from commit 947ed5dfe1)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/services/asset_service.py
 2026-07-09 09:14:03 +00:00
Shllokkk
7301be3e4c Merge pull request #56940 from frappe/mergify/bp/version-16-hotfix/pr-56926 
fix: validate template and its variant in the same Pricing Rule (backport #56926)
 2026-07-09 01:04:17 +05:30
mergify[bot]
7ce1289c10 fix: added permission checks on various whitelisted functions (backport #56745) (#56946) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-07-08 18:10:27 +05:30
Shllokkk
159a2538da fix: validate template and its variant in the same Pricing Rule 
(cherry picked from commit a88048b378)
 2026-07-07 14:30:22 +00:00
Dany Robert
20df15b3ac fix: precision issue causing reconciliation error (#54043) 
* fix: precision issue causing reconciliation error

* chore: code styling changes

* test: precision causing reconciliation failure

* fix: enhance payment reconciliation tests for floating-point precision

* fix(test): incorrect assertion on status

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit be10c8ced9)
 2026-07-07 14:29:21 +00:00
ruthra kumar
5a9d40ce04 chore: linter fix 
(cherry picked from commit a9ffdac806)
 2026-07-04 10:53:20 +00:00
ruthra kumar
9cf7f441fb refactor(test): row name based utility methods 
(cherry picked from commit dbc409736a)
 2026-07-04 10:53:19 +00:00
ruthra kumar
d759574f9a refactor: prevent whole table scan while scheduling next date 
- helps in concurrency isolation

(cherry picked from commit 21f4603144)
 2026-07-04 10:53:19 +00:00
ruthra kumar
019b02adcd fix: prevent repeatable read related concurrency errors 
Process Period Closing Voucher and Process Period Closing Voucher
Details are trackers how the jobs are processed. Keep transactions on
them very short.

(cherry picked from commit 7e4045e828)
 2026-07-04 10:53:19 +00:00
ruthra kumar
6d9f5fac76 fix: race condition and repeatable read in process pcv 
- Update using child table name to avoid scanning whole table, which
eventually leads to mariadb 1020 (REPEATABLE READ).
 - Avoid race condition in final summarization

(cherry picked from commit ff6881764b)
 2026-07-04 10:53:19 +00:00
khushi8112
0371e8eaf0 fix: add page numbers to print format footer 
(cherry picked from commit 2d0c0a8c09)
 2026-07-02 21:13:53 +00:00
khushi8112
fa4d32dcdb fix: render letter head footer in print formats 
(cherry picked from commit e60a467972)
 2026-07-02 21:13:53 +00:00
mergify[bot]
4573cd15a9 fix: restore Save button on reverse journal entry (backport #56770) (#56772) 
fix: restore Save button on reverse journal entry (#56770)

Reversing a submitted Journal Entry opened a draft with reversal_of set,
which called frm.set_read_only(). That strips the write and submit perms
from frm.perm, so the toolbar never rendered the Save (or later Submit)
button and the reversal could not be saved.

Lock the fields and the accounts grid as read_only instead, leaving perms
intact so Save and Submit still work while nothing stays editable.

Ticket: 72857
(cherry picked from commit 0a05dd4426)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-07-02 13:50:57 +05:30
Nabin Hait
0f9405646b Merge pull request #55970 from frappe/mergify/bp/version-16-hotfix/pr-55947 
fix(accounts): clear clearance date when amending reconciled voucher (backport #55947)
 2026-07-02 13:22:20 +05:30