nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 18:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,153 Commits 605 Branches 1,802 Tags
ebe45add4c7207107f65b9c24731ff592fcb2800
Commit Graph

2624 Commits

Author SHA1 Message Date
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
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
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
Rucha Mahabal
2f13b33e3d fix: only validate auto user creation before insert 
(cherry picked from commit ee1aa10328)
 2026-03-23 12:18:14 +00:00
Rucha Mahabal
1ddadb72b7 fix: employee user creation 
- consider prefered email as default in employee creation

- remove unused user parameter from `create_user` API

- remove unnecessary validations on user ID, already checked by user doctype hooks

- set company email only if empty

(cherry picked from commit 613d36a139)
 2026-03-23 12:18:14 +00:00
Rucha Mahabal
341bfb0bd9 fix: reset employee listview empty state, add import btn instead 
(cherry picked from commit d99d16423a)
 2026-03-23 12:18:13 +00:00
Rucha Mahabal
7414a9a694 fix: move Joining section before Exit, relabel Employee Exit -> Exit 
(cherry picked from commit 000b5b72d5)
 2026-03-23 12:18:13 +00:00
Krishna Shirsath
c33cd5ce15 refactor(employee): remove anniversary indicator logic from employee form 
(cherry picked from commit 1f19175fef)
 2026-03-23 12:18:13 +00:00
Krishna Shirsath
eadf78d694 fix(employee): add 'set_only_once' property to 'Create User Automatically' field 
(cherry picked from commit 053242d5bd)
 2026-03-23 12:18:13 +00:00
Krishna Shirsath
b115913fc9 fix: add missing type hints to whitelisted function arguments 
(cherry picked from commit 124ec4d3c2)
 2026-03-23 12:18:13 +00:00
Krishna Shirsath
0b3c9120c3 feat(employee): Add birthdays and work anniversaries indicator in form ,list view enhancements and new empty state. 
(cherry picked from commit 4f43f655cf)
 2026-03-23 12:18:12 +00:00
Krishna Shirsath
b0145512ed refactor(employee): reorganize joining and employee exit tabs at the end. 
(cherry picked from commit 870254b710)
 2026-03-23 12:18:12 +00:00
Krishna Shirsath
f2c4a8b1c4 refactor(employee): create user function -removed useless function calls 
(cherry picked from commit 6513185cb7)
 2026-03-23 12:18:11 +00:00
Krishna Shirsath
8f8b48746b feat(employee): Add automatic user creation feature and related validations. Create User on Import. 
(cherry picked from commit 57f3048d27)
 2026-03-23 12:18:11 +00:00
Krishna Shirsath
cd0a25ca17 feat(employee): Create User button and form. 
(cherry picked from commit 3b521b74ea)
 2026-03-23 12:18:11 +00:00
ruthra kumar
9f3afea27f refactor(test): use JSON for company master 2026-03-19 12:57:12 +05:30
ruthra kumar
495e585ab6 refactor(test): hardcoded names over dynamic ones 
Much faster bootstrap without those get_doc calls
 2026-03-19 12:57:12 +05:30
ruthra kumar
e451b68619 refactor(test): remove redundant before_tests 2026-03-19 12:57:12 +05:30
ruthra kumar
ed9470387e refactor(test): make currency exchange deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
63908ad6dc refactor(test): remove redundant tearDown, tearDownClass and rollback 2026-03-19 12:57:11 +05:30
ruthra kumar
e24c4fcb15 refactor(test): make item group deterministic 
'Item Group C' follows 'Item Group B'. So `lft` will increase while
`rgt` stays the same.
 2026-03-19 12:57:11 +05:30
ruthra kumar
cbc2eb33a5 chore: typo 2026-03-19 12:57:11 +05:30
ruthra kumar
9bf9068df7 refactor(test): make item group deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
671235d13c refactor(test): make transaction deletion record deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
bd5dcc04f0 refactor(test): make item group deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
2699ad15d2 refactor(test): make employee deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
2a6b497c06 refactor(test): make department deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
dd240c1070 refactor(test): make currency exchange deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
400d6b5b62 refactor(test): flaky tax rule testsuite 
- Make Sales Stage preset
 2026-03-19 12:57:10 +05:30
ruthra kumar
62d1336c43 refactor(test): flaky PE test; load currency exchange record 2026-03-19 12:57:10 +05:30
ruthra kumar
fbd2a181bd refactor(test): make all presets in setupclass 2026-03-19 12:57:10 +05:30
ruthra kumar
f1dfac417d refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide 
- import ERPNextTestSuite
 - use it on test class
 2026-03-19 12:57:07 +05:30
ruthra kumar
0fdc961a4b refactor(test): bare bones presets for company 2026-03-19 11:33:34 +05:30
ruthra kumar
88c6f61632 refactor(test): make persistent company records 
'test_coa_based_on_country_template' made deterministic
 2026-03-19 11:33:34 +05:30
ruthra kumar
c2504760dd chore: remove IGNORE_TEST_RECORD_DEPENDENCIES 2026-03-19 11:33:34 +05:30
ruthra kumar
de34cf227a chore: remove EXTRA_TEST_RECORD_DEPENDENCIES 2026-03-19 11:33:34 +05:30
ruthra kumar
f7e4d07a7e chore: delete all test_records.json 2026-03-19 11:33:34 +05:30
mergify[bot]
afe8e3a023 fix: enable logs to track changes in doctype. (backport #53491) (#53524) 
* fix: enable logs to track changes in doctype. (#53491)

Co-authored-by: jeraldin2003 <jeraldin2003>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit e2667ab098)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json

* chore: resolve conflicts

---------

Co-authored-by: Jeraldin P J <113301032+jeraldin2003@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-03-17 05:32:00 +00:00
Nabin Hait
f9a38696b6 fix: set default list view columns and filters for sales, purchase and accounts module 
(cherry picked from commit 9cf529215f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-03-10 12:22:40 +00:00