RitvikSardana
de433d8626
fix: added ignore_user_permissions to parent field of tree doctypes
2023-08-29 13:07:13 +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
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 3c8f292ac3943ddad52a7041d8910552d47abf0a)
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 9489cba275525a93d92c00f62569888a219a8912)
# 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
f28f8dc596
fix: show depr schedule table in asset doc ( #36332 )
2023-07-26 15:59:37 +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 7fd9b489eed33a81f29ecb3802d8a07d232c4c9c)
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 bff00bc8b2c8911f1513a25f066077e2b0c0adf0)
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-24 15:51:24 +05:30
Deepesh Garg
3fa2a8c2d8
chore: fix linting issues
2023-07-15 18:03:16 +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 4aaa1a15d7dfe9ad81d3cc1f000dac3e324cfa6f)
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 0f9a6ee70acc88a1190fc66fb95a3bd5d6dea02f)
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 e16c14863b52aaa7856c799ad64fe977d4a4fbbe)
2023-06-28 14:46:27 +00:00
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 fb823b53d1d9a631035016fa3b33003bf8ce297a)
# 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
mergify[bot]
39a1f4a4c1
fix: issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport #35821 ) ( #35826 )
...
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (#35821 )
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry
* chore: remove unnecessary line break
* chore: formatting
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 000ebe447991185e4d5a4050b066fa0781575e65)
# Conflicts:
# erpnext/assets/doctype/asset/depreciation.py
* chore: resolve conflicts
---------
Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-21 15:38:06 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting
...
chore: remove whitelisting for methods not accessed from UI
2023-06-20 20:29:49 +05:30
s-aga-r
4b5454c752
fix(ux): set route options for new SBB
2023-06-16 15:04:37 +05:30
Anand Baburajan
bb39a2cac7
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets ( #35714 )
...
fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
2023-06-15 17:12:59 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError
...
fix: miscellaneous
2023-06-14 16:02:04 +05:30
s-aga-r
7549a5c371
fix(ux): add filters for SBB
2023-06-14 15:04:51 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value
( #35668 )
...
I just applied semgrep autofix. Untested completed, review before merging.
```yaml
- id: frappe-set-value-semantics
patterns:
- pattern-either:
- pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
- pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
message: |
If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
languages: [python]
severity: ERROR
```
2023-06-13 17:30:38 +05:30
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
DaizyModi
5155d5bfb2
chore: remove whitelisting for methods not accessed from UI
2023-06-07 12:05:17 +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