Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixes in work order doctype (#28217)

Browse Source 
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only

Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
Mohammed Yusuf Shaikh 2021-11-24 16:23:12 +05:30 committed by GitHub
parent ab2c1f62a1
commit 8d2abc4b86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@ -442,7 +442,7 @@ frappe.ui.form.on("Work Order", {
additional_operating_cost: function(frm) {
erpnext.work_order.calculate_cost(frm.doc);
erpnext.work_order.calculate_total_cost(frm);
}
},
});
frappe.ui.form.on("Work Order Item", {

6
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@ -326,6 +326,7 @@
"label": "Expected Delivery Date"
},
{
"collapsible": 1,
"fieldname": "operations_section",
"fieldtype": "Section Break",
"label": "Operations",
@ -337,7 +338,7 @@
"fieldname": "transfer_material_against",
"fieldtype": "Select",
"label": "Transfer Material Against",
"options": "\nWork Order\nJob Card"
"options": "Work Order\nJob Card"
},
{
"fieldname": "operations",
@ -573,8 +574,7 @@
"image_field": "image",
"is_submittable": 1,
"links": [],
"migration_hash": "a18118963f4fcdb7f9d326de5f4063ba",
"modified": "2021-10-29 15:12:32.203605",
"modified": "2021-11-08 17:36:07.016300",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order",

68
erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
View File

@ -6,27 +6,27 @@
"field_order": [
"details",
"operation",
"bom",
"column_break_4",
"description",
"sequence_id",
"col_break1",
"completed_qty",
"status",
"completed_qty",
"column_break_4",
"bom",
"workstation",
"sequence_id",
"section_break_10",
"description",
"estimated_time_and_cost",
"planned_start_time",
"planned_end_time",
"column_break_10",
"time_in_mins",
"hour_rate",
"time_in_mins",
"column_break_10",
"planned_end_time",
"batch_size",
"planned_operating_cost",
"section_break_9",
"actual_start_time",
"actual_end_time",
"column_break_11",
"actual_operation_time",
"column_break_11",
"actual_end_time",
"actual_operating_cost"
],
"fields": [
@ -42,7 +42,6 @@
"oldfieldname": "operation_no",
"oldfieldtype": "Data",
"options": "Operation",
"read_only": 1,
"reqd": 1
},
{
@ -52,20 +51,14 @@
"label": "BOM",
"no_copy": 1,
"options": "BOM",
"print_hide": 1,
"read_only": 1
"print_hide": 1
},
{
"fieldname": "description",
"fieldtype": "Text Editor",
"label": "Operation Description",
"oldfieldname": "opn_description",
"oldfieldtype": "Text",
"read_only": 1
},
{
"fieldname": "col_break1",
"fieldtype": "Column Break"
"oldfieldtype": "Text"
},
{
"columns": 1,
@ -74,19 +67,16 @@
"fieldtype": "Float",
"in_list_view": 1,
"label": "Completed Qty",
"no_copy": 1,
"read_only": 1
"no_copy": 1
},
{
"columns": 1,
"default": "Pending",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"options": "Pending\nWork in Progress\nCompleted",
"read_only": 1
"options": "Pending\nWork in Progress\nCompleted"
},
{
"fieldname": "workstation",
@ -106,15 +96,13 @@
"fieldname": "planned_start_time",
"fieldtype": "Datetime",
"label": "Planned Start Time",
"no_copy": 1,
"read_only": 1
"no_copy": 1
},
{
"fieldname": "planned_end_time",
"fieldtype": "Datetime",
"label": "Planned End Time",
"no_copy": 1,
"read_only": 1
"no_copy": 1
},
{
"fieldname": "column_break_10",
@ -122,7 +110,7 @@
},
{
"columns": 1,
"description": "in Minutes",
"description": "In Minutes",
"fieldname": "time_in_mins",
"fieldtype": "Float",
"in_list_view": 1,
@ -152,6 +140,7 @@
"label": "Actual Time and Cost"
},
{
"description": "Updated via 'Time Log' (In Minutes)",
"fieldname": "actual_start_time",
"fieldtype": "Datetime",
"label": "Actual Start Time",
@ -159,7 +148,7 @@
"read_only": 1
},
{
"description": "Updated via 'Time Log'",
"description": "Updated via 'Time Log' (In Minutes)",
"fieldname": "actual_end_time",
"fieldtype": "Datetime",
"label": "Actual End Time",
@ -171,7 +160,7 @@
"fieldtype": "Column Break"
},
{
"description": "in Minutes\nUpdated via 'Time Log'",
"description": "Updated via 'Time Log' (In Minutes)",
"fieldname": "actual_operation_time",
"fieldtype": "Float",
"label": "Actual Operation Time",
@ -190,25 +179,28 @@
{
"fieldname": "batch_size",
"fieldtype": "Int",
"label": "Batch Size",
"read_only": 1
"label": "Batch Size"
},
{
"fieldname": "sequence_id",
"fieldtype": "Int",
"hidden": 1,
"label": "Sequence ID",
"print_hide": 1,
"read_only": 1
"print_hide": 1
},
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_10",
"fieldtype": "Section Break"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-06-24 14:36:12.835543",
"modified": "2021-11-24 04:52:54.295168",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order Operation",
@ -217,4 +209,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}