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

fix: Updated forms and fixed an error.

Browse Source
This commit is contained in:
noahjacob 2021-04-21 11:29:40 +05:30
parent 57f487a16b
commit fa9629c1e1
4 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
View File

@ -229,8 +229,13 @@
"icon": "fa fa-calendar", "icon": "fa fa-calendar",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [
"modified": "2021-04-16 15:53:36.670816", {
"link_doctype": "Maintenance Visit Purpose",
"link_fieldname": "prevdoc_docname"
}
],
"modified": "2021-04-21 11:27:05.744109",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Maintenance", "module": "Maintenance",
"name": "Maintenance Schedule", "name": "Maintenance Schedule",

28
erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
View File

@ -9,10 +9,14 @@
"field_order": [ "field_order": [
"item_code", "item_code",
"item_name", "item_name",
"column_break_3",
"scheduled_date", "scheduled_date",
"sales_person",
"actual_date", "actual_date",
"section_break_6",
"sales_person",
"column_break_8",
"completion_status", "completion_status",
"section_break_10",
"serial_no", "serial_no",
"item_ref" "item_ref"
], ],
@ -95,15 +99,33 @@
}, },
{ {
"fieldname": "item_ref", "fieldname": "item_ref",
"fieldtype": "Data", "fieldtype": "Link",
"hidden": 1,
"label": "Item Reference", "label": "Item Reference",
"options": "Maintenance Schedule Item",
"read_only": 1 "read_only": 1
},
{
"fieldname": "column_break_3",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break"
},
{
"fieldname": "column_break_8",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_10",
"fieldtype": "Section Break"
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-04-19 17:42:31.685710", "modified": "2021-04-21 11:07:29.524071",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Maintenance", "module": "Maintenance",
"name": "Maintenance Schedule Detail", "name": "Maintenance Schedule Detail",

25
erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
View File

@ -34,16 +34,21 @@ frappe.ui.form.on('Maintenance Visit', {
}, },
onload: function (frm, cdt, cdn) { onload: function (frm, cdt, cdn) {
let item = locals[cdt][cdn]; let item = locals[cdt][cdn];
let s_id = item.purposes[0].prevdoc_detail_docname; if (frm.maintenance_type == 'Scheduled') {
frappe.call({
method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.update_serial_nos", let s_id = item.purposes[0].prevdoc_detail_docname;
args: { frappe.call({
s_id: s_id method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.update_serial_nos",
}, args: {
callback: function (r) { s_id: s_id
serial_nos = r.message; },
} callback: function (r) {
}); serial_nos = r.message;
}
});
}
if (!frm.doc.status) { if (!frm.doc.status) {
frm.set_value({ status: 'Draft' }); frm.set_value({ status: 'Draft' });
} }

16
erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
View File

@ -9,10 +9,12 @@
"field_order": [ "field_order": [
"item_code", "item_code",
"item_name", "item_name",
"column_break_3",
"service_person",
"serial_no", "serial_no",
"section_break_6",
"description", "description",
"work_details", "work_details",
"service_person",
"work_done", "work_done",
"prevdoc_doctype", "prevdoc_doctype",
"prevdoc_docname", "prevdoc_docname",
@ -86,6 +88,7 @@
{ {
"fieldname": "prevdoc_doctype", "fieldname": "prevdoc_doctype",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1,
"label": "Document Type", "label": "Document Type",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "prevdoc_doctype", "oldfieldname": "prevdoc_doctype",
@ -114,6 +117,7 @@
{ {
"fieldname": "prevdoc_detail_docname", "fieldname": "prevdoc_detail_docname",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1,
"label": "Against Document Detail No", "label": "Against Document Detail No",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "prevdoc_detail_docname", "oldfieldname": "prevdoc_detail_docname",
@ -124,12 +128,20 @@
"read_only": 1, "read_only": 1,
"report_hide": 1, "report_hide": 1,
"width": "160px" "width": "160px"
},
{
"fieldname": "column_break_3",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break"
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-04-19 16:08:10.671163", "modified": "2021-04-21 11:16:52.025914",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Maintenance", "module": "Maintenance",
"name": "Maintenance Visit Purpose", "name": "Maintenance Visit Purpose",