schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-06-13 11:22:59 +05:30
committed by GitHub
parent 7af03800c9
commit 2060a003c8
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/manufacturing/doctype/job_card/job_card.json
View File

@@ -436,23 +436,12 @@
"fieldname": "expected_end_date", "fieldname": "expected_end_date",
"fieldtype": "Datetime", "fieldtype": "Datetime",
"label": "Expected End Date" "label": "Expected End Date"
<<<<<<< HEAD
=======
},
{
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
}, },
{ {
"fieldname": "process_loss_qty", "fieldname": "process_loss_qty",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Process Loss Qty", "label": "Process Loss Qty",
"read_only": 1 "read_only": 1
>>>>>>> e9a6191af9 (fix: added process loss in job card)
} }
], ],
"is_submittable": 1, "is_submittable": 1,
@@ -515,4 +504,4 @@
"states": [], "states": [],
"title_field": "operation", "title_field": "operation",
"track_changes": 1 "track_changes": 1
} }