-
Notifications
You must be signed in to change notification settings - Fork 7.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
- Loading branch information
1 parent
3f09f81
commit 2ab3d75
Showing
16 changed files
with
329 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors | ||
// For license information, please see license.txt | ||
|
||
// frappe.ui.form.on("Asset Activity", { | ||
// refresh(frm) { | ||
|
||
// }, | ||
// }); |
109 changes: 109 additions & 0 deletions
109
erpnext/assets/doctype/asset_activity/asset_activity.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
{ | ||
"actions": [], | ||
"creation": "2023-07-28 12:41:13.232505", | ||
"default_view": "List", | ||
"doctype": "DocType", | ||
"editable_grid": 1, | ||
"engine": "InnoDB", | ||
"field_order": [ | ||
"asset", | ||
"column_break_vkdy", | ||
"date", | ||
"column_break_kkxv", | ||
"user", | ||
"section_break_romx", | ||
"subject" | ||
], | ||
"fields": [ | ||
{ | ||
"fieldname": "asset", | ||
"fieldtype": "Link", | ||
"in_list_view": 1, | ||
"in_standard_filter": 1, | ||
"label": "Asset", | ||
"options": "Asset", | ||
"print_width": "165", | ||
"read_only": 1, | ||
"reqd": 1, | ||
"width": "165" | ||
}, | ||
{ | ||
"fieldname": "column_break_vkdy", | ||
"fieldtype": "Column Break" | ||
}, | ||
{ | ||
"fieldname": "section_break_romx", | ||
"fieldtype": "Section Break" | ||
}, | ||
{ | ||
"fieldname": "subject", | ||
"fieldtype": "Small Text", | ||
"in_list_view": 1, | ||
"label": "Subject", | ||
"print_width": "518", | ||
"read_only": 1, | ||
"reqd": 1, | ||
"width": "518" | ||
}, | ||
{ | ||
"default": "now", | ||
"fieldname": "date", | ||
"fieldtype": "Datetime", | ||
"in_list_view": 1, | ||
"label": "Date", | ||
"print_width": "158", | ||
"read_only": 1, | ||
"reqd": 1, | ||
"width": "158" | ||
}, | ||
{ | ||
"fieldname": "user", | ||
"fieldtype": "Link", | ||
"in_list_view": 1, | ||
"label": "User", | ||
"options": "User", | ||
"print_width": "150", | ||
"read_only": 1, | ||
"reqd": 1, | ||
"width": "150" | ||
}, | ||
{ | ||
"fieldname": "column_break_kkxv", | ||
"fieldtype": "Column Break" | ||
} | ||
], | ||
"in_create": 1, | ||
"index_web_pages_for_search": 1, | ||
"links": [], | ||
"modified": "2023-08-01 11:09:52.584482", | ||
"modified_by": "Administrator", | ||
"module": "Assets", | ||
"name": "Asset Activity", | ||
"owner": "Administrator", | ||
"permissions": [ | ||
{ | ||
"email": 1, | ||
"read": 1, | ||
"report": 1, | ||
"role": "System Manager", | ||
"share": 1 | ||
}, | ||
{ | ||
"email": 1, | ||
"read": 1, | ||
"report": 1, | ||
"role": "Accounts User", | ||
"share": 1 | ||
}, | ||
{ | ||
"email": 1, | ||
"read": 1, | ||
"report": 1, | ||
"role": "Quality Manager", | ||
"share": 1 | ||
} | ||
], | ||
"sort_field": "modified", | ||
"sort_order": "DESC", | ||
"states": [] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors | ||
# For license information, please see license.txt | ||
|
||
import frappe | ||
from frappe.model.document import Document | ||
|
||
|
||
class AssetActivity(Document): | ||
pass | ||
|
||
|
||
def add_asset_activity(asset, subject): | ||
frappe.get_doc( | ||
{ | ||
"doctype": "Asset Activity", | ||
"asset": asset, | ||
"subject": subject, | ||
"user": frappe.session.user, | ||
} | ||
).insert(ignore_permissions=True, ignore_links=True) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors | ||
# See license.txt | ||
|
||
# import frappe | ||
from frappe.tests.utils import FrappeTestCase | ||
|
||
|
||
class TestAssetActivity(FrappeTestCase): | ||
pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.