nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source
This commit is contained in:
marination
2022-01-19 13:06:52 +05:30
parent add36363ab
commit 3023757a60
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,14 +50,6 @@ frappe.ui.form.on('Maintenance Visit', {
frm.set_value({ status: 'Draft' });
}
if (frm.doc.__islocal) {
<<<<<<< HEAD
<<<<<<< HEAD
frm.doc.maintenance_type == 'Unscheduled' && frm.clear_table("purposes");
=======
frm.clear_table("purposes");
>>>>>>> 4f52b86d7e (refactor: update_serial_no function and code cleanup)
=======
>>>>>>> b98c61f2a7 (refactor: moved purpose table mandatory check to server)
frm.set_value({ mntc_date: frappe.datetime.get_today() });
}
},