hanzoai/erp
2
0
Fork 0
mirror of https://github.com/hanzoai/erp.git synced 2026-09-30 21:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,869 Commits 2 Branches 0 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Khushi RawatandGitHub 6ed97b5fda fix: incorrect valuation rate due to positive qty (#47686) 2025-05-22 16:13:24 +05:30
Khushi RawatandGitHub 33ab64dec2 fix: asset cancellation issue (#47639) 2025-05-20 17:06:57 +05:30
Khushi RawatandGitHub 0f5be4b245 feat: is composite component checkbox (#47602) 
* feat: composite component

* chore: update mandatory depends on according to the new checkbox

* chore: validate disposal date for composite component asset

* fix: updated modified time
 2025-05-20 16:51:02 +05:30
Khushi RawatandGitHub ff2ccf9bce fix: asset image field updation issue (#47615) 2025-05-20 01:07:14 +05:30
Khushi RawatandGitHub 7bc974b65a Merge pull request #47573 from khushi8112/asset-capitalization-child-table-row-deletion 
fix: alias 'name' and 'parent' to prevent child row mapping issues
 2025-05-16 15:34:28 +05:30
Khushi Rawat 1ca51e4f14 fix: removed invalid child param to prevent callback failure 2025-05-16 15:08:16 +05:30
Khushi Rawat a418e377f4 fix: alias name and parent to prevent child row mapping issues 2025-05-16 15:02:26 +05:30
Khushi RawatandGitHub 0b1a316ad9 feat: non depreciable asset category 
feat: non depreciable asset category
 2025-05-13 17:03:13 +05:30
Khushi Rawat d715db1226 fix: only depreciable category assets are allowed for depreciation 2025-05-13 16:44:13 +05:30
Khushi Rawat 32cb7d6388 fix: do not mandate depreciation accounts for non depreciable asset category 2025-05-13 16:43:03 +05:30
Khushi Rawat fbbfd6531b feat: add non depreciable category checkbox in asset category 2025-05-13 16:40:59 +05:30
Khushi RawatandGitHub 2e992f937a refactor: Asset module code for better readability 
refactor: Asset module code for better readability
 2025-05-13 14:55:54 +05:30
Khushi Rawat 5e5795cba2 fix: patch conflict 2025-05-13 14:34:26 +05:30
Khushi Rawat 04e46ea787 fix: more changes in the test 2025-05-08 15:13:13 +05:30
Khushi Rawat 3465c21090 fix: failing test 2025-05-08 11:57:02 +05:30
Khushi Rawat dc06116425 fix: pass instance explicitly in static method 2025-05-08 11:57:02 +05:30
Khushi Rawat c9980c59e7 chore: adjust regional depreciation logic after refactor 2025-05-08 11:57:02 +05:30
Khushi Rawat 0e93c573a6 chore: uncomment previously disabled code 2025-05-08 11:57:02 +05:30
Khushi Rawat 89d10ad4e6 fix: fiscal year check in depreciation logic 2025-05-08 11:57:02 +05:30
Khushi Rawat 782d16c1a3 fix: linters related fix 2025-05-08 11:57:02 +05:30
Khushi Rawat e2cfd01bb2 test: asset splitting test 2025-05-08 11:57:02 +05:30
Khushi Rawat 6fa316177b fix(test): updated test for journal entry 2025-05-08 11:57:01 +05:30
Khushi Rawat 99e8c984ad fix(test): sales invoice test cases fixes 2025-05-08 11:57:01 +05:30
Khushi Rawat 3e32c30298 test: added tests on sale of an asset 2025-05-08 11:57:01 +05:30
Khushi Rawat 5d16936b9e fix(test): sales invoice test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat 42ccce1687 test: added tests for reschedule depreciation after asset revaluation cancellation 2025-05-08 11:57:01 +05:30
Khushi Rawat f5fa757bc6 fix(test): failing test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat cf1af451b8 fix(test): more fixes for failig test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat 881e5e3417 fix(test): asset value adjustment test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat 4b0279329f test: added tests for rescheduled depreciation after asset repair cancellation 2025-05-08 11:57:01 +05:30
Khushi Rawat 0e7ae25f65 fix(test): difference amount after asset revaluation 2025-05-08 11:57:01 +05:30
Khushi Rawat b3ffdb6517 fix(test): increase in asset life after asset repair 2025-05-08 11:57:01 +05:30
Khushi Rawat 6ac68ed1e7 fix(test): failing test and bug fixes for basic depreciation process 2025-05-08 11:57:01 +05:30
Khushi Rawat 229d3634b1 fix(test): calculate total pending days of depreciation correctly 2025-05-08 11:57:01 +05:30
Khushi Rawat 2391c859b2 fix: reset consumed asset's depreciation on capitalization cancel 2025-05-08 11:57:01 +05:30
Khushi Rawat a121c30b56 fix: update values of target asset on cancel of capitalization 2025-05-08 11:57:01 +05:30
Khushi Rawat 3855536ef1 fix: update status for composite asset 2025-05-08 11:57:01 +05:30
Khushi Rawat 8f1044a065 refactor: cleanup Assset Splitting code 2025-05-08 11:57:01 +05:30
Khushi Rawat c7cc7d61d1 fix(test): value after depreciation for asset doc 2025-05-08 11:57:01 +05:30
Khushi Rawat 223e8e1bdb fix(test): set root type to Expense 2025-05-08 11:57:01 +05:30
Khushi Rawat 48311ee5c5 fix: set depreciation rate before return 2025-05-08 11:57:01 +05:30
Khushi Rawat fe52e802ce refactor: depreciation booking code 2025-05-08 11:57:01 +05:30
Khushi Rawat 813164c25b fix: remove duplicate patch 2025-05-08 11:57:01 +05:30
Khushi Rawat 5f21d7ea1d chore: rebase from develop 2025-05-08 11:56:57 +05:30
Khushi Rawat 0e4706b074 fix: conflict in asset repair 2025-05-08 11:56:31 +05:30
Khushi RawatandGitHub 51ea33e743 fix: do not mandate depreciation account for assets without depreciation (#47427) 2025-05-06 14:53:13 +05:30
Khushi RawatandGitHub 05afad78fc fix: allow selling asset at zero rate (#47326) 2025-04-29 16:53:57 +05:30
Khushi RawatandGitHub 9dee4ac891 fix: prevent cancellation of last asset movement (#47291) 
* fix: prevent cancellation of last asset movement

* test: movement cancellation

* fix: allow cancellation of asset movement when cancelling asset
 2025-04-29 11:34:35 +05:30
Khushi RawatandGitHub ed8a8532e1 fix: update additional cost and total asset cost after asset repair (#47233) 
* fix: add consumed stock's cost to the asset value after repair

* fix: do not copy additional cost and total asset cost
 2025-04-24 16:14:42 +05:30
Khushi RawatandGitHub 0d53e6ed7c fix: make asset quantity and amount editable (#47226) 2025-04-24 01:54:00 +05:30
Khushi RawatandGitHub e41720f1a3 fix: enabled allow on submit for asset name field (#47093) 2025-04-15 16:59:16 +05:30
Khushi RawatandGitHub eec2e7e833 fix: correct accumulated depreciation calculation for disposed assets (#46660) 2025-03-23 18:38:06 +05:30
Khushi RawatandGitHub 29d77aa19f fix: repost future sle and gle after capitalization (#46576) 2025-03-18 15:59:58 +05:30
Khushi RawatandGitHub f50d479bfd fix: exclude already consumed purchase receipt items from asset capitalization (#46329) 
* feat: link purchase receipt row item to capitalization

* fix: avoid fetching already consumed stock and asset items during capitalization

* fix(patch): added patch to link purchase receipt item to stock item child table

* fix: added nosemgrep

* refactor: rename  to
 2025-03-05 17:39:24 +05:30
Khushi RawatandGitHub 4a542b22a4 fix: depreciation and balances report correction (#46259) 2025-03-05 12:29:23 +05:30
Khushi RawatandGitHub 4bf84f5c84 fix(asset depreciation schedules): enable auto commit 
Merge pull request #46201 from aerele/asset-depreciation-patch
 2025-03-03 12:11:08 +05:30
Khushi RawatandGitHub 83cafb892c Merge pull request #46022 from khushi8112/fetch-asset-location-from-purchase-doc 
fix: reset location only if there is value in row item location field
 2025-02-19 16:30:20 +05:30
Khushi Rawat 7f8d08c8eb fix: reset location only if there is value in row item location field 2025-02-19 16:02:01 +05:30
Khushi RawatandGitHub fa31a0282e Merge pull request #45898 from nabinhait/asset-depr-schedule-patch 
fix: patch for creating asset depreciation schedule records
 2025-02-19 15:37:27 +05:30
Khushi RawatandGitHub 38e1054eb7 Merge pull request #45872 from khushi8112/set-purchase-doc-row-item-to-asset 
fix: enable asset value editing for duplicate item code
 2025-02-19 15:30:53 +05:30
Khushi Rawat 2bb79197aa fix: reset location only if there is value in row item location field 2025-02-19 15:04:26 +05:30
Khushi RawatandGitHub 4821c44227 Merge pull request #45895 from khushi8112/fix-scrapping-of-fully-depreciated-asset 
fix: do not reschedule depreciation for fully depreciated asset on scrap
 2025-02-19 13:06:39 +05:30
Khushi Rawat 44c1425e73 fix: validate if no matching item found 2025-02-19 13:01:27 +05:30
Khushi Rawat fd4c4f98fa fix: do not reschedule depreciation for fully depreciated asset on scrap 2025-02-13 14:21:29 +05:30
Khushi Rawat da1b4cb9ab fix: link correct row item of purchase doc 2025-02-11 16:17:42 +05:30
Khushi Rawat 8af9dcb33e fix: make purchase_receipt_item and purchase_invoice_item fields of data type 2025-02-11 16:05:02 +05:30
Khushi RawatandGitHub f6fca3acec Merge pull request #45735 from khushi8112/asset-value-adjustment-cancellation-issue 
fix: set asset value correctly after cancelling value adjustment
 2025-02-05 15:25:47 +05:30
Khushi Rawat fee3846144 fix: set asset value correctly after cancelling value adjustment 2025-02-05 15:06:55 +05:30
Khushi RawatandGitHub 9ff3101b2d fix: added debounce to prevent multiple clicks (#45369) 
* fix: added debounce to prevent multiple clicks

* fix: linters check
 2025-01-22 17:26:38 +05:30
Khushi RawatandGitHub 7ea73d8265 chore: removal of decapitalization feature (#45162) 
* chore: removal of decapitalization feature

* fix: rearrangement of asset capitalization doctype fields
 2025-01-08 20:44:12 +05:30
Khushi RawatandGitHub 6850019649 feat: work in progress status for asset (#45066) 
* feat: work in progress status for asset

* fix: test case correction

* fix(patch): added patch to update status of assets

* fix: updated tests
 2025-01-07 17:38:21 +05:30
Khushi RawatandGitHub 079ec864de fix: copy accounting dimensions to asset and sales invoice (#44964) 
* fix: copy accounting dimensions to asset and sales invoice

* fix: replace sql query with query builder

* refactor: reuse function for accounting dimensions

* fix: loop handling

* fix: use explicit param
 2024-12-31 07:05:51 +00:00
Khushi RawatandGitHub 0b1c3208a0 Merge pull request #44854 from khushi8112/asset-fields-precision-check 
fix: asset fields precision check
 2024-12-24 00:00:34 +05:30
Khushi Rawat 2f7e6230a6 fix: test case correction 2024-12-23 23:37:51 +05:30
Khushi Rawat 92b8768ae2 fix: asset field precision check 2024-12-23 15:42:18 +05:30
Khushi RawatandGitHub d8f55923c9 Merge pull request #44690 from khushi8112/handle-zero-salvage-value-case 
fix: handle zero salvage value case
 2024-12-13 14:31:03 +05:30
Khushi Rawat 325b20491a fix: make rate of depreciation mandatory 2024-12-13 12:36:30 +05:30
Khushi Rawat d84aeef0bb fix: handle zero salvage value case 2024-12-13 12:31:38 +05:30
Khushi RawatandGitHub eac3ae5627 Merge pull request #44647 from khushi8112/rename-cost-to-value 
fix: switched asset terminology from cost to value
 2024-12-11 01:09:26 +05:30
Khushi Rawat ee9a2952d6 fix: switched asset terminology from cost to value 2024-12-11 00:18:04 +05:30
Khushi RawatandGitHub 968762cb3e Merge pull request #44631 from khushi8112/salvage-value-precision 
fix: precision check for salvage value
 2024-12-10 13:38:05 +05:30
Khushi Rawat da09316d4c fix: precision check for salvage value 2024-12-10 12:54:02 +05:30
Khushi RawatandGitHub 322c788760 Merge pull request #44537 from mahsem/patch-9 
fix: add title for translation in  asset.js
 2024-12-05 15:12:39 +05:30
Khushi RawatandGitHub 74624828e7 Merge pull request #44456 from khushi8112/missing-ctx-argument 
fix: missing ctx in API function calls
 2024-12-01 20:28:54 +05:30
Khushi Rawat 55cb1c54e0 fix: missing ctx in API function calls 2024-12-01 17:59:44 +05:30
Khushi RawatandGitHub af5dae8682 Merge pull request #44400 from khushi8112/asset-depreciation-error-index-error 
fix: IndexError in Asset Depreciation Ledger when query result is empty
 2024-11-28 12:56:21 +05:30
Khushi Rawat 1737de7c10 chore: removed print statement 2024-11-28 11:41:00 +05:30
Khushi Rawat 7c393e5aa0 fix: IndexError in Asset Depreciation Ledger when query result is empty 2024-11-28 11:36:05 +05:30
Khushi RawatandGitHub 9a5d68f1f4 Merge pull request #44187 from khushi8112/progressive-disclosure-assets 
style: added progressive disclosure to assets
 2024-11-27 22:00:19 +05:30
Khushi Rawat 4bdc6a0021 style: move depreciation details to a new tab 2024-11-20 11:56:34 +05:30
Khushi Rawat 87065d0387 chore: pre-commit check 2024-11-18 14:45:02 +05:30
Khushi Rawat e3d734c890 style: added progressive disclosure to assets 2024-11-18 14:40:32 +05:30
Khushi RawatandGitHub f5a8e72198 Merge pull request #43979 from khushi8112/correct-precision-for-asset-values 
fix: added precision validation
 2024-11-06 00:31:42 +05:30
Khushi Rawat 7daadcf420 fix: add precision validation 2024-11-05 23:36:26 +05:30
Khushi RawatandGitHub 22d46adf63 Merge pull request #43899 from khushi8112/rate-of-depreciation 
fix: consider opening asset values while calculating depreciation rate
 2024-10-30 00:05:22 +05:30
Khushi Rawat 9d0fe7aa56 fix: consider opening asset values while calculating asset depreciation rate 2024-10-29 17:47:48 +05:30
Khushi RawatandGitHub bd0c6056a5 Merge pull request #43770 from frappe/revert-43703-update-depreciation-checkbox-to-select 
chore: revert use selectbox instead of checkbox
 2024-10-22 13:16:58 +05:30
Khushi RawatandGitHub d47ab7870d Revert "chore: use selectbox instead of checkbox" 2024-10-22 12:37:06 +05:30
Khushi RawatandGitHub 10f359700e Merge pull request #43378 from khushi8112/add-email-field-to-asset-maintenance-log 
feat: added task assignee email field in asset maintenance log
 2024-10-22 01:13:14 +05:30
Khushi RawatandGitHub 52f1c7fac2 Merge pull request #43703 from khushi8112/update-depreciation-checkbox-to-select 
chore: use selectbox instead of checkbox
 2024-10-21 13:47:09 +05:30