Commit Graph

790 Commits

Author SHA1 Message Date
Anand Baburajan
9a171db97f fix: asset depreciation ledger (#37991)
* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'
2023-11-08 22:02:09 +05:30
viralkansodiya15
e5bc8fccb1 fix: list index out of range (#37890)
* fix: list index out of range

* fix: solve linter test failing
2023-11-05 11:54:35 +05:30
Anand Baburajan
2ce6bbf291 chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (#37897)
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based
2023-11-03 20:11:46 +00:00
Anand Baburajan
568d5bfbe8 chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (#37893)
* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month

* chore: add patch

* chore: remove unnecessary files

* chore: add amount in field name

* chore: add amount in label
2023-11-03 22:35:08 +05:30
rohitwaghchaure
77af247450 chore: fixed test cases (#37792) 2023-10-31 18:02:24 +05:30
David Arnold
139a68fd0f test: fix bad test data (#37773)
* test(stock): fix bad test data

* test(asset): fix bad test data

* test(stock): fix bad test data

* test(manufacturing): fix bad test data
2023-10-31 16:50:09 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
Anand Baburajan
d99a56bc27 chore: allow wip_composite_asset in the MR PO PR PI flow (#37723) 2023-10-27 18:54:36 +05:30
Deepesh Garg
11d956fa18 fix: Purchase Receipt GL Entries (#37642)
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
2023-10-24 14:28:19 +05:30
Deepesh Garg
d1ec0a6093 chore: Add missing commits back (#37618)
* chore: Add missing commits back

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries
2023-10-23 00:16:40 +05:30
Anand Baburajan
18e3a8907a fix: don't set finance books if gross_purchase_amount is not set (#37480) 2023-10-12 19:41:11 +05:30
anandbaburajan
9468513d7c test: fixing test_capitalization_with_wip_composite_asset 2023-10-04 22:11:15 +05:30
mergify[bot]
f4f40cc776 feat: composite WIP asset (copy #37352) (#37353)
* feat: wip composite asset

(cherry picked from commit 4907e7acd4)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-10-04 10:29:18 +05:30
Anand Baburajan
fed94845ce feat: asset salvage_value_percentage (#37302)
* feat: asset salvage_value_percentage

* chore: add missing parameter in get_item_details

* chore: change asset depr table colors
2023-10-03 12:21:17 +05:30
Marica
d6e4f80187 fix: Set serial_and_batch_bundle in right field for Asset Repair Stock Entry (#37273)
fix: Set `serial_and_batch_bundle` in same field for Asset Repair SE
- `serial_and_batch_bundle` was earlier set in `serial_no` field
2023-09-27 23:34:57 +05:30
HENRY Florian
34bb64e41a fix(ux): move get_route_options_for_new_doc to refresh (#37096)
fix: move `get_route_options_for_new_doc` to `refresh`
2023-09-16 15:59:09 +05:30
Bernd Oliver Sünderhauf
846ae32d92 feat: Add half-yearly asset maintenance periodicity. (#37006) 2023-09-10 17:00:01 +05:30
Anand Baburajan
034322c53f fix: correct asset daily depr schedule calculation [dev] (#36993)
fix: correct asset daily depr schedule calculation
2023-09-06 22:20:38 +05:30
Anand Baburajan
0077659e93 chore: asset finance books validation (#36979) 2023-09-06 12:44:07 +05:30
Anand Baburajan
4f0bb45a8b chore: patch to correct asset values if je has workflow [dev] (#36914)
chore: patch to correct asset values if je has workflow
2023-09-02 18:31:32 +05:30
Suraj Shetty
e92d4e9b4a Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype 2023-08-30 16:46:00 +05:30
RitvikSardana
de433d8626 fix: added ignore_user_permissions to parent field of tree doctypes 2023-08-29 13:07:13 +05:30
ViralKansodiya
3a2933db4d fix: error in report when data is not available to load chart in report (#36842) 2023-08-28 18:14:52 +05:30
Anand Baburajan
bb3bd02f53 chore: styling improvements for asset depr sch table (#36792)
* chore: improve asset depr sch table

* chore: fix text color
2023-08-23 19:22:25 +05:30
Anand Baburajan
56b26852f3 fix: use current asset depr schedule to make temp schedule (#36783)
fix: use current depr schedule to make temp schedule
2023-08-23 18:01:59 +05:30
Anand Baburajan
87e2309e8e fix: avoid duplicate asset activity entries on asset capitalization (#36756) 2023-08-22 15:30:04 +05:30
Anand Baburajan
8f04945cef fix: incorrect schedule in asset value adjustment (#36747) 2023-08-22 12:36:09 +05:30
Anand Baburajan
e0c79d3b53 chore: add validation for depreciation expense account in asset category (#36659) 2023-08-15 10:17:15 +00:00
Anand Baburajan
98e82e0d99 chore: set default filter dates if missing (#36597) 2023-08-11 08:51:48 +00:00
Anand Baburajan
d138948c70 feat: daily asset depreciation method [dev] (#36588)
feat: daily asset depreciation method
2023-08-10 17:46:01 +00:00
Anand Baburajan
ad33cd73e8 perf: asset depreciation entry posting [develop] (#36555)
* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: fixing minor mistake

* chore: fix asset_value_adjustment test
2023-08-09 20:26:28 +05:30
mergify[bot]
b717e2b5bf chore: don't merge asset capitalization gl entries (copy #36514) (#36515)
chore: don't merge asset capitalization gl entries

(cherry picked from commit 3c8f292ac3)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-08-06 23:44:22 +05:30
Anand Baburajan
38a612c62e chore: better cost center validation for assets (#36477) 2023-08-03 16:37:05 +05:30
Anand Baburajan
a8df875820 chore: use datatable for asset depr sch table view (#36449)
* chore: use datatable for asset depr sch table view

* chore: remove unnecessary code
2023-08-01 21:14:27 +05:30
Anand Baburajan
2ab3d75274 feat: asset activity (#36391)
* feat: asset activity

* chore: add more actions to asset activity

* chore: fix failing test due to timestamp mismatch error

* chore: rewriting asset activity messages

* chore: add report and add it to workspace

* chore: show user in list view
2023-08-01 12:00:24 +05:30
mergify[bot]
3f09f811bf fix: allow fully depreciated existing assets (copy #36378) (#36379)
* fix: allow fully depreciated existing assets

(cherry picked from commit 9489cba275)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/depreciation.py

* chore: fix conflicts in asset.json

* chore: fix conflicts in depreciation.py

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-08-01 11:20:04 +05:30
Anand Baburajan
5e7b05e566 chore: adding totals in asset reports (#36334) 2023-07-26 21:57:18 +05:30
Anand Baburajan
f28f8dc596 fix: show depr schedule table in asset doc (#36332) 2023-07-26 15:59:37 +05:30
mergify[bot]
eead2bba9f fix: group by in fixed asset register (copy #36310) (#36311)
fix: group by in fixed asset register

(cherry picked from commit 1151e47f46)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-25 20:58:41 +05:30
Deepesh Garg
3f81e15672 Merge pull request #36147 from deepeshgarg007/eslint
refactor(ci): add eslint and update linting confs
2023-07-24 20:55:07 +05:30
mergify[bot]
1bc87a970a fix: set new purchase_receipt_amount on asset split (copy #36272) (#36280)
fix: set new purchase_receipt_amount on asset split

(cherry picked from commit 7fd9b489ee)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-24 19:37:07 +05:30
mergify[bot]
1436040d4c fix: allow both custodian and location while creating asset (copy #36263) (#36264)
fix: allow both custodian and location while creating asset

(cherry picked from commit bff00bc8b2)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-24 15:51:24 +05:30
Deepesh Garg
6270607c6d fix: Remove current fiscal year from Global Defaults (#35960)
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
2023-07-16 12:58:42 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
mergify[bot]
8580287092 fix: allow manual asset receipt mov from nowhere (backport #36093) (#36094)
fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a15d7)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-07-12 08:26:49 +05:30
mergify[bot]
b3a99e38cc chore: add asset depr posting error in error log (backport #36052) (#36055)
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-07-10 14:31:19 +05:30
Anand Baburajan
a4d6f2eba6 fix: asset movement (#35918)
fix: asset movement fixes
(cherry picked from commit e16c14863b)
2023-06-28 14:46:27 +00:00
mergify[bot]
9a993b0364 fix: show non-depreciable assets in fixed asset register (backport #35858) (#35860)
fix: show non-depreciable assets in fixed asset register (#35858)

fix: show non-depr assets in fixed asset register
(cherry picked from commit 42d09448ee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-23 08:25:00 +05:30
mergify[bot]
e745312a10 fix: asset capitalization (backport #35832) (#35843)
* fix: asset capitalization (#35832)

* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization

(cherry picked from commit fb823b53d1)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py

* chore: fixing conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-22 19:21:52 +05:30