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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-06-10 14:38:18 +05:30
committed by GitHub
parent ccb0f7ac42
commit c2d7e8c471
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
View File

@@ -205,28 +205,6 @@
"fieldtype": "Float",
"label": "Produced Qty",
"read_only": 1
<<<<<<< HEAD
=======
},
{
"columns": 2,
"fieldname": "required_qty",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Required Qty"
},
{
"fieldname": "subcontracting_section",
"fieldtype": "Section Break",
"label": "Subcontracting"
},
{
"fieldname": "stock_reserved_qty",
"fieldtype": "Float",
"label": "Stock Reserved Qty",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "ordered_qty",
@@ -234,17 +212,12 @@
"label": "Ordered Qty",
"no_copy": 1,
"read_only": 1
>>>>>>> 384f4e120a (fix: do not create repeat work orders)
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-02-27 13:45:17.422435",
=======
"modified": "2025-06-10 13:36:24.759101",
>>>>>>> 384f4e120a (fix: do not create repeat work orders)
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan Sub Assembly Item",
@@ -255,4 +228,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}