nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into maint_sch_link_fix

Browse Source
This commit is contained in:
Noah Jacob
2021-12-17 12:07:26 +05:30
committed by GitHub
parent 9109660a69 4cb5b627a1
commit 450369dbae
33 changed files with 881 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
View File

@@ -59,9 +59,14 @@ class TestMaintenanceSchedule(unittest.TestCase):
ms.submit()
s_id = ms.get_pending_data(data_type = "id", item_name = i.item_name, s_date = expected_dates[1])
test = make_maintenance_visit(source_name = ms.name, item_name = "_Test Item", s_id = s_id)
# Check if item is mapped in visit.
test_map_visit = make_maintenance_visit(source_name = ms.name, item_name = "_Test Item", s_id = s_id)
self.assertEqual(len(test_map_visit.purposes), 1)
self.assertEqual(test_map_visit.purposes[0].item_name, "_Test Item")
visit = frappe.new_doc('Maintenance Visit')
visit = test
visit = test_map_visit
visit.maintenance_schedule = ms.name
visit.maintenance_schedule_detail = s_id
visit.completion_status = "Partially Completed"

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

@@ -41,7 +41,7 @@ frappe.ui.form.on('Maintenance Visit', {
frm.set_value({ status: 'Draft' });
}
if (frm.doc.__islocal) {
frm.clear_table("purposes");
frm.doc.maintenance_type == 'Unscheduled' && frm.clear_table("purposes");
frm.set_value({ mntc_date: frappe.datetime.get_today() });
}
},