Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,398 Commits 3 Branches 0 Tags 1 GiB
b43e068852
Commit Graph

671 Commits

Author SHA1 Message Date
Anand Baburajan
7bd369c49b
fix: calculate wdv depr schedule properly for existing assets [dev] (#35614) 
* fix: calculate wdv depr schedule properly for existing assets

* fix: calculate wdv depr schedule properly for existing assets properly

* chore: properly call _get_pro_rata_amt
 2023-06-09 12:53:10 +05:30
Rohit Waghchaure
42b229435c fix: stock reco test case for serial and batch bundle 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
26b39ac7f4 fix: travis for asset capitalization and asset repair 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
440510337c fix: travis 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
16f26fb3d8 refactor: serial and batch package creation for finished item and cleanup code 2023-06-02 17:14:15 +05:30
Sagar Vora
517d8a03ec chore: remove whitelisting for method not accessed from UI 2023-05-31 14:39:03 +05:30
Anand Baburajan
dbdc420066
fix: allow assets with depr entries to be cancelled (#35477) 
fix: allow asset with depr entries to be cancelled
 2023-05-30 16:28:57 +05:30
Anand Baburajan
ae26d72f7f
fix: monthly wdv depr schedule for existing assets [dev] (#35460) 
fix: monthly wdv depr schedule for existing assets
 2023-05-29 23:18:07 +05:30
Anand Baburajan
edb7b0db8f
fix: incorrect depr schedule and posting dates on selling of existing assets [dev] (#35398) 
* fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates

* chore: get number_of_depreciations_booked properly

* chore: fix test_gle_made_by_asset_sale_for_existing_asset
 2023-05-24 12:29:46 +05:30
Anand Baburajan
8c53e0f004
fix: depreciation schedule for existing assets [dev] (#35256) 
* fix: depreciation schedule for existing assets

* chore: correct logic for existing assets and fix test

* chore: properly check if depr amount is non zero
 2023-05-17 22:29:09 +05:30
mergify[bot]
49674585a5
fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117) (#35119) 
fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117)

(cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-05-01 19:59:58 +05:30
Ernesto Ruiz
c4512d552e
chore: Add translate function to Depreciation Journal Entry Remark (#35022) 
chore: Add translate function to Depreciation Journal Entry Remark
 2023-04-25 20:56:53 +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
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
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
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
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