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

fix: make purchase_receipt_item and purchase_invoice_item fields of data type

Browse Source 
(cherry picked from commit 8af9dcb33e)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
This commit is contained in:
Khushi Rawat
2025-02-11 16:05:02 +05:30
committed by Mergify
parent be65cd4df6
commit 281431e041
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/assets/doctype/asset/asset.json
View File

@@ -541,17 +541,51 @@
}, },
{ {
"fieldname": "purchase_receipt_item", "fieldname": "purchase_receipt_item",
"fieldtype": "Link", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"label": "Purchase Receipt Item", "label": "Purchase Receipt Item"
"options": "Purchase Receipt Item"
}, },
{ {
"fieldname": "purchase_invoice_item", "fieldname": "purchase_invoice_item",
"fieldtype": "Link", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
<<<<<<< HEAD
"label": "Purchase Invoice Item", "label": "Purchase Invoice Item",
"options": "Purchase Invoice Item" "options": "Purchase Invoice Item"
=======
"label": "Purchase Invoice Item"
},
{
"fieldname": "insurance_details_tab",
"fieldtype": "Tab Break",
"label": "Insurance"
},
{
"fieldname": "other_info_tab",
"fieldtype": "Tab Break",
"label": "Other Info"
},
{
"fieldname": "connections_tab",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
},
{
"fieldname": "depreciation_tab",
"fieldtype": "Tab Break",
"label": "Depreciation"
},
{
"fieldname": "accounting_dimensions_section",
"fieldtype": "Section Break",
"label": "Accounting Dimensions"
},
{
"fieldname": "section_break_jtou",
"fieldtype": "Section Break",
"label": "Additional Info"
>>>>>>> 8af9dcb33e (fix: make purchase_receipt_item and purchase_invoice_item fields of data type)
} }
], ],
"idx": 72, "idx": 72,
@@ -595,7 +629,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
"modified": "2024-12-26 14:23:20.968882", "modified": "2025-02-11 16:01:56.140904",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",

4
erpnext/assets/doctype/asset/asset.py
View File

@@ -95,9 +95,9 @@ class Asset(AccountsController):
purchase_amount: DF.Currency purchase_amount: DF.Currency
purchase_date: DF.Date | None purchase_date: DF.Date | None
purchase_invoice: DF.Link | None purchase_invoice: DF.Link | None
purchase_invoice_item: DF.Link | None purchase_invoice_item: DF.Data | None
purchase_receipt: DF.Link | None purchase_receipt: DF.Link | None
purchase_receipt_item: DF.Link | None purchase_receipt_item: DF.Data | None
split_from: DF.Link | None split_from: DF.Link | None
status: DF.Literal[ status: DF.Literal[
"Draft", "Draft",