Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed

Browse Source
This commit is contained in:
anandbaburajan 2022-12-23 11:01:18 +05:30
parent 246d3b4075
commit 3e91a56c19
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
View File

@ -157,11 +157,10 @@
"read_only": 1 "read_only": 1
} }
], ],
"in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-12-15 13:01:02.984906", "modified": "2022-12-15 16:28:44.585745",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Depreciation Schedule", "name": "Asset Depreciation Schedule",
@ -169,6 +168,8 @@
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 1,
"cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
@ -176,8 +177,23 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "Accounts User",
"share": 1, "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 "write": 1
} }
], ],

11
erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
View File

@ -2,7 +2,7 @@ import frappe
def execute(): def execute():
assets = get_details_of_depreciable_assets() assets = get_details_of_draft_or_submitted_depreciable_assets()
for asset in assets: for asset in assets:
finance_book_rows = get_details_of_asset_finance_books_rows(asset.name) finance_book_rows = get_details_of_asset_finance_books_rows(asset.name)
@ -32,19 +32,16 @@ def execute():
if asset.docstatus == 1: if asset.docstatus == 1:
asset_depr_schedule_doc.status = "Active" asset_depr_schedule_doc.status = "Active"
asset_depr_schedule_doc.submit() 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") asset = frappe.qb.DocType("Asset")
records = ( records = (
frappe.qb.from_(asset) frappe.qb.from_(asset)
.select(asset.name, asset.opening_accumulated_depreciation, asset.docstatus) .select(asset.name, asset.opening_accumulated_depreciation, asset.docstatus)
.where(asset.calculate_depreciation == 1) .where(asset.calculate_depreciation == 1)
.where(asset.docstatus < 2)
).run(as_dict=True) ).run(as_dict=True)
return records return records
@ -76,7 +73,7 @@ def update_depreciation_schedules(asset_name, asset_depr_schedule_name, fb_row_i
depr_schedules = ( depr_schedules = (
frappe.qb.from_(ds) frappe.qb.from_(ds)
.select(ds.name) .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) ).run(as_dict=True)
for idx, depr_schedule in enumerate(depr_schedules, start=1): for idx, depr_schedule in enumerate(depr_schedules, start=1):