nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-11 02:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,140 Commits 433 Branches 1,736 Tags
25fa66f90c7204c5e7e9cf3a953d503afce4a4e7
Commit Graph

57140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
25fa66f90c fix: Removed quick access link from selling workspace 
(cherry picked from commit d7c48d645a)
 2026-03-24 06:01:15 +00:00
ruthra kumar
e78386f49a Merge pull request #53737 from frappe/mergify/bp/version-16-hotfix/pr-53730 
fix: skip overwriting existing asset fields with accounting dimensions (backport #53730)
 2026-03-24 11:25:09 +05:30
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
a35a3e9627 fix: skip overwriting existing asset fields with accounting dimensions 
(cherry picked from commit 2859a143f2)
 2026-03-24 05:35:26 +00:00
ruthra kumar
645308fc05 Merge pull request #53725 from Raghav0201/backport-52654 
fix: resolve POS crash and correct is_return typo in TransactionBase
 2026-03-24 10:59:00 +05:30
Raghav0201
adc2960f5b fix: resolve POS crash and correct is_return typo in TransactionBase 2026-03-23 22:13:29 +05:30
mergify[bot]
c36f9e9b1b fix(manufacturing): close work order status when stock reservation is… (backport #53714) (#53721) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix(manufacturing): close work order status when stock reservation is… (#53714)
 2026-03-23 22:03:54 +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
mergify[bot]
638373e180 chore: skip semgrep check for db.commit in BootStrapTestData (backport #53715) (#53717) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-23 15:59:49 +00:00
rohitwaghchaure
2a514b5038 Merge pull request #53707 from frappe/mergify/bp/version-16-hotfix/pr-53705 
fix: batch validation for subcontracting receipt (backport #53705)
 2026-03-23 18:52:30 +05:30
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
Rohit Waghchaure
604739d1dc fix: batch validation for subcontracting receipt 
(cherry picked from commit b8d201658a)
 2026-03-23 11:33:00 +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