fix: Serial No. filters for unscheduled visits

frappe · Jan 17, 2022 · dec7513 · dec7513
1 parent 773ed2b
commit dec7513
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -305,7 +305,7 @@ def get_pending_data(self, data_type, s_date=None, item_name=None):
 					return schedule.name
 
 @frappe.whitelist()
-def update_serial_nos(item_code, schedule=None):
+def get_serial_nos_from_schedule(item_code, schedule=None):
 	serial_nos = []
 	if schedule:
 		serial_nos = frappe.db.get_value('Maintenance Schedule Item', {

diff --git a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
@@ -7,8 +7,8 @@
 from frappe.utils.data import add_days, formatdate, today
 
 from erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule import (
+	get_serial_nos_from_schedule,
 	make_maintenance_visit,
-	update_serial_nos,
 )
 from erpnext.stock.doctype.item.test_item import create_item
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
@@ -93,7 +93,7 @@ def test_serial_no_filters(self):
 		s_item = ms.schedules[0]
 		mv = make_maintenance_visit(source_name=ms.name, item_name=item_code, s_id=s_item.name)
 		mvi = mv.purposes[0]
-		serial_nos = update_serial_nos(mvi.item_name, ms.name)
+		serial_nos = get_serial_nos_from_schedule(mvi.item_name, ms.name)
 		self.assertEqual(serial_nos, None)
 
 		# With serial no. set in schedule -> returns serial nos.
@@ -104,7 +104,7 @@ def test_serial_no_filters(self):
 		s_item = ms.schedules[0]
 		mv = make_maintenance_visit(source_name=ms.name, item_name=item_code, s_id=s_item.name)
 		mvi = mv.purposes[0]
-		serial_nos = update_serial_nos(mvi.item_name, ms.name)
+		serial_nos = get_serial_nos_from_schedule(mvi.item_name, ms.name)
 		self.assertEqual(serial_nos, ["TEST001", "TEST002"])
 
 		frappe.db.rollback()

diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@@ -13,7 +13,7 @@ frappe.ui.form.on('Maintenance Visit', {
 		if (frm.doc.maintenance_type === "Scheduled") {
 			let item_code = frm.doc.purposes[0].item_code;
 			frappe.call({
-				method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.update_serial_nos",
+				method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule",
 				args: {
 					schedule: frm.doc.maintenance_schedule,
 					item_code: item_code
@@ -36,6 +36,15 @@ frappe.ui.form.on('Maintenance Visit', {
 					};
 				});
 			});
+		} else {
+			frm.set_query('serial_no', 'purposes', (frm, cdt, cdn) => {
+				let row = locals[cdt][cdn];
+				return {
+					filters: {
+						'item_code': row.item_code
+					}
+				};
+			});
 		}
 		if (!frm.doc.status) {
 			frm.set_value({ status: 'Draft' });