nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,315 Commits 640 Branches 1,812 Tags
149af49d011abf758f1a301a4d4a13e6da1d04c0
Commit Graph

1216 Commits

Author SHA1 Message Date
Mohd Haris
0e730bf1c7 fix(asset): conditionally show Is Fully Depreciated field 
The "Is Fully Depreciated" field was hidden on the Asset form (hidden: 1),
so it could never be set for manually entered existing assets.

Make it visible based on context:
- Existing Asset with Calculate Depreciation off -> visible and editable
- Calculate Depreciation on -> visible but read-only and forced unchecked
  (it is only meaningful for manually entered assets)

The unchecked value is enforced in the form script (immediate feedback on
toggle and on load) and in server-side validate() so it can never be saved
as checked while depreciation is being calculated.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit a7c1ebacbe)
 2026-06-30 10:05:12 +00:00
rohitwaghchaure
6dad1b1ae6 refactor: move Inventory Dimension mandatory check from field-level to server-side (#56451) 
* refactor: move Inventory Dimension mandatory check from field-level to server-side

* refactor: split large function

* fix: greptile issue
 2026-06-25 20:10:09 +05:30
Khushi Rawat
d82e03edb6 fix: import DateTimeLikeObject 2026-05-29 15:21:58 +05:30
Khushi Rawat
abe19e1212 fix: resolve conflict 2026-05-29 15:05:41 +05:30
khushi8112
e3f03a21c3 fix: asset scrap flow related changes 
(cherry picked from commit 21bb8fe979)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2026-05-25 10:16:25 +00:00
khushi8112
99642b9636 fix: don't reset net_purchase_amount for Composite Asset if already set 
(cherry picked from commit 98dae6e43a)
 2026-05-21 11:38:28 +00:00
mergify[bot]
5e5b5cfa0c fix(stock): ignore fetching warehouse account for asset items (backport #54403) (#54961) 
* fix(stock): ignore fetching warehouse account for asset items

(cherry picked from commit 6fe08428c1)

* test(stock): add test to create pr for asset item without checking the stock account

(cherry picked from commit 8cf4402823)

---------

Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-05-16 11:52:23 +00:00
khushi8112
07a957c164 fix: skip rescheduling only for asset being disposed 
(cherry picked from commit 88b82383f5)
 2026-04-29 21:05:17 +00:00
khushi8112
d3c893d08b fix: skip depreciation rescheduling when asset is fully depreciated on sale 
(cherry picked from commit c4155b6c81)
 2026-04-29 21:05:17 +00:00
ruthra kumar
91a748d9bf refactor(test): remove explicit sql delete calls 
(cherry picked from commit b16dd3f2dd)
 2026-04-22 05:43:48 +00:00
ravibharathi656
b7f1677eef fix: preserve asset movement field properties after save 
(cherry picked from commit 4a004a2a82)
 2026-04-08 06:28:27 +00:00
ervishnucs
21f36f5c21 fix: remove null from link_filters 
(cherry picked from commit a518a735f3)
 2026-04-07 07:00:44 +00:00
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
37ad0665c6 refactor(test): make asset capitalization deterministic 
(cherry picked from commit 2c53cf3902)
 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
ruthra kumar
af614bd195 refactor(test): make location determinisitic 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
ruthra kumar
63908ad6dc refactor(test): remove redundant tearDown, tearDownClass and rollback 2026-03-19 12:57:11 +05:30
ruthra kumar
55ba1fa9aa refactor(test): make asset repair deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
6737ccac95 refactor(test): make asset deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
2c526ae856 refactor(test): make asset repair tests deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
29cf028f9a refactor: replace all IntegrationTestCase -> ERPNextTestSuite 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
f7e4d07a7e chore: delete all test_records.json 2026-03-19 11:33:34 +05:30
khushi8112
b000224a93 test: set up float precision 
(cherry picked from commit c0a85faa68)
 2026-03-19 05:47:07 +00:00
khushi8112
0af4cd9098 fix: do not update float precision on setup 
(cherry picked from commit 825e3717ca)
 2026-03-19 05:47:07 +00:00
khushi8112
b855f30600 refactor: modify test cases to handle float precision rounded to 2 decimals 
(cherry picked from commit 007258d657)
 2026-03-19 05:47:06 +00:00
khushi8112
1efbc60df1 fix: use correct test class 
(cherry picked from commit 8d186d6b3f)
 2026-03-19 05:47:06 +00:00
khushi8112
dd7cc56dfe fix(test): Use the system-configured float precision 
(cherry picked from commit 1296829b9c)
 2026-03-19 05:47:06 +00:00
khushi8112
bb98acb0c0 fix: update label on company change 
(cherry picked from commit 6219a9e6f0)
 2026-03-12 19:19:15 +00:00
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