nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,810 Commits 636 Branches 1,812 Tags
abc463bfb86dafe05e0738d3a6befcdd9485f363
Commit Graph

1186 Commits

Author SHA1 Message Date
khushi8112
abc463bfb8 refactor: show company currency in purchase amount label 
(cherry picked from commit b4c82c0f1a)
 2026-03-12 19:19:14 +00:00
khushi8112
0a5fe99d4a fix: move show_general_ledger to Asset Repair form events 
(cherry picked from commit ac124bdc7e)
 2026-03-12 08:35:55 +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
Khushi Rawat
3aeee125a4 Merge branch 'version-16-hotfix' into pr-52968 2026-03-06 14:46:32 +05:30
Rohit Waghchaure
93a597410e feat: option to enable serial / batch features 
(cherry picked from commit 82c3da5b1e)

# Conflicts:
#	erpnext/patches.txt
 2026-03-06 06:48:17 +00:00
diptanilsaha
32c33631a6 chore: fix onboarding doctype merge conflicts (#53118) 2026-03-03 10:16:34 +00:00
diptanilsaha
0787c62cbc Merge branch 'version-16' into version-16-hotfix 2026-03-03 15:24:26 +05:30
khushi8112
7f6b8a3e40 chore: linters check 
(cherry picked from commit 4f59d580c4)
 2026-02-26 15:34:32 +05:30
khushi8112
b619f6d906 fix: implement coderabbit suggested changes 
(cherry picked from commit d1b81b96a5)
 2026-02-26 15:34:32 +05:30
khushi8112
194b158e18 refactor: asset repair UI changes 
(cherry picked from commit 9f7bfc0e36)
 2026-02-26 15:34:32 +05:30
khushi8112
f9b6336dd5 refactor: asset capitalization form cleanup 
(cherry picked from commit eb7932ed73)
 2026-02-26 15:34:32 +05:30
khushi8112
3f11d0b8ad fix: test cases fixes related to new select box change 
(cherry picked from commit e8e8d233ab)
 2026-02-26 15:34:32 +05:30
khushi8112
27c3c1dee0 fix: test case 
(cherry picked from commit f2f509234b)
 2026-02-26 15:34:31 +05:30
khushi8112
78074c0cdd fix(UI): improve asset action buttons group 
(cherry picked from commit e90a3b5a56)
 2026-02-26 15:34:31 +05:30
khushi8112
87a7bc6f49 refactor: use selectbox instead of checkboxes for asset type 
(cherry picked from commit f7b9221324)
 2026-02-26 15:33:34 +05:30
khushi8112
6c23d5b682 fix(UI): reposition fields for better UX 
(cherry picked from commit 4e7794bfc3)
 2026-02-26 15:33:34 +05:30
rohitwaghchaure
19143bfe9b Merge branch 'version-16' into mergify/bp/version-16/pr-52985 2026-02-26 11:33:03 +05:30
rohitwaghchaure
38c49dfed6 chore: fix conflicts 
Updated the modified date in learn_asset.json.
 2026-02-26 11:31:16 +05:30
rohitwaghchaure
6bebf51087 chore: fix conflicts 2026-02-26 11:30:57 +05:30
Rohit Waghchaure
5d2822df97 fix: broekn link of docs in asset onboarding 
(cherry picked from commit 1cdf439e38)
(cherry picked from commit 5c48f74d4c)

# Conflicts:
#	erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json
#	erpnext/assets/onboarding_step/learn_asset/learn_asset.json
 2026-02-26 05:54:16 +00:00
Rohit Waghchaure
5c48f74d4c fix: broekn link of docs in asset onboarding 
(cherry picked from commit 1cdf439e38)
 2026-02-26 05:36:06 +00:00
Rohit Waghchaure
c3700f1b31 fix: patch to complete onboarding stpes for existing records 
(cherry picked from commit d90ec49241)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit 941a78e1a8)
 2026-02-26 05:21:53 +00:00
Rohit Waghchaure
941a78e1a8 fix: patch to complete onboarding stpes for existing records 
(cherry picked from commit d90ec49241)

# Conflicts:
#	erpnext/patches.txt
 2026-02-25 12:30:24 +00:00
Rohit Waghchaure
858119f907 feat: module onboarding 
(cherry picked from commit 792a1a7ab7)
 2026-02-24 07:20:09 +00:00
mergify[bot]
10be8f19e2 fix(asset): handle partial asset sales by splitting remaining quantity (backport #51363) (#52394) 
* fix(asset): handle partial asset sales by splitting remaining quantity

(cherry picked from commit 9a2710b9d7)

* fix: refactor older testcases

(cherry picked from commit a88fe2ecab)

* test: validate asset partial sales

(cherry picked from commit 9eeccb765d)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py

* fix(asset): skip purchase document validation while splitting existing asset

(cherry picked from commit e7e6567792)

* fix(asset): handle same asset being sold in multiple line items in sales invoice

(cherry picked from commit 23b094f151)

* test: validate asset split for auto created asset from purchase voucher

(cherry picked from commit 4adeaedfde)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py

* fix: use new_asset instead of asset_doc when checking values after splitting

(cherry picked from commit ca97f34092)

* fix: remove the redundant purchase receipt submit

(cherry picked from commit eeb6d0e9bf)

* chore: fix conflict

---------

Co-authored-by: Navin-S-R <navin@aerele.in>
 2026-02-17 14:32:08 +00:00
Poojashree T R
898d2e3c9a fix: validate asset movement transaction date (#52340) 
* fix: validate asset transaction date

* fix: validate asset transaction date

* fix: add translation in validate_transaction_date

* test: test_movement_transaction_date

* fix: to ensure test reliability

(cherry picked from commit e98b68c38f)
 2026-02-09 11:52:19 +00:00
khushi8112
d2387a3af8 fix: apply composite asset logic only in draft 
(cherry picked from commit ee501e884a)
 2026-02-06 07:36:31 +00:00
mergify[bot]
78c4f01733 fix: missing depr_series causing error on jv creation (backport #52085) (#52206) 
fix: missing depr_series causing error on jv creation (#52085)

(cherry picked from commit b565dd3da8)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2026-01-29 23:30:29 +05:30
mergify[bot]
4f1695616a fix(asset capitalization): update total_asset_cost on asset capitalisation submission (backport #52077) (#52115) 
fix(asset capitalization): update total_asset_cost on asset capitalisation submission (#52077)

fix(asset capitalization): update total_asset_cost on asset capitalization submission

(cherry picked from commit ec41f1b0f5)

Co-authored-by: NaviN <118178330+Navin-S-R@users.noreply.github.com>
 2026-01-27 19:31:52 +05:30
mergify[bot]
c1cc1dbd27 fix: unable to split asset from capitalization (backport #52020) (#52114) 
fix: unable to split asset from capitalization (#52020)

* fix: Allow split asset from capitalized composite asset (fixes #52016)

* test: Add test case for splitting asset created via capitalization (fixes #52016)

* docs: Add docstring to before_submit method

* fix: Remove unused variable and fix UTF-8 encoding in asset files

* fix: Remove UTF-8 BOM from asset.py to fix linting

* fix: Fix test_split_asset_created_via_capitalization test parameters

* fix: Remove unused import create_item

* chore: remove unnecessary comments

Removed validation comments for composite asset capitalization in before_submit method.

---------


(cherry picked from commit 7e9647f3f0)

Co-authored-by: madelyngamble2 <madelyngamble2@gmail.com>
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2026-01-27 18:04:19 +05:30
SowmyaArunachalam
13e4849c43 fix: disable asset repair when status is fully depreciated 
(cherry picked from commit 66fe1aa85d)
 2026-01-23 11:38:39 +00:00
mergify[bot]
4b85d51257 fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled (backport #51666) (#51716) 
Co-authored-by: Navin-S-R <navin@aerele.in>
 2026-01-13 16:05:14 +05:30
khushi8112
671610db1e fix(asset): properly reset purchase reference and item fields 2026-01-12 13:06:48 +05:30
nivithamerlin
c1d50c492b fix(asset): remove references for composite and existing asset 2026-01-09 16:36:12 +05:30
khushi8112
49f1688a51 feat: allow data import for asset repair doctype 2026-01-06 15:49:03 +05:30
Nabin Hait
b93f920592 fix: sidebar items for accounts (#51418) 2026-01-01 12:24:39 +05:30
khushi8112
16c6b2c39f fix: validate depreciation row values 2025-12-22 16:50:43 +05:30
khushi8112
e04353fc31 fix: add server side validation 2025-12-18 17:34:31 +05:30
khushi8112
e2ac7646e6 fix: set frm.has_active_capitalization before using it 2025-12-18 17:15:10 +05:30
khushi8112
482efee6c0 fix: do not hide primary-action for composite asset 2025-12-18 16:43:26 +05:30
khushi8112
c186b1d9c8 fix: additional check to regenerate depreciation 2025-12-18 14:52:58 +05:30
khushi8112
178bc759c7 fix: logic error in docstatus check and use better arg 2025-12-18 14:52:58 +05:30
khushi8112
aa8e8da29f fix: check and update depreciation if depreciation method was changed 2025-12-18 14:52:58 +05:30
khushi8112
028b6790cf fix: update depreciation schedule when asset value changes for manual depreciation 2025-12-18 14:52:58 +05:30
sudarshan-g
e32f898dd7 fix: show company currency in asset depreciation schedule 2025-12-17 12:09:22 +05:30
NaviN
5f6ed62c03 fix: use serial and batch bundle to fetch incoming rate (#51119) 2025-12-16 15:51:43 +01:00
Khushi Rawat
85114eda7c Merge pull request #50804 from ljain112/fix-asset-repair-amount 
fix: correct logic for repair cost in asset repair
 2025-12-10 12:58:13 +05:30
khushi8112
7012345968 fix: filter out cancelled asset in the query 2025-12-05 13:08:29 +05:30
khushi8112
7bfcdb13b1 fix: better validation message 2025-12-05 12:55:41 +05:30
khushi8112
2db09b3840 fix(asset): prevent creating assets beyond purchased quantity 2025-12-05 09:59:05 +05:30