mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 18:04:46 +00:00
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 acdb10377f)
# Conflicts:
# erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
This commit is contained in:
@@ -8,6 +8,7 @@ frappe.ui.form.on('Maintenance Visit', {
|
|||||||
frm.set_query('customer_address', erpnext.queries.address_query);
|
frm.set_query('customer_address', erpnext.queries.address_query);
|
||||||
frm.set_query('customer', erpnext.queries.customer);
|
frm.set_query('customer', erpnext.queries.customer);
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
onload: function (frm) {
|
onload: function (frm) {
|
||||||
// filters for serial no based on item code
|
// filters for serial no based on item code
|
||||||
if (frm.doc.maintenance_type === "Scheduled") {
|
if (frm.doc.maintenance_type === "Scheduled") {
|
||||||
@@ -15,6 +16,12 @@ frappe.ui.form.on('Maintenance Visit', {
|
|||||||
if (!item_code) {
|
if (!item_code) {
|
||||||
return;
|
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({
|
frappe.call({
|
||||||
method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule",
|
method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule",
|
||||||
args: {
|
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) {
|
if (!frm.doc.status) {
|
||||||
frm.set_value({ status: 'Draft' });
|
frm.set_value({ status: 'Draft' });
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user