nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-11 10:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,166 Commits 433 Branches 1,737 Tags
1872dccb0a59ba2b0d68d3a67a05a6fa95ff5239
Commit Graph

57166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
1872dccb0a fix: do not check for sub assembly reference for rm of fg (backport #53758) (#53759) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: do not check for sub assembly reference for rm of fg (#53758)
 2026-03-25 11:10:16 +05:30
ruthra kumar
47438a44d3 Merge pull request #53752 from frappe/mergify/bp/version-16-hotfix/pr-53657 
refactor(test): move remaining commits inside test guard (backport #53657)
 2026-03-24 18:24:58 +05:30
ruthra kumar
e91cbd94b4 refactor(test): process statement of acc remove commit 
(cherry picked from commit bc2b8da597)
 2026-03-24 17:52:41 +05:30
ruthra kumar
7f29245eb6 refactor(test): move location creation to bootstrap in asset movement 
(cherry picked from commit fd2b76a4d2)
 2026-03-24 17:52:41 +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
37ad0665c6 refactor(test): make asset capitalization deterministic 
(cherry picked from commit 2c53cf3902)
 2026-03-24 17:52:41 +05:30
ruthra kumar
8ea9133caa refactor(test): make ledger merge deterministic 
(cherry picked from commit d3cf8cb851)
 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
ad2cf0624f refactor(test): move webform custom dt creation to boostrap 
(cherry picked from commit 426b7db3c8)
 2026-03-24 17:52:41 +05:30
ruthra kumar
cdc77caf6a refactor(test): move custom doctype data setup to bootstrap 
(cherry picked from commit 934740205a)
 2026-03-24 17:52:41 +05:30
ruthra kumar
d41e7098bd refactor(test): move tax category custom field creation to bootstrap 
(cherry picked from commit 4454af8efd)
 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
bb42d3ddbe refactor(test): move purchase invoice dimension setup to bootstrap 
(cherry picked from commit 31ce09204f)
 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
941375877e refactor(test): move dimension setup to test data bootstrap 
and remove create_dimension() and disable_dimension()

(cherry picked from commit 342ce65401)
 2026-03-24 17:52:37 +05:30
ruthra kumar
4148d7d414 Merge pull request #53750 from frappe/mergify/bp/version-16-hotfix/pr-52285 
fix(Payment Entry): split orders as per the schedules in the reference table (backport #52285)
 2026-03-24 17:49:48 +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
Jatin3128
2693ffe680 fix(Payment Entry): split orders as per the schedules in the refrence table 
(cherry picked from commit a9e52833fe)
 2026-03-24 11:59:33 +00:00
Nishka Gosalia
f9bbf7bee4 Merge pull request #53747 from frappe/mergify/bp/version-16-hotfix/pr-53738 2026-03-24 16:48:34 +05:30
nishkagosalia
0571830720 refactor: item master ux improvements 
(cherry picked from commit be55082751)
 2026-03-24 10:59:06 +00:00
Khushi Rawat
6239e336ae Merge pull request #53729 from frappe/mergify/bp/version-16-hotfix/pr-53680 
fix(UX): improve party selection UX with party name field (backport #53680)
 2026-03-24 12:03:37 +05:30
ruthra kumar
2291a0539b Merge pull request #53740 from frappe/mergify/bp/version-16-hotfix/pr-52802 
fix: Removed quick access link from selling workspace (backport #52802)
 2026-03-24 11:50:42 +05:30
ruthra kumar
70984763a1 Merge pull request #53739 from frappe/mergify/bp/version-16-hotfix/pr-53302 
fix: sanitize genericode import inputs and secure XML parser (backport #53302)
 2026-03-24 11:47:45 +05:30
Nabin Hait
25fa66f90c fix: Removed quick access link from selling workspace 
(cherry picked from commit d7c48d645a)
 2026-03-24 06:01:15 +00:00
Shllokkk
d7902d0477 fix: sanitize genericode import inputs and secure XML parser 
(cherry picked from commit 17eb983c40)
 2026-03-24 05:57:53 +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
khushi8112
a2057331e3 fix: party name not updating correctly 
(cherry picked from commit 469bb0ba4e)
 2026-03-23 20:06:32 +00:00
khushi8112
f80b974d6f fix(UX): improve party selection UX with party name field 
(cherry picked from commit 8fd9b88cd9)
 2026-03-23 20:06:31 +00:00
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