nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 02:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,532 Commits 605 Branches 1,802 Tags
ef21a9ba9b36dfdf76146dccad2a7162b3f8d61d
Commit Graph

2676 Commits

Author SHA1 Message Date
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
diptanilsaha
cb2a930a32 feat(crm_settings): auto-update crm sync settings on frappe crm install and uninstall 
(cherry picked from commit c86aa2d6fe)
 2026-07-09 10:02:14 +00:00
mergify[bot]
003b6554c4 fix(company): ignore user permissions for link fields having link to Account and Cost Center (backport #56748) (#56795) 
* fix(company): ignore user permissions for link fields having link to `Account` and `Cost Center` (#56748)

(cherry picked from commit 9cea43b006)

# Conflicts:
#	erpnext/setup/doctype/company/company.json

* chore: resolves conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-07-02 12:55:16 +00:00
mergify[bot]
d9aa4491f1 feat: capture user persona during setup (backport #56705) (#56707) 2026-07-01 18:15:55 +05:30
ruthra kumar
65202d2be1 refactor(tests): reuse persistent master data instead of creating company per test 
Replace per-test company creation in setUp() with persistent master data
from BootStrapTestData. Add Test PCV Company to test_records.json so it
becomes a persistent fixture rather than a throwaway created per test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6e62750c2f)

# Conflicts:
#	erpnext/accounts/report/financial_ratios/test_financial_ratios.py
 2026-06-29 09:41:47 +05:30
Mihir Kandoi
8a665709d2 fix: exclude virtual child doctypes from deletion in transaction deletion record 
(cherry picked from commit 8bd8b28207)
 2026-06-24 09:48:25 +00:00
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]
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
ruthra kumar
2a43df8233 refactor(test): dont create master data in setUp 
(cherry picked from commit 8db4d2705a)
 2026-06-16 06:48:59 +00:00
diptanilsaha
2606d660af fix(get_exchange_rate): using get_single_value to fetch disabled value from currency_exchange_settings 
(cherry picked from commit abb579e2db)
 2026-06-15 08:53:37 +00:00
diptanilsaha
6f25d915c7 test: fixed currency exchange test for frankfurter v2 api 
(cherry picked from commit 138f683a68)
 2026-06-15 08:53:36 +00:00
diptanilsaha
471ab662f6 fix: use frankfurter v2 by default for new install 
(cherry picked from commit 479f9f63c9)
 2026-06-15 08:53:36 +00:00
Raghav Ruia
6a3c973b0f fix: show company name in delete transactions confirmation dialog 
Display the actual company name in bold within the confirmation dialog
label so users immediately know which company they must type to confirm,
reducing the risk of accidental data loss.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 87d26a2d67)
 2026-06-15 04:20:40 +00:00
Rohit Waghchaure
dd56e80512 fix: pemission for whitelist functions 2026-06-13 17:54:59 +05:30
Mihir Kandoi
a83002aae6 fix: sync employee user status after save 2026-06-11 20:58:35 +05:30
pandiyan
ca61e5a214 fix: show user disable audit log 
(cherry picked from commit 73d1852773)
 2026-06-11 15:01:51 +00:00
Nabin Hait
1bfb0c8e5a Merge pull request #55676 from frappe/mergify/bp/version-16-hotfix/pr-55674 
fix: updated role based permission for terms and conditions doctype (backport #55674)
 2026-06-10 12:13:45 +05:30
mergify[bot]
2ae6451f10 fix: Add authorization checks on internal functions (backport #55709) (#55726) 
* fix: Add authorization checks on internal functions (#55709)

(cherry picked from commit ba936eefab)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
#	erpnext/support/doctype/issue/issue.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-08 10:16:12 +00:00
Diptanil Saha
254290a88e fix: updated role based permission for terms and conditions doctype (#55674) 
(cherry picked from commit 0ba2961103)
 2026-06-06 11:45:32 +00:00
mergify[bot]
6a503f834c fix: Add likely missing escapes (backport #55574) (#55581) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Add likely missing escaps (#55574)
 2026-06-03 15:53:43 +00:00
mergify[bot]
a563d01425 regional(setup): add 0% and 6% VAT rates for Belgium (backport #54719) (#55583) 
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
 2026-06-03 14:20:44 +05:30
mergify[bot]
7426aaf1e2 fix(regional): Japanese CT Rate (backport #54998) (#55438) 
Co-authored-by: mh35 <mh35jp@gmail.com>
fix(regional): Japanese CT Rate (#54998)
 2026-05-30 22:00:04 +05:30
mergify[bot]
4dff5a7820 fix(employee): js error if user does not have write permission for date field (backport #55312) (#55314) 
Co-authored-by: Himanshu Jain <118419692+trufurs@users.noreply.github.com>
fix(employee): js error if user does not have write permission for date field (#55312)
 2026-05-27 01:58:49 +05:30
diptanilsaha
82793cbd4d feat: add get_parent_supplier_groups using query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit cb610b79d2)
 2026-05-21 11:36:29 +00:00
diptanilsaha
620161c526 refactor: migrate get_parent_customer_groups to query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 91a2a7b0a0)
 2026-05-21 11:36:29 +00:00
mergify[bot]
6d8bbc5b6f chore: migrate Address/Contact custom fields from JSON fixtures to install (backport #55084) (#55088) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fixtures to install (#55084)
 2026-05-20 21:24:40 +05:30
mergify[bot]
9857cc64d6 fix: prevent duplicate task execution and timestamp error in transaction deletion (backport #55021) (#55025) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
fix: prevent duplicate task execution and timestamp error in transaction deletion (#55021)
 2026-05-18 17:55:05 +00:00
mergify[bot]
98de025a09 fix: added permission validation for deactivate_sales_person (backport #54884) (#54886) 
* fix: added permission validation for `deactivate_sales_person` (#54884)

(cherry picked from commit 9134db9cd3)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.py

* chore: resolved conflict

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-05-12 16:31:21 +00:00
mergify[bot]
126e13be25 fix: mark item tax templates as not applicable (backport #54673) (#54677) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: mark item tax templates as not applicable (#54673)
 2026-04-30 17:52:24 +02:00
mergify[bot]
bd932da08b feat: copy terms attachments to transactions (backport #53403) (#54661) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-04-29 23:43:28 +02:00
mergify[bot]
8f8bf13b41 fix: filter overdue purchase order items by company (backport #54099) (#54611) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
fix: filter overdue purchase order items by company (#54099)
 2026-04-29 01:25:31 +05:30
ruthra kumar
45dc2c40fd fix: hide feature flag controlled fields on install 
(cherry picked from commit 889fdf2f11)
 2026-04-28 15:44:28 +05:30
ruthra kumar
91a748d9bf refactor(test): remove explicit sql delete calls 
(cherry picked from commit b16dd3f2dd)
 2026-04-22 05:43:48 +00:00
iamkhanraheel
47abaf70b2 fix: default company perms for HR manager 
(cherry picked from commit 2018a90ad8)
 2026-04-20 05:50:43 +00:00
iamkhanraheel
95213fb9b8 fix: default perm for HR manager & HR user 
(cherry picked from commit 41103a0622)
 2026-04-20 05:50:42 +00:00
iamkhanraheel
534891aac4 fix: default permission for HR manager role 
(cherry picked from commit 5ec66169a7)
 2026-04-20 05:50:42 +00:00
iamkhanraheel
0d6d64ff05 fix: default permission for HR User role 
(cherry picked from commit 7b0bfe76cc)
 2026-04-20 05:50:41 +00:00
ruthra kumar
d49c34389b fix(test): missing repost allowed defaults 
(cherry picked from commit 257865deb2)
 2026-04-16 10:33:04 +00:00
mergify[bot]
ead7744f81 refactor: add category field to uom (backport #54290) (#54325) 
* refactor: add category field to uom (#54290)

(cherry picked from commit e04a2e6da2)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-16 10:16:28 +00:00
ruthra kumar
47e78bd4b9 refactor(company): don't force set service expense account on save 
(cherry picked from commit 927f40b296)
 2026-04-15 10:03:59 +00:00
Khushi Rawat
71a563428d Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-53588 2026-04-13 15:41:39 +05:30
khushi8112
57e458cc1e fix: conflicting issue 2026-04-13 15:30:56 +05:30
mergify[bot]
62b83cacce fix: resolve user permission error on status change by updating user … (backport #54033) (#54060) 
Co-authored-by: Krishna Shirsath <shirsathkrishna19@gmail.com>
 2026-04-07 10:25:13 +05:30
Mihir Kandoi
8db397bdae feat: co product by product support (#52979) (#53975) 2026-04-01 07:41:39 +00:00
mergify[bot]
b2cba0286e refactor: setup wizard stages and demo data creation (backport #53866) (#53868) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-29 17:05:36 +00:00
mergify[bot]
675b94b7a2 fix: support translated search in get_party_type and refactor raw sql to qb (backport #53191) (#53832) 
* fix: support translated search in get_party_type and refactor raw sql to qb

(cherry picked from commit d987688058)

# Conflicts:
#	erpnext/setup/doctype/party_type/party_type.py

* fix: resolve merge conflicts in party_type.py

---------

Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
 2026-03-27 13:42:46 +05:30
Khushi Rawat
b072dd4497 Merge pull request #53728 from frappe/mergify/bp/version-16-hotfix/pr-53646 
feat: default print format for Request for Quotation (backport #53646)
 2026-03-25 17:32:17 +05:30
ruthra kumar
f0aa82cc6d refactor(test): make stock entry deterministic 
(cherry picked from commit 8fd65d7afa)
 2026-03-24 17:52:41 +05:30
ruthra kumar
0ba03ce851 refactor(test): SLA move company creation to bootstrap 
(cherry picked from commit 77f41e120d)
 2026-03-24 17:52:41 +05:30