From de27f29a6a86c606fec98eacc33450053169f84a Mon Sep 17 00:00:00 2001 From: Noah Jacob Date: Thu, 9 Sep 2021 18:54:00 +0530 Subject: [PATCH] refactor: .doc missing and empty row on new doc (#27408) * refactor: .doc missing and empty row on new doc * fix: let -> const (cherry picked from commit acdb10377f66a3c980d822a1f74e954fa10544b4) # Conflicts: # erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js --- .../doctype/maintenance_visit/maintenance_visit.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js index 939df5c07c5..1608130e781 100644 --- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js @@ -8,6 +8,7 @@ frappe.ui.form.on('Maintenance Visit', { frm.set_query('customer_address', erpnext.queries.address_query); frm.set_query('customer', erpnext.queries.customer); }, +<<<<<<< HEAD onload: function (frm) { // filters for serial no based on item code if (frm.doc.maintenance_type === "Scheduled") { @@ -15,6 +16,12 @@ frappe.ui.form.on('Maintenance Visit', { if (!item_code) { return; } +======= + onload: function (frm, cdt, cdn) { + let item = locals[cdt][cdn]; + if (frm.doc.maintenance_type === "Scheduled") { + const schedule_id = item.purposes[0].prevdoc_detail_docname || frm.doc.maintenance_schedule_detail; +>>>>>>> acdb10377f (refactor: .doc missing and empty row on new doc (#27408)) frappe.call({ method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule", args: { @@ -49,6 +56,13 @@ frappe.ui.form.on('Maintenance Visit', { }; }); } +<<<<<<< HEAD +======= + else { + frm.clear_table("purposes"); + } + +>>>>>>> acdb10377f (refactor: .doc missing and empty row on new doc (#27408)) if (!frm.doc.status) { frm.set_value({ status: 'Draft' }); }