nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-15 15:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,954 Commits 606 Branches 1,799 Tags
ca61e5a214c84130d1a2f950dd80d2ec5fa900f5
Commit Graph

2660 Commits

Author SHA1 Message Date
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
ruthra kumar
ebe45add4c refactor(test): move trial company creation to bootstrap 
(cherry picked from commit 11fb00c21d)
 2026-03-24 17:52:41 +05:30
ruthra kumar
ee72ed94d5 refactor(test): move company setup to bootstrap 
(cherry picked from commit 9ed072ac83)
 2026-03-24 17:52:41 +05:30
ruthra kumar
9669a2c56f refactor(test): move commits inside test guard clause 
(cherry picked from commit ed76d6699a)
 2026-03-24 12:14:03 +00:00
khushi8112
a8769bfb77 feat: default print format for Quotation 
(cherry picked from commit 4307cd5b1c)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/public/js/print.js
#	erpnext/setup/install.py
 2026-03-24 10:06:57 +00:00
Rucha Mahabal
0a8e4675dc Merge pull request #53711 from frappe/mergify/bp/version-16-hotfix/pr-52726 
feat(employee): Create User button and form. (backport #52726)
 2026-03-24 11:06:15 +05:30
khushi8112
ab0e215290 feat: default print format for Request for Quotation 
(cherry picked from commit 2af0d9cf6c)
 2026-03-23 20:04:45 +00:00
mergify[bot]
d16adb1579 chore(test_item_group): removed unused function _print_tree (backport #53716) (#53719) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-23 16:14:22 +00:00
Rucha Mahabal
03510d96be chore: fix conflicts 2026-03-23 17:57:30 +05:30
Rucha Mahabal
33d868f415 test(fix): set company in employee 
(cherry picked from commit a14f834589)

# Conflicts:
#	erpnext/setup/doctype/employee/test_employee.py
 2026-03-23 12:18:18 +00:00
Rucha Mahabal
dfd9aa56be test: Create User Automatically 
(cherry picked from commit d4ecede3c3)

# Conflicts:
#	erpnext/setup/doctype/employee/test_employee.py
 2026-03-23 12:18:17 +00:00
Rucha Mahabal
af94ed865a fix: reset User ID and make it read-only if 'Create User Automatically' is set 
(cherry picked from commit 2be6bb694f)
 2026-03-23 12:18:17 +00:00
Rucha Mahabal
553bc87ac7 fix: fallback to Personal Email for user creation just like client-side 
(cherry picked from commit 31af13a5e6)
 2026-03-23 12:18:17 +00:00
Rucha Mahabal
3023302700 fix: avoid setting unnecessary fields 
(cherry picked from commit 97bb100010)
 2026-03-23 12:18:16 +00:00
Rucha Mahabal
e8ca394e8b fix: set create user perm to 1 by default + persist option while saving employee 
(cherry picked from commit 091899d0df)
 2026-03-23 12:18:16 +00:00
Rucha Mahabal
c12ad7910a fix: hide Create User Automatically checkbox if user is already selected 
(cherry picked from commit ec3302d1c1)
 2026-03-23 12:18:15 +00:00
Rucha Mahabal
d093b71946 fix: uncollapse User Details section in new form 
(cherry picked from commit 1466df91bd)
 2026-03-23 12:18:15 +00:00