nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 14:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,090 Commits 595 Branches 1,797 Tags
bbb3181c6e327e7af77544d51175eb0db744d577
Commit Graph

58090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
S Sakthivel Murugan
bbb3181c6e fix: fetch party types based on account type in journal entry and refactor SQL to query builder 
(cherry picked from commit 6f225920d0)
 2026-06-20 18:32:30 +00:00
mergify[bot]
e6e5591088 fix(coa_importer): allow importing COA through import_coa only for Accounts Manager (backport #56132) (#56140) 
* fix(coa_importer): allow importing COA through `import_coa` only for `Accounts Manager` (#56132)

* fix(coa_importer): allow importing COA only for `Accounts Manager`

Co-authored-by: Pratheep S <pratheeps2024@gmail.com>

* fix(coa_importer): check permissions in `unset_existing_data`

---------

Co-authored-by: Pratheep S <pratheeps2024@gmail.com>
(cherry picked from commit 8c1a1aafe6)

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

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-20 22:16:16 +05:30
Diptanil Saha
635c51acf7 Merge pull request #56194 from frappe/mergify/bp/version-16-hotfix/pr-56191 
fix: added missing permission validation on whitelisted function and removed unnecessary whitelisted decorator (backport #56191)
 2026-06-20 20:25:41 +05:30
diptanilsaha
e605675e11 chore: resolve conflicts 2026-06-20 20:07:42 +05:30
diptanilsaha
bf58393fda fix(report_utils): remove unnecessary whitelist decorator on get_invoiced_item_gross_margin 
(cherry picked from commit e29535f29c)

# Conflicts:
#	erpnext/accounts/report/utils.py
 2026-06-20 20:07:42 +05:30
diptanilsaha
88ce356d62 fix(err): add missing permission check on get_account_details 
(cherry picked from commit 9bf1e847d2)
 2026-06-20 20:07:37 +05:30
Shllokkk
396feadace Merge pull request #56164 from Shllokkk/honor-account-freezing-date-on-cancel 
fix: honor account freezing date when cancelling vouchers
 2026-06-20 13:56:12 +05:30
mergify[bot]
c0dab55fcc perf: composite index on (serial_no, warehouse, posting_datetime) for Serial and Batch Entry (backport #56032) (#56166) 
* perf: composite index on (serial_no, warehouse, posting_datetime)

(cherry picked from commit b1b6ae98ed)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

Removed conflicting patch entries and retained relevant ones.

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-06-19 12:54:19 +00:00
ruthra kumar
cb47745d8c Merge pull request #56159 from frappe/mergify/bp/version-16-hotfix/pr-55265 
fix: update reference doctype mapping and field visibility in bank guarantee (backport #55265)
 2026-06-19 17:48:27 +05:30
Shllokkk
f4b827cb3d fix: honor account freezing date when cancelling vouchers 2026-06-19 16:51:54 +05:30
nareshkannasln
dc9ae20db8 fix: update reference doctype mapping and field visibility in bank guarantee 
(cherry picked from commit b1de654dfd)
 2026-06-19 11:09:38 +00:00
Mihir Kandoi
6cb42ab8b1 Merge pull request #56138 from frappe/mergify/bp/version-16-hotfix/pr-55920 
fix: update weighted average rate calculation to consider returned and consumed quantities (backport #55920)
 2026-06-19 15:15:45 +05:30
ljain112
35e06045bd fix: update weighted average rate calculation to consider returned and consumed quantities 
(cherry picked from commit 35e55d3e13)
 2026-06-19 09:17:57 +00:00
Mihir Kandoi
6c37acc180 Merge pull request #55968 from frappe/mergify/bp/version-16-hotfix/pr-55830 
fix(stock): enable quality inspection for all Stock Entry purposes (backport #55830)
 2026-06-19 12:03:46 +05:30
Sudharsanan11
42c121a750 fix(stock): define qi exception classes in exceptions file 2026-06-19 11:38:25 +05:30
Mihir Kandoi
1e027364e3 chore: resolve conflicts 2026-06-19 11:38:25 +05:30
Sudharsanan11
d2fee32eb3 test(stock): add test to validate the quality inspection for stock entry 
(cherry picked from commit 609ccc3cb1)
 2026-06-19 11:38:25 +05:30
Smit Vora
21912402c0 Merge pull request #56123 from frappe/mergify/bp/version-16-hotfix/pr-56104 
fix: base_tax_amount as none when payment entry created using API (backport #56104)
 2026-06-19 09:25:27 +05:30
vorasmit
43b355eaf6 fix: tax.base_tax_amount as none when payment entry created using API 
(cherry picked from commit b9b402f2ec)
 2026-06-19 03:17:58 +00:00
Mihir Kandoi
175aac4156 Merge pull request #56119 from frappe/mergify/bp/version-16-hotfix/pr-56065 
fix(stock): propagate renamed attribute values to variant items (backport #56065)
 2026-06-18 23:16:26 +05:30
Mihir Kandoi
30650f298b Merge pull request #56115 from frappe/mergify/bp/version-16-hotfix/pr-56055 
fix: disable is_debit_note while creating credit note (backport #56055)
 2026-06-18 22:54:51 +05:30
barredterra
3110ab1c57 fix(stock): update variant attributes on value rename 
(cherry picked from commit c7acd88742)
 2026-06-18 17:06:07 +00:00
barredterra
40110d83c9 test(stock): add cleanup for item attribute value changes in tests 
(cherry picked from commit 60f5de7ab8)
 2026-06-18 17:06:07 +00:00
barredterra
dbc831e008 fix(stock): propagate renamed attribute values to variant items 
(cherry picked from commit 27d574dad5)
 2026-06-18 17:06:07 +00:00
Mihir Kandoi
686437bd54 Merge pull request #56117 from frappe/mergify/bp/version-16-hotfix/pr-56098 
fix: apply docstatus filter to exclude cancelled Work Orders in Seria… (backport #56098)
 2026-06-18 22:32:47 +05:30
pandiyan
58d5f39e0a fix: apply docstatus filter to exclude cancelled Work Orders in Serial No 
(cherry picked from commit 3ba8f690a4)
 2026-06-18 16:56:46 +00:00
pandiyan
c7dbedbfdc fix: disable is_debit_note while creating credit note 
(cherry picked from commit 279c8dea06)
 2026-06-18 16:54:21 +00:00
Nikhil Kothari
8e21af0a63 fix: type def in get_linked_payments (#56100) 2026-06-18 14:11:11 +00:00
Shllokkk
87e498cd7d Merge pull request #56088 from Shllokkk/je-pcv-vaidation 
fix(journal entry): validate opening entry against pcv on save
 2026-06-18 18:04:51 +05:30
Shllokkk
f8aa4c730c fix(journal entry): validate opening entry against pcv on save 2026-06-18 16:56:17 +05:30
rohitwaghchaure
a335838691 Merge pull request #56091 from frappe/mergify/bp/version-16-hotfix/pr-56079 
feat: allow negative stock at batch level (backport #56079)
 2026-06-18 16:42:32 +05:30
Rohit Waghchaure
1f075d4bbf feat: add batch-level option to allow negative stock for batch 
(cherry picked from commit ca07982ee0)
 2026-06-18 10:49:45 +00:00
Khushi Rawat
7f441864d6 Merge pull request #56084 from frappe/mergify/bp/version-16-hotfix/pr-56030 
fix: lock budget distribution table and guard against null distributi… (backport #56030)
 2026-06-18 14:34:18 +05:30
Shllokkk
2b28b7e694 fix: lock budget distribution table and guard against null distribution rows 
(cherry picked from commit d37e5cd97d)
 2026-06-18 08:28:37 +00:00
Mihir Kandoi
56d9cbabbf Merge pull request #56049 from aerele/backport-56003 
fix(stock): update transfer status for mixed transfer flows
 2026-06-17 17:20:55 +05:30
pandiyan
4481efec17 test(stock): validate completed status for mixed transfer methods 2026-06-17 16:58:32 +05:30
pandiyan
84a1a51023 fix(stock): update transfer status for mixed transfer flows 2026-06-17 16:58:23 +05:30
Mihir Kandoi
98f45221e6 Merge pull request #56043 from mihir-kandoi/codex/fix-stock-ageing-reco-ageing-v16 
fix: preserve stock ageing on non-serial reconciliation
 2026-06-17 16:20:49 +05:30
Mihir Kandoi
846e0a9f06 fix: preserve stock ageing on non-serial reconciliation 2026-06-17 15:58:47 +05:30
ruthra kumar
6185507614 Merge pull request #56024 from frappe/mergify/bp/version-16-hotfix/pr-55988 
refactor(test): remove dependency on accounts test mixin (backport #55988)
 2026-06-17 07:59:00 +05:30
ruthra kumar
d051407126 refactor(test): remove redundant clear method and minor fixes 
(cherry picked from commit 004087097c)
 2026-06-17 02:11:27 +00:00
ruthra kumar
3d91e021a3 refactor(tests): replace AccountsTestMixin master data setup with direct attribute assignments 
All test classes inheriting AccountsTestMixin that called create_company(),
create_item(), create_customer(), create_supplier(), create_usd_receivable_account(),
and create_usd_payable_account() in setUp() now set instance attributes directly
using master data pre-created by BootStrapTestData, eliminating redundant DB
inserts on every test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 1fda0dfb9b)
 2026-06-17 02:11:26 +00:00
Ravibharathi
3586df8ed6 fix: set transaction currency on payment entry gl entries (#55989) 2026-06-17 02:19:56 +05:30
mergify[bot]
f4bf35aa31 fix(company): replaced "this company" with company name on delete transactions dialog (backport #56021) (#56023) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(company): replaced "this company" with company name on delete transactions dialog (#56021)
 2026-06-17 02:14:41 +05:30
mergify[bot]
ab856d370a fix: update system manager permissions (backport #55978) (#56005) 
Co-authored-by: nareshkannasln <nareshkannashanmugam@gmail.com>
 2026-06-17 00:56:12 +05:30
mergify[bot]
2bfb5fe8b8 fix: check for bank account permission when updating balance (backport #56016) (#56017) 
fix: check for bank account permission when updating balance (backport #56016)
 2026-06-17 00:54:45 +05:30
rohitwaghchaure
b34373e5da Merge pull request #56009 from frappe/mergify/bp/version-16-hotfix/pr-55983 
fix: provision to recalculate valuation rate during reposting (backport #55983)
 2026-06-16 22:20:30 +05:30
mergify[bot]
7c99018b84 chore(deps): bump vite from 8.0.11 to 8.0.16 in /banking (backport #56007) (#56010) 2026-06-16 16:36:56 +00:00
Rohit Waghchaure
9fcb730090 fix: test case 
(cherry picked from commit e183e32619)
 2026-06-16 15:52:30 +00:00
Rohit Waghchaure
7877c2e2aa test: reset dont_execute_stock_reposts flag in tearDown 
The test_prevention_of_cancelled_transaction_riv test sets
frappe.flags.dont_execute_stock_reposts = True without resetting it,
which leaked into the recalculate_valuation_rate tests and made
repost() a no-op (incoming rate stayed unchanged). Reset the flag
in tearDown so reposts run for subsequent tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit 28992eb2f4)
 2026-06-16 15:52:29 +00:00