Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: suggested changes

Browse Source
This commit is contained in:
Noah Jacob 2021-05-28 16:15:50 +05:30
parent 0b02f1335f
commit 6fb218e033
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
let schedules = me.frm.doc.schedules; let schedules = me.frm.doc.schedules;
let flag = schedules.some(schedule => schedule.completion_status === "Pending"); let flag = schedules.some(schedule => schedule.completion_status === "Pending");
if (flag) { if (flag) {
this.frm.add_custom_button(__('Create Maintenance Visit'), function () { this.frm.add_custom_button(__('Maintenance Visit'), function () {
let options = ""; let options = "";
me.frm.call('get_pending_data', {data_type: "items"}).then(r => { me.frm.call('get_pending_data', {data_type: "items"}).then(r => {

7
erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
View File

@ -20,9 +20,10 @@ class MaintenanceVisit(TransactionBase):
def validate_maintenance_date(self): def validate_maintenance_date(self):
if self.maintenance_type == "Scheduled" and self.maintenance_schedule_detail: if self.maintenance_type == "Scheduled" and self.maintenance_schedule_detail:
item_ref = frappe.db.get_value('Maintenance Schedule Detail', self.maintenance_schedule_detail, 'item_reference') item_ref = frappe.db.get_value('Maintenance Schedule Detail', self.maintenance_schedule_detail, 'item_reference')
start_date, end_date = frappe.db.get_value('Maintenance Schedule Item', item_ref, ['start_date', 'end_date']) if item_ref:
if get_datetime(self.mntc_date) < get_datetime(start_date) or get_datetime(self.mntc_date) > get_datetime(end_date): start_date, end_date = frappe.db.get_value('Maintenance Schedule Item', item_ref, ['start_date', 'end_date'])
frappe.throw(_("Date must be between {0} and {1}").format(start_date, end_date)) if get_datetime(self.mntc_date) < get_datetime(start_date) or get_datetime(self.mntc_date) > get_datetime(end_date):
frappe.throw(_("Date must be between {0} and {1}").format(start_date, end_date))
def validate(self): def validate(self):
self.validate_serial_no() self.validate_serial_no()