mergify[bot]
fee4cd5f40
fix: provide filter by depreciable assets in fixed asset register ( #34803 )
...
fix: provide filter by depreciable assets in fixed asset register (#34803 )
(cherry picked from commit c957a5cd2eanandbaburajan@gmail.com >
2023-04-11 13:50:04 +05:30
Hossein Yousefian
50abbded34
'Make Asset Movement' button translation fix
...
(cherry picked from commit b70615ef18
2023-04-07 10:01:19 +00:00
Anand Baburajan
88c8c36805
fix: asset monthly WDV and DD schedule [v14] ( #34644 )
...
* fix: monthly wdv and dd schedule
* chore: handle case without pro rata
* chore: fix DD rate and prev depr amount in case of disposal
* chore: minor fix for schedules with just 2 rows
* chore: minor bug
* refactor: get_depreciation_amount
* refactor: another one for get_depreciation_amount
2023-04-05 11:45:45 +05:30
Anand Baburajan
a0df23415b
chore: improve asset depr posting failure msg ( #34661 )
...
* chore: improve asset depr posting error msg
* chore: add period
* chore: improve msg
(cherry picked from commit d999dea3e4
2023-03-30 11:09:32 +00:00
mergify[bot]
8510c398a4
chore: auto fill asset name and available for use date (backport #34660 ) ( #34662 )
...
* chore: auto fill asset name and available for use date
(cherry picked from commit af3e807607anandbaburajan@gmail.com >
2023-03-30 16:37:35 +05:30
anandbaburajan
8d9305ee5f
fix: incorrect arg name in asset value adjustment
...
(cherry picked from commit 2b0470d1f5
2023-03-30 07:34:09 +00:00
Bevan Tony Medrano
e3de229b82
Asset maintenance task add dropdown "3 Yearly" ( #34607 )
...
* feat(asset_maintenance.json):Add 3 yearly in periodicity dropdown
* add server side implications for 3 yearly
(cherry picked from commit 625b8e8005
2023-03-29 12:15:40 +00:00
Anand Baburajan
d2ca6f8d1f
fix: recalculate WDV rate after asset repair [v14] ( #34571 )
...
fix: recalculate wdv rate after asset repair
2023-03-23 21:08:59 +05:30
Anand Baburajan
560df6330a
fix: incorrect depr schedules after asset repair [v14] ( #34527 )
...
* fix: backport missing changes from #30838
* fix: incorrect schedule after repair
2023-03-21 14:31:23 +05:30
anandbaburajan
d56ca011fe
chore: refactor long if conditions
2023-02-26 15:03:16 +05:30
anandbaburajan
75386e3653
chore: should prepare schedule if not draft
2023-02-25 21:17:18 +05:30
anandbaburajan
dda6baea3e
fix: incorrect acc depr amount if multiple FBs with straight line or manual method
2023-02-25 14:43:24 +05:30
anandbaburajan
b0d670a51d
chore: handle change in opening_accumulated_depreciation properly
2023-02-24 20:35:29 +05:30
anandbaburajan
971c0720e5
fix: manual depr schedule
2023-02-24 16:38:39 +05:30
anandbaburajan
7074c2b161
fix: fiscal year error for existing assets in fixed asset register
...
(cherry picked from commit 76861eb332
2023-02-21 08:25:46 +00:00
anandbaburajan
03f07a20e7
fix: asset repair status after deletion and asset status after manual depr entry
2023-02-17 15:32:55 +05:30
anandbaburajan
47cc8ab6c6
fix: opening_accumulated_depreciation and precision in charts
2023-02-13 17:22:54 +05:30
Anand Baburajan
f487eae28e
fix: manual depr entry not updating asset value [v14] ( #33788 )
...
* fix: get value_after_depreciation functions and manual depr entry not updating asset value
* fix: reflect manual depr entry in chart and fixed asset register
* fix: add linked JEs in asset connections
* chore: add test
* chore: add patch and fix some things
* chore: get depreciation_expense_account properly
* chore: fix patch
* chore: fix patch
* chore: fix patch again
* chore: rename var in patch
* fix: filter assets with finance books properly
* chore: refactor get_value_after_depreciation
* chore: use dict format for filters in assets_linked_to_fb
* chore: refactor update_asset_value
* chore: sort manual depr entries
2023-01-31 10:59:38 +05:30
anandbaburajan
4586806ed1
fix: disposal_was_made_on_original_schedule_date
2023-01-30 21:25:04 +05:30
anandbaburajan
9e2329dcfa
chore: rename date_of_sale to date_of_disposal
2023-01-21 19:54:14 +05:30
anandbaburajan
96f9b34b19
fix: incorrect row order and accumulated_depreciation when schedule with multiple FBs is scrapped
2023-01-21 18:40:57 +05:30
anandbaburajan
dffdc67455
fix: fb issue in asset chart, asset split and reverse_depreciation_entry_made_after_disposal
2023-01-20 15:38:26 +05:30
anandbaburajan
bc55f44de6
fix: asset repair link
2023-01-16 23:36:46 +05:30
mergify[bot]
4d2497faf1
fix: asset value in fixed asset register ( #33608 )
...
fix: asset value in fixed asset register
(cherry picked from commit aa1f2a7297anandbaburajan@gmail.com >
2023-01-15 17:33:39 +05:30
anandbaburajan
4fbf65dd57
chore: use frappe.db.set_value instead of asset.save
2022-12-08 21:04:08 +05:30
anandbaburajan
bb66b64b94
chore: styling
2022-12-08 01:35:10 +05:30
anandbaburajan
b661f5758a
fix: handle_post_depr_entries_fail, show error alert and send email
2022-12-08 01:00:57 +05:30
anandbaburajan
fc175e2b1f
fix: use is_last_day_of_the_month in test_scrap_asset
2022-12-01 13:01:23 +05:30
anandbaburajan
0fe5e9a9d1
fix: precision in asset test_scrap_asset
...
(cherry picked from commit 0e726609f1
2022-11-24 10:44:31 +00:00
anandbaburajan
ecd4eab2da
fix: add missing commas and brackets
...
(cherry picked from commit 218da1217a
2022-11-17 12:22:41 +00:00
anandbaburajan
444f241263
fix: precision in asset tests
...
(cherry picked from commit b5e5d3b3af
2022-11-17 12:22:41 +00:00
Ankush Menat
1db83247ce
chore: hardcode doctype
2022-11-17 12:01:11 +05:30
anandbaburajan
01a1c96314
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
...
(cherry picked from commit f322c608cf
2022-11-03 04:22:14 +00:00
anandbaburajan
d1b2786f24
fix: pro_rata_amount calculation in assets tests
...
(cherry picked from commit 65e855bfff
2022-11-01 09:48:04 +00:00
Hossein Yousefian
4035873295
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
(cherry picked from commit 54c2ffc36b
2022-10-29 16:55:25 +00:00
Deepesh Garg
34845b7630
Merge pull request #32459 from frappe/mergify/bp/version-14-hotfix/pr-32454
...
fix: test_scrap_asset not working on end of month (backport #32454 )
2022-10-03 09:04:01 +05:30
anandbaburajan
c0a141bfcd
fix: asset requiring maintenance sold status and added test [v14-hotfix]
2022-10-02 18:27:37 +05:30
anandbaburajan
fd232d1db7
fix: test_scrap_asset
...
(cherry picked from commit 47bd4be71b
2022-10-02 12:15:55 +00:00
anandbaburajan
381231257b
chore: fix merge conflicts
2022-09-29 11:59:53 +05:30
anandbaburajan
b3b7650ac8
chore: add blank lines
...
(cherry picked from commit c6a7de0e54
2022-09-28 08:59:43 +00:00
anandbaburajan
86052450a5
fix: fix restore asset value after depreciation
...
(cherry picked from commit 43a3400221
2022-09-28 08:59:42 +00:00
anandbaburajan
bad3b330f4
fix: refactor asset capitilization
...
(cherry picked from commit 5a8b28c194
2022-09-28 08:59:42 +00:00
anandbaburajan
671033755f
fix: asset tests
...
(cherry picked from commit 11ac20e5ee
2022-09-28 08:59:41 +00:00
anandbaburajan
f5f13c4611
fix: calculate depreciation properly on asset sale entry and scrap entry
...
(cherry picked from commit ff5cad1cd6
2022-09-28 08:59:41 +00:00
mergify[bot]
a28ae4d653
fix: Scrap Asset Accounting Dimensions (backport #31949 ) ( #32376 )
...
fix: Scrap Asset Accounting Dimensions (#31949 )
* fix: Scrap Asset Accounting Dimensions
(cherry picked from commit c760ca232339730881+maharshivpatel@users.noreply.github.com >
2022-09-27 17:07:38 +05:30
Deepesh Garg
4939153f8c
fix: Depreciation posting date only when calculate depreciation is checked
...
(cherry picked from commit fac82cf69b
2022-09-20 09:18:22 +00:00
Nabin Hait
5cab0aa1d7
fix: disable cwip in asset repair tests
2022-09-16 11:44:25 +05:30
Nabin Hait
f126e88e5e
fix: test cases
2022-09-14 18:31:15 +05:30
Nabin Hait
38c31077c9
feat: Asset Capitalization
...
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 16:21:06 +05:30
Nabin Hait
cd613c6033
fix: merge conflict
2022-09-13 16:20:42 +05:30
