chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
index 199f73f..14e849b 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
@@ -157,11 +157,10 @@
"read_only": 1
}
],
- "in_create": 1,
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-15 13:01:02.984906",
+ "modified": "2022-12-15 16:28:44.585745",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Depreciation Schedule",
@@ -169,6 +168,8 @@
"owner": "Administrator",
"permissions": [
{
+ "amend": 1,
+ "cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
@@ -176,8 +177,23 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "System Manager",
+ "role": "Accounts User",
"share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Quality Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
}
],
diff --git a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
index 11064a9..14d3689 100644
--- a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
+++ b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
@@ -2,7 +2,7 @@
def execute():
- assets = get_details_of_depreciable_assets()
+ assets = get_details_of_draft_or_submitted_depreciable_assets()
for asset in assets:
finance_book_rows = get_details_of_asset_finance_books_rows(asset.name)
@@ -32,19 +32,16 @@
if asset.docstatus == 1:
asset_depr_schedule_doc.status = "Active"
asset_depr_schedule_doc.submit()
- elif asset.docstatus == 2:
- asset_depr_schedule_doc.status = "Cancelled"
- asset_depr_schedule_doc.submit()
- asset_depr_schedule_doc.cancel()
-def get_details_of_depreciable_assets():
+def get_details_of_draft_or_submitted_depreciable_assets():
asset = frappe.qb.DocType("Asset")
records = (
frappe.qb.from_(asset)
.select(asset.name, asset.opening_accumulated_depreciation, asset.docstatus)
.where(asset.calculate_depreciation == 1)
+ .where(asset.docstatus < 2)
).run(as_dict=True)
return records
@@ -76,7 +73,7 @@
depr_schedules = (
frappe.qb.from_(ds)
.select(ds.name)
- .where((ds.parent == asset_name) & (int(ds.finance_book_id) == fb_row_idx))
+ .where((ds.parent == asset_name) & (ds.finance_book_id == str(fb_row_idx)))
).run(as_dict=True)
for idx, depr_schedule in enumerate(depr_schedules, start=1):