mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-13 17:53:49 +00:00
feat: allow data import for asset repair doctype
(cherry picked from commit 49f1688a51)
# Conflicts:
# erpnext/assets/doctype/asset_repair/asset_repair.json
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
|
"allow_import": 1,
|
||||||
"autoname": "naming_series:",
|
"autoname": "naming_series:",
|
||||||
"creation": "2017-10-23 11:38:54.004355",
|
"creation": "2017-10-23 11:38:54.004355",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
@@ -249,8 +250,18 @@
|
|||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
|
<<<<<<< HEAD
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2025-11-17 18:35:54.575265",
|
"modified": "2025-11-17 18:35:54.575265",
|
||||||
|
=======
|
||||||
|
"links": [
|
||||||
|
{
|
||||||
|
"link_doctype": "Stock Entry",
|
||||||
|
"link_fieldname": "asset_repair"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"modified": "2026-01-06 15:48:13.862505",
|
||||||
|
>>>>>>> 49f1688a51 (feat: allow data import for asset repair doctype)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset Repair",
|
"name": "Asset Repair",
|
||||||
@@ -264,6 +275,7 @@
|
|||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"export": 1,
|
"export": 1,
|
||||||
|
"import": 1,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
@@ -279,6 +291,7 @@
|
|||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"export": 1,
|
"export": 1,
|
||||||
|
"import": 1,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user