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

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-02-19 15:47:40 +05:30
committed by GitHub
parent a509568110
commit 84647a1c73
1 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,43 +547,8 @@
"fieldname": "purchase_invoice_item", "fieldname": "purchase_invoice_item",
"fieldtype": "Data", "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,