nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 01:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-01-14 10:32:10 +05:30
committed by GitHub
parent c69a59c3c6
commit 4d11a9c884
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
View File

@@ -188,30 +188,6 @@
"fieldtype": "Data", "fieldtype": "Data",
"label": "Has Item Scanned", "label": "Has Item Scanned",
"read_only": 1 "read_only": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Serial / Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1,
"search_index": 1
},
{
"fieldname": "current_serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Current Serial / Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"read_only": 1
},
{
"fieldname": "add_serial_batch_bundle",
"fieldtype": "Button",
"label": "Add Serial / Batch No"
}, },
{ {
"fetch_from": "item_code.item_group", "fetch_from": "item_code.item_group",
@@ -219,16 +195,11 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Item Group", "label": "Item Group",
"options": "Item Group" "options": "Item Group"
>>>>>>> 116ff8241c (fix: added item group in stock reco)
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-07-25 11:58:44.992419",
=======
"modified": "2024-01-14 10:04:23.599951", "modified": "2024-01-14 10:04:23.599951",
>>>>>>> 116ff8241c (fix: added item group in stock reco)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation Item", "name": "Stock Reconciliation Item",
@@ -239,4 +210,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }