nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-08 01:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,116 Commits 431 Branches 1,731 Tags
c33cd5ce15c2f4a50af15d9925264bd4af264a67
Commit Graph

57116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mergify[bot]
cd1dfeeab3 fix: check for submit permissions instead of write permissions when updating status (backport #53697) (#53703) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix: check for `submit` permissions instead of `write` permissions when updating status (#53697)
 2026-03-23 10:56:15 +00:00
mergify[bot]
0d9af60f8a fix(manufacturing): update non-stock item dict (backport #53689) (#53699) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(manufacturing): update non-stock item dict (#53689)
 2026-03-23 10:14:52 +00:00
Nishka Gosalia
e2b9538e85 Merge pull request #53694 from frappe/mergify/bp/version-16-hotfix/pr-53649 2026-03-23 14:52:10 +05:30
mergify[bot]
9787777cbd fix(trends): added validation for period_based_on filter (backport #53690) (#53692) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(trends): added validation for `period_based_on` filter (#53690)
 2026-03-23 09:15:08 +00:00
mergify[bot]
9805745a66 fix: shipping rule applied twice on non stock items (backport #53655) (#53687) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: shipping rule applied twice on non stock items (#53655)
 2026-03-23 14:38:07 +05:30
nishkagosalia
2a47197859 chore: Adding new argument in status updater to skip qty validation 
(cherry picked from commit dcd0509089)
 2026-03-23 08:57:51 +00:00
mergify[bot]
5f9533f089 fix: PO should not be required for internal transfers (backport #53681) (#53684) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: PO should not be required for internal transfers (#53681)
 2026-03-23 06:52:45 +00:00
MochaMind
eee1c36263 chore: update POT file (#53676) 2026-03-22 14:45:56 +01:00
rohitwaghchaure
543e374978 Merge pull request #53675 from frappe/mergify/bp/version-16-hotfix/pr-53673 
fix: stock queue for SABB (backport #53673)
 2026-03-22 13:20:18 +05:30
Rohit Waghchaure
f570a4cb5d fix: stock queue for SABB 
(cherry picked from commit 3fcf308ed8)
 2026-03-22 07:30:57 +00:00
rohitwaghchaure
18eb7bb4f4 Merge pull request #53670 from frappe/mergify/bp/version-16-hotfix/pr-53638 
fix: deadlock issue for SLE (backport #53638)
 2026-03-21 14:40:46 +05:30
Rohit Waghchaure
de41abaaf2 fix: deadlock issue for SLE 
(cherry picked from commit f48b03c6ec)
 2026-03-21 08:34:41 +00:00
mergify[bot]
077f39721a fix: do not overwrite expense account in stock entry (backport #53658) (#53661) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: do not overwrite expense account in stock entry (#53658)
 2026-03-20 14:56:44 +05:30
Nishka Gosalia
3923dd1e3a Merge pull request #53648 from frappe/mergify/bp/version-16-hotfix/pr-53645 
fix: Adding validation for operation time in BOM (backport #53645)
 2026-03-19 22:27:07 +05:30
nishkagosalia
aac60b4c13 fix: test case 2026-03-19 22:05:58 +05:30
nishkagosalia
f1c93d4b98 fix: merge conflict 2026-03-19 21:02:53 +05:30
mergify[bot]
7ebed912cf fix: validate permission before updating status (backport #53651) (#53653) 
* fix: validate permission before updating status (#53651)

(cherry picked from commit 8e17c722fb)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: resolve conflicts

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-19 15:28:01 +00:00
nishkagosalia
c38b252289 fix: Adding validation for operation time in BOM 
(cherry picked from commit 7f70e62c30)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/test_job_card.py
 2026-03-19 13:00:32 +00:00
ruthra kumar
ee19765c96 Merge pull request #53608 from ruthra-kumar/ci_lightmode_runner_v16 
refactor(test): repo wide test suite refactor (backport #47910)
 2026-03-19 13:35:08 +05:30
mergify[bot]
48e8944a86 fix(stock): fix email error message (backport #53606) (#53633) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): fix email error message (#53606)
 2026-03-19 07:42:44 +00:00
mergify[bot]
a94bf6db06 fix(payment_schedule): using show_alert instead of msgprint for non-selection of payment schedule (backport #53623) (#53631) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(payment_schedule): using `show_alert` instead of `msgprint` for non-selection of payment schedule (#53623)
 2026-03-19 12:57:45 +05:30
ruthra kumar
35f6bc5d30 refactor(test): remove all remaining reference to integration test 2026-03-19 12:57:12 +05:30
ruthra kumar
08ee50a902 refactor(test): cleanup; remove redundant attribute 2026-03-19 12:57:12 +05:30
ruthra kumar
3f35db5db1 refactor(test): make pick list deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
1c96348064 refactor(test): make item wise sales register deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
37d6978190 refactor(test): make purchase order deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
e3e4dae3bb refactor(test): make sales invoice deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
af614bd195 refactor(test): make location determinisitic 2026-03-19 12:57:12 +05:30
ruthra kumar
037fdd6882 refactor(test): make bank clearance deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
7cb662a54c refactor(test): make sales invoice deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
021789baf1 refactor(test): hardcoded names over dynamic 2026-03-19 12:57:12 +05:30
ruthra kumar
9f3afea27f refactor(test): use JSON for company master 2026-03-19 12:57:12 +05:30
ruthra kumar
7d0779c73c refactor(test): remove explicit call to master data setup 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
41de44f905 refactor: move test bootstrap to module 2026-03-19 12:57:12 +05:30
ruthra kumar
5934670e99 refactor(test): speed up setup 2026-03-19 12:57:12 +05:30
ruthra kumar
5f56f61f86 refactor(test): make stock entry deterministic 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
aec5ba1864 refactor(test): make process deferred accounting deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
9e11b6cfb3 refactor(test): make bom deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
71ce7ff8ce refactor(test): make customer deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
fe8064c3e6 refactor(test): tax rule; removed setUpClass, tearDownClass 2026-03-19 12:57:12 +05:30