CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 22:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: added Transfer and Issue option in purpose

Browse Source 
(cherry picked from commit f5e5146021)

# Conflicts:
#	erpnext/assets/doctype/asset_movement/asset_movement.json
This commit is contained in:
Khushi Rawat
2025-06-04 15:33:43 +05:30
committed by Mergify
parent ef202d7cd0
commit 1f7eccdac5
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/assets/doctype/asset_movement/asset_movement.json
View File

@@ -33,7 +33,7 @@
"fieldname": "purpose", "fieldname": "purpose",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Purpose", "label": "Purpose",
"options": "\nIssue\nReceipt\nTransfer", "options": "\nIssue\nReceipt\nTransfer\nTransfer and Issue",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -93,10 +93,15 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
} }
], ],
"grid_page_length": 50,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-28 16:54:26.571083", "modified": "2023-06-28 16:54:26.571083",
=======
"modified": "2025-05-30 17:01:55.864353",
>>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Movement", "name": "Asset Movement",
@@ -149,7 +154,12 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }

2
erpnext/assets/doctype/asset_movement/asset_movement.py
View File

@@ -24,7 +24,7 @@ class AssetMovement(Document):
amended_from: DF.Link | None amended_from: DF.Link | None
assets: DF.Table[AssetMovementItem] assets: DF.Table[AssetMovementItem]
company: DF.Link company: DF.Link
purpose: DF.Literal["", "Issue", "Receipt", "Transfer"] purpose: DF.Literal["", "Issue", "Receipt", "Transfer", "Transfer and Issue"]
reference_doctype: DF.Link | None reference_doctype: DF.Link | None
reference_name: DF.DynamicLink | None reference_name: DF.DynamicLink | None
transaction_date: DF.Datetime transaction_date: DF.Datetime