fix: error while saving job card

(cherry picked from commit a209fb4b64)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
This commit is contained in:
vishnu
2023-05-22 18:00:50 +00:00
committed by Mergify
parent 774092343a
commit d6427cfe53

View File

@@ -117,7 +117,8 @@
"fieldname": "for_quantity", "fieldname": "for_quantity",
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Qty To Manufacture" "label": "Qty To Manufacture",
"reqd": 1
}, },
{ {
"fieldname": "wip_warehouse", "fieldname": "wip_warehouse",
@@ -420,7 +421,11 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-11-12 10:15:06.572401", "modified": "2021-11-12 10:15:06.572401",
=======
"modified": "2023-05-22 23:26:57.589331",
>>>>>>> a209fb4b64 (fix: error while saving job card)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Job Card", "name": "Job Card",