Anand Baburajan
e08d636bf7
fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register ( #35031 )
...
fix: use filter_by_finance_book instead of only_depreciable_assets
2023-04-25 15:16:50 +05:30
Anand Baburajan
ca388ed9cd
fix: value of depreciable assets not updating after manual depr entry [develop] ( #35020 )
...
* fix: value of depreciable assets not updating after manual depr entry
* chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all
2023-04-25 12:45:05 +05:30
Anand Baburajan
c957a5cd2e
fix: provide filter by depreciable assets in fixed asset register ( #34803 )
2023-04-11 12:16:07 +05:30
Anand Baburajan
29e025c012
Merge pull request #34778 from AnandBaburajan/asset_value_adjust_get_depr_amt
...
fix: improper usage of get_depreciation_amount in asset_value_adjustment
2023-04-07 16:48:06 +05:30
Anand Baburajan
90dee8b663
Merge pull request #34735 from ihosseinu/asset_movement_translation_fix
...
'Make Asset Movement' button translation fix in asset_list.js
2023-04-07 15:30:26 +05:30
anandbaburajan
984905109d
fix: improper usage of get_depreciation_amount in asset_value_adjustment
2023-04-07 15:23:02 +05:30
Anand Baburajan
5cc3c08059
fix: asset monthly WDV and DD schedule and refactor [develop] ( #34646 )
...
* fix: monthly wdv and dd schedule
* chore: minor rename
* chore: fix tests
2023-04-05 11:46:31 +05:30
Hossein Yousefian
b70615ef18
'Make Asset Movement' button translation fix
2023-04-04 14:49:43 +03:30
Anand Baburajan
d999dea3e4
chore: improve asset depr posting failure msg ( #34661 )
...
* chore: improve asset depr posting error msg
* chore: add period
* chore: improve msg
2023-03-30 16:38:37 +05:30
anandbaburajan
af3e807607
chore: auto fill asset name and available for use date
2023-03-30 15:28:59 +05:30
anandbaburajan
2b0470d1f5
fix: incorrect arg name in asset value adjustment
2023-03-30 12:50:33 +05:30
Bevan Tony Medrano
ddc3050e99
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 625b8e800537cceabffda50a0bbed1effc2e2aa5)
2023-03-29 12:16:03 +00:00
Anand Baburajan
e6b0196493
fix: recalculate wdv rate after asset repair [develop] ( #34570 )
...
fix: recalculate wdv rate after asset repair
2023-03-23 21:10:22 +05:30
Anand Baburajan
6d6a7bcb50
fix: incorrect depr schedules after asset repair [develop] ( #34544 )
...
* fix: backport missing changes from #30838
* fix: incorrect schedule after repair
2023-03-21 20:07:27 +05:30
Anand Baburajan
b6b8392413
fix: refactor asset depr schedule and remove unnecessary depr method ( #34434 )
...
* fix: remove depr method from depr schedule and refactor assetdeprsch
* chore: use assetdeprsch's depr method, not deprschedule's
* fix: use default 0 value for NDB and OAD
* chore: fix rounded numbers
* chore: correct rounding in test_website_item_price_for_logged_in_user
2023-03-16 18:18:47 +05:30
anandbaburajan
dd74839eba
fix: manual depr schedule
2023-02-26 17:36:36 +05:30
anandbaburajan
76861eb332
fix: fiscal year error for existing assets in fixed asset register
2023-02-21 13:04:01 +05:30
anandbaburajan
e50bd52162
fix: asset repair status after deletion and asset status after manual depr entry
2023-02-17 15:32:24 +05:30
anandbaburajan
c533213225
fix: opening_accumulated_depreciation and precision in charts
2023-02-13 17:22:31 +05:30
anandbaburajan
e5da0d7a63
chore: refactor AssetDepreciationSchedule
2023-02-03 22:23:17 +05:30
anandbaburajan
8ea9e4576f
fix: asset value for manual depr entries
2023-02-03 21:43:18 +05:30
barredterra
11d165c274
fix(Fixed Asset Register): error when selecting more than one fiscal year
2023-01-30 19:33:58 +01:00
anandbaburajan
f487660a7c
fix: disposal_was_made_on_original_schedule_date
2023-01-30 21:33:43 +05:30
anandbaburajan
86cf5c89ab
chore: add depr_entry_posting_status in create_asset
2023-01-17 00:31:21 +05:30
anandbaburajan
cebb5a42f4
chore: add missing /n in options
2023-01-17 00:26:50 +05:30
anandbaburajan
a144bb01fe
chore: stying
2023-01-16 23:26:39 +05:30
anandbaburajan
cf7b43f7f0
fix: handle_post_depr_entries_fail, show error alert and send email
2023-01-16 23:10:02 +05:30
anandbaburajan
61cd0f98fd
fix: asset repair link and improve notes
2023-01-16 18:35:40 +05:30
Poruri Sai Rahul
8119442c94
FIX: Remove usage of "six.string_types" ( #33603 )
...
FIX: Remove usage of six.string_types
six is no longer a dependency
2023-01-16 08:47:28 +05:30
anandbaburajan
aa1f2a7297
fix: asset value in fixed asset register
2023-01-10 23:05:09 +05:30
anandbaburajan
312e51e8b2
chore: more refactoring and adding test for duplicate asset_depr_schedule
2023-01-03 15:09:04 +05:30
anandbaburajan
7c5168eeac
chore: allow manually submitting and cancelling asset depr schedule
2023-01-02 17:07:28 +05:30
anandbaburajan
482116db9f
chore: improve tests
2022-12-27 10:03:32 +05:30
anandbaburajan
6d791cabd1
chore: more refactoring
2022-12-26 22:13:11 +05:30
anandbaburajan
03662be150
chore: have different functions for draft. active and cancelled depr schedules
2022-12-25 18:05:19 +05:30
anandbaburajan
3e91a56c19
chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed
2022-12-23 11:01:18 +05:30
anandbaburajan
a358f77774
chore: move patch to post_model_sync and cancel asset depr schedule properly
2022-12-15 14:50:53 +05:30
anandbaburajan
7f5e761c04
chore: add patch
2022-12-15 13:13:04 +05:30
anandbaburajan
c99cd74a15
chore: handle some error cases and add empty patch file
2022-12-14 13:20:37 +05:30
anandbaburajan
22ef342ac7
chore: fixing all tests
2022-12-13 20:48:34 +05:30
anandbaburajan
df134c7c5b
chore: fixing some tests
2022-12-13 16:26:33 +05:30
anandbaburajan
28d4942d6c
chore: fix validation and add make_schedules_editable
2022-12-12 18:19:34 +05:30
anandbaburajan
1ea2ba0dea
chore: handle some cases where asset_depr_schedule doesn't exist
2022-12-12 17:31:57 +05:30
anandbaburajan
b997d1eb87
chore: add some validation, shorten some function names
2022-12-12 17:25:38 +05:30
Anand Baburajan
f8cd424559
Merge branch 'develop' into asset_depreciation_schedule
2022-12-12 16:36:59 +05:30
anandbaburajan
ec6505d747
chore: fix some bugs, refactor some functions, add proper notes
2022-12-12 16:35:30 +05:30
anandbaburajan
90e1b9cb3d
chore: fix asset depr schedule notes
2022-12-09 16:18:40 +05:30
anandbaburajan
16365bfca3
chore: more refactoring
2022-12-09 14:04:00 +05:30
anandbaburajan
77dc8e7966
fix: bug in posting depr entries
2022-12-09 00:58:19 +05:30
anandbaburajan
187e1a324a
chore: refactor get_depreciable_assets
2022-12-09 00:46:56 +05:30
anandbaburajan
1fd73af744
chore: refactor some reports
2022-12-09 00:28:34 +05:30
anandbaburajan
2cd42dbb10
chore: refactor get_finance_book_value_map
2022-12-06 23:16:02 +05:30
anandbaburajan
e7d404a30a
chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions
2022-12-06 21:33:20 +05:30
anandbaburajan
8365d6bdb7
fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug
2022-12-06 17:58:38 +05:30
anandbaburajan
83ed93fbb6
chore: refactor chart and manual set_accumulated_depreciation logic
2022-12-04 22:45:48 +05:30
anandbaburajan
ca8c827492
chore: refactor schedules in split_asset functions
2022-12-04 19:22:58 +05:30
anandbaburajan
f20238fa3e
chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data
2022-12-01 15:15:32 +05:30
anandbaburajan
827ad01d4f
chore: style
2022-11-30 23:57:26 +05:30
anandbaburajan
25522444b8
fix: use is_last_day_of_the_month in test_scrap_asset
2022-11-30 23:25:40 +05:30
anandbaburajan
96ede2fcf9
fix: bug in new depr schedule
2022-11-29 21:30:23 +05:30
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
anandbaburajan
de17367a36
chore: finish refactoring asset_value_adjustment
2022-11-24 16:16:36 +05:30
anandbaburajan
0e726609f1
fix: precision in asset test_scrap_asset
2022-11-24 15:38:05 +05:30
anandbaburajan
f35b19eac3
chore: renaming functions and variables again, and continuing refactoring AssetValueAdjustment
2022-11-24 15:33:21 +05:30
anandbaburajan
7db66b0916
chore: renaming some functions and variables, and partially refactoring AssetValueAdjustment
2022-11-24 13:02:48 +05:30
anandbaburajan
76f28de7eb
chore: refactor more functions to use new depr schedule
2022-11-23 18:04:54 +05:30
Anand Baburajan
a66d9f8e8e
Merge branch 'develop' into asset_depreciation_schedule
2022-11-17 20:17:21 +05:30
anandbaburajan
218da1217a
fix: add missing commas and brackets
2022-11-17 12:23:38 +05:30
Anand Baburajan
538da9a58e
Merge branch 'develop' into fix_precision_in_asset_tests
2022-11-17 12:17:27 +05:30
anandbaburajan
b5e5d3b3af
fix: precision in asset tests
2022-11-17 12:13:06 +05:30
Ankush Menat
1bd886387b
chore: hardcode doctype
2022-11-17 11:58:35 +05:30
anandbaburajan
417180e6ba
chore: refactor some functions to use new depr schedule
2022-11-14 17:51:11 +05:30
anandbaburajan
ffd41703de
chore: add expected_value_after_useful_life in depr schedule
2022-11-14 14:36:10 +05:30
anandbaburajan
ca3581d055
chore: rename modify_draft_asset_depreciation_schedules
2022-11-14 12:47:48 +05:30
anandbaburajan
ed495dc846
chore: add convert_draft_asset_depreciation_schedules_into_active and fix some bugs
2022-11-14 12:45:49 +05:30
anandbaburajan
97ab7bd36b
chore: remove some unwanted functions in asset
2022-11-11 16:27:29 +05:30
anandbaburajan
710d2452b7
feat: moving, refactoring and adding functions to asset_depreciation_schedule
2022-11-11 16:20:17 +05:30
Anand Baburajan
05d2c7f9ae
Merge branch 'develop' into asset_bill_date_new
2022-11-01 17:45:23 +05:30
anandbaburajan
65e855bfff
fix: pro_rata_amount calculation in assets tests
2022-11-01 12:45:28 +05:30
anandbaburajan
5a274176d3
feat: add asset_depreciation_schedule
2022-11-01 11:45:17 +05:30
anandbaburajan
f322c608cf
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-10-31 12:41:37 +05:30
Hossein Yousefian
54c2ffc36b
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
2022-10-29 22:24:59 +05:30
Ernesto Ruiz
8f0e63cd27
fix: add translate function on remark text on make_depreciation_entry in asset_value_adjustment.py
2022-10-26 13:56:35 -06:00
Deepesh Garg
601880f1ce
Merge pull request #32454 from AnandBaburajan/fix_test_scrap_asset
...
fix: test_scrap_asset not working on end of month
2022-10-02 17:44:46 +05:30
anandbaburajan
47bd4be71b
fix: test_scrap_asset
2022-10-01 17:04:22 +05:30
anandbaburajan
28952eda87
chore: remove unused function
2022-09-29 15:33:45 +05:30
anandbaburajan
f1169fb213
chore: refactor by just using a filter
2022-09-29 15:32:01 +05:30
anandbaburajan
b734f9d237
chore: refactor by creating is_sold
2022-09-29 08:54:35 +05:30
anandbaburajan
f4bf9c672f
chore: rewrite query using frappe.qb
2022-09-28 18:20:20 +05:30
Anand Baburajan
0618f606b2
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 16:42:21 +05:30
anandbaburajan
a8dd3c3a7c
chore: adding missing asset statuses
2022-09-28 16:39:14 +05:30
anandbaburajan
1725672168
chore: adding missing asset statuses
2022-09-28 16:22:35 +05:30
anandbaburajan
f9f68005a5
fix: asset requiring maintenance sold status
2022-09-28 16:21:31 +05:30
anandbaburajan
c6a7de0e54
chore: add blank lines
2022-09-27 20:43:08 +05:30
anandbaburajan
14e2d31619
test: adding test_asset_with_maintenance_required_status_after_sale
2022-09-27 20:19:01 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 15:56:39 +05:30
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions ( #31949 )
...
* fix: Scrap Asset Accounting Dimensions
2022-09-27 15:31:36 +05:30
Deepesh Garg
fac82cf69b
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-18 19:41:05 +05:30
anandbaburajan
43a3400221
fix: fix restore asset value after depreciation
2022-09-15 23:25:04 +05:30
anandbaburajan
5a8b28c194
fix: refactor asset capitilization
2022-09-15 22:52:25 +05:30
