mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
chore: mass trailing whitespace and EOF fixes
This commit is contained in:
@@ -69,10 +69,10 @@ erpnext.maintenance.MaintenanceSchedule = class MaintenanceSchedule extends frap
|
||||
if (flag) {
|
||||
this.frm.add_custom_button(__('Maintenance Visit'), function () {
|
||||
let options = "";
|
||||
|
||||
|
||||
me.frm.call('get_pending_data', {data_type: "items"}).then(r => {
|
||||
options = r.message;
|
||||
|
||||
|
||||
let schedule_id = "";
|
||||
let d = new frappe.ui.Dialog({
|
||||
title: __("Enter Visit Details"),
|
||||
@@ -86,7 +86,7 @@ erpnext.maintenance.MaintenanceSchedule = class MaintenanceSchedule extends frap
|
||||
let field = d.get_field("scheduled_date");
|
||||
me.frm.call('get_pending_data',
|
||||
{
|
||||
item_name: this.value,
|
||||
item_name: this.value,
|
||||
data_type: "date"
|
||||
}).then(r => {
|
||||
field.df.options = r.message;
|
||||
@@ -157,10 +157,9 @@ erpnext.maintenance.MaintenanceSchedule = class MaintenanceSchedule extends frap
|
||||
let me = this;
|
||||
if (item.start_date && item.periodicity) {
|
||||
me.frm.call('validate_end_date_visits');
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm}));
|
||||
|
||||
|
||||
@@ -52,15 +52,15 @@ class MaintenanceSchedule(TransactionBase):
|
||||
item.end_date = add_days(item.start_date, item.no_of_visits * days_in_period[item.periodicity])
|
||||
else:
|
||||
item.end_date = add_days(item.start_date, days_in_period[item.periodicity])
|
||||
|
||||
|
||||
diff = date_diff(item.end_date, item.start_date) + 1
|
||||
no_of_visits = cint(diff / days_in_period[item.periodicity])
|
||||
|
||||
|
||||
if not item.no_of_visits or item.no_of_visits == 0:
|
||||
item.end_date = add_days(item.start_date, days_in_period[item.periodicity])
|
||||
diff = date_diff(item.end_date, item.start_date) + 1
|
||||
item.no_of_visits = cint(diff / days_in_period[item.periodicity])
|
||||
|
||||
|
||||
elif item.no_of_visits > no_of_visits:
|
||||
item.end_date = add_days(item.start_date, item.no_of_visits * days_in_period[item.periodicity])
|
||||
|
||||
@@ -207,7 +207,7 @@ class MaintenanceSchedule(TransactionBase):
|
||||
|
||||
def on_update(self):
|
||||
frappe.db.set(self, 'status', 'Draft')
|
||||
|
||||
|
||||
def update_amc_date(self, serial_nos, amc_expiry_date=None):
|
||||
for serial_no in serial_nos:
|
||||
serial_no_doc = frappe.get_doc("Serial No", serial_no)
|
||||
@@ -300,7 +300,7 @@ class MaintenanceSchedule(TransactionBase):
|
||||
for schedule in self.schedules:
|
||||
if schedule.item_name == item_name and s_date == formatdate(schedule.scheduled_date, "dd-mm-yyyy"):
|
||||
return schedule.name
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def update_serial_nos(s_id):
|
||||
serial_nos = frappe.db.get_value('Maintenance Schedule Detail', s_id, 'serial_no')
|
||||
@@ -318,12 +318,12 @@ def make_maintenance_visit(source_name, target_doc=None, item_name=None, s_id=No
|
||||
target.maintenance_type = "Scheduled"
|
||||
target.maintenance_schedule = source.name
|
||||
target.maintenance_schedule_detail = s_id
|
||||
|
||||
|
||||
def update_sales(source, target, parent):
|
||||
sales_person = frappe.db.get_value('Maintenance Schedule Detail', s_id, 'sales_person')
|
||||
target.service_person = sales_person
|
||||
target.serial_no = ''
|
||||
|
||||
|
||||
doclist = get_mapped_doc("Maintenance Schedule", source_name, {
|
||||
"Maintenance Schedule": {
|
||||
"doctype": "Maintenance Visit",
|
||||
|
||||
@@ -22,7 +22,7 @@ class TestMaintenanceSchedule(unittest.TestCase):
|
||||
ms.cancel()
|
||||
events_after_cancel = get_events(ms)
|
||||
self.assertTrue(len(events_after_cancel) == 0)
|
||||
|
||||
|
||||
def test_make_schedule(self):
|
||||
ms = make_maintenance_schedule()
|
||||
ms.save()
|
||||
@@ -72,7 +72,7 @@ class TestMaintenanceSchedule(unittest.TestCase):
|
||||
|
||||
#checks if visit status is back updated in schedule
|
||||
self.assertTrue(ms.schedules[1].completion_status, "Partially Completed")
|
||||
|
||||
|
||||
def get_events(ms):
|
||||
return frappe.get_all("Event Participants", filters={
|
||||
"reference_doctype": ms.doctype,
|
||||
|
||||
@@ -28,11 +28,11 @@ class MaintenanceVisit(TransactionBase):
|
||||
def validate(self):
|
||||
self.validate_serial_no()
|
||||
self.validate_maintenance_date()
|
||||
|
||||
|
||||
def update_completion_status(self):
|
||||
if self.maintenance_schedule_detail:
|
||||
frappe.db.set_value('Maintenance Schedule Detail', self.maintenance_schedule_detail, 'completion_status', self.completion_status)
|
||||
|
||||
|
||||
def update_actual_date(self):
|
||||
if self.maintenance_schedule_detail:
|
||||
frappe.db.set_value('Maintenance Schedule Detail', self.maintenance_schedule_detail, 'actual_date', self.mntc_date)
|
||||
|
||||
Reference in New Issue
Block a user