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

style: fixed indentations and formatting

Browse Source
This commit is contained in:
noahjacob 2021-05-26 18:28:24 +05:30
parent f0e6a16910
commit dc51388666
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
this.frm.add_custom_button(__('Create Maintenance Visit'), function () { this.frm.add_custom_button(__('Create 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 => {
options = r.message; options = r.message;
let schedule_id = ""; let schedule_id = "";
@ -108,7 +108,7 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
item_name: field.value, item_name: field.value,
s_date: this.value, s_date: this.value,
data_type: "id" data_type: "id"
}).then(r =>{ }).then(r => {
schedule_id = r.message; schedule_id = r.message;
}); });
} }

70
erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
View File

@ -140,7 +140,7 @@ class MaintenanceSchedule(TransactionBase):
if employee: if employee:
holiday_list = get_holiday_list_for_employee(employee) holiday_list = get_holiday_list_for_employee(employee)
else: else:
holiday_list = frappe.get_cached_value('Company', self.company, "default_holiday_list") holiday_list = frappe.get_cached_value('Company', self.company, "default_holiday_list")
holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list) holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
@ -161,16 +161,16 @@ class MaintenanceSchedule(TransactionBase):
if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random": if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random":
date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1 date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1
days_in_period = { days_in_period = {
"Weekly": 7, "Weekly": 7,
"Monthly": 30, "Monthly": 30,
"Quarterly": 90, "Quarterly": 90,
"Half Yearly": 180, "Half Yearly": 180,
"Yearly": 365 "Yearly": 365
} }
if date_diff < days_in_period[d.periodicity]: if date_diff < days_in_period[d.periodicity]:
throw(_("Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}") throw(_("Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}")
.format(d.idx, d.periodicity, days_in_period[d.periodicity])) .format(d.idx, d.periodicity, days_in_period[d.periodicity]))
def validate_maintenance_detail(self): def validate_maintenance_detail(self):
if not self.get('items'): if not self.get('items'):
@ -217,28 +217,28 @@ class MaintenanceSchedule(TransactionBase):
def validate_serial_no(self, item_code, serial_nos, amc_start_date): def validate_serial_no(self, item_code, serial_nos, amc_start_date):
for serial_no in serial_nos: for serial_no in serial_nos:
sr_details = frappe.db.get_value("Serial No", serial_no, sr_details = frappe.db.get_value("Serial No", serial_no,
["warranty_expiry_date", "amc_expiry_date", "warehouse", "delivery_date", "item_code"], as_dict=1) ["warranty_expiry_date", "amc_expiry_date", "warehouse", "delivery_date", "item_code"], as_dict=1)
if not sr_details: if not sr_details:
frappe.throw(_("Serial No {0} not found").format(serial_no)) frappe.throw(_("Serial No {0} not found").format(serial_no))
if sr_details.get("item_code") != item_code: if sr_details.get("item_code") != item_code:
frappe.throw(_("Serial No {0} does not belong to Item {1}") frappe.throw(_("Serial No {0} does not belong to Item {1}")
.format(frappe.bold(serial_no), frappe.bold(item_code)), title="Invalid") .format(frappe.bold(serial_no), frappe.bold(item_code)), title="Invalid")
if sr_details.warranty_expiry_date \ if sr_details.warranty_expiry_date \
and getdate(sr_details.warranty_expiry_date) >= getdate(amc_start_date): and getdate(sr_details.warranty_expiry_date) >= getdate(amc_start_date):
throw(_("Serial No {0} is under warranty upto {1}") throw(_("Serial No {0} is under warranty upto {1}")
.format(serial_no, sr_details.warranty_expiry_date)) .format(serial_no, sr_details.warranty_expiry_date))
if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(amc_start_date): if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(amc_start_date):
throw(_("Serial No {0} is under maintenance contract upto {1}") throw(_("Serial No {0} is under maintenance contract upto {1}")
.format(serial_no, sr_details.amc_expiry_date)) .format(serial_no, sr_details.amc_expiry_date))
if not sr_details.warehouse and sr_details.delivery_date and \ if not sr_details.warehouse and sr_details.delivery_date and \
getdate(sr_details.delivery_date) >= getdate(amc_start_date): getdate(sr_details.delivery_date) >= getdate(amc_start_date):
throw(_("Maintenance start date can not be before delivery date for Serial No {0}") throw(_("Maintenance start date can not be before delivery date for Serial No {0}")
.format(serial_no)) .format(serial_no))
def validate_schedule(self): def validate_schedule(self):
item_lst1 =[] item_lst1 =[]
@ -281,7 +281,7 @@ class MaintenanceSchedule(TransactionBase):
delete_events(self.doctype, self.name) delete_events(self.doctype, self.name)
@frappe.whitelist() @frappe.whitelist()
def get_pending_data(self,data_type,s_date = None, item_name = None): def get_pending_data(self, data_type, s_date=None, item_name=None):
if data_type == "date": if data_type == "date":
dates = "" dates = ""
for schedule in self.schedules: for schedule in self.schedules:
@ -298,7 +298,7 @@ class MaintenanceSchedule(TransactionBase):
return items return items
elif data_type == "id": elif data_type == "id":
for schedule in self.schedules: for schedule in self.schedules:
if schedule.item_name == item_name and s_date == formatdate(schedule.scheduled_date,"dd-mm-yyyy"): if schedule.item_name == item_name and s_date == formatdate(schedule.scheduled_date, "dd-mm-yyyy"):
return schedule.name return schedule.name
@frappe.whitelist() @frappe.whitelist()
@ -324,27 +324,25 @@ def make_maintenance_visit(source_name, target_doc=None, item_name=None, s_id=No
target.serial_no = '' target.serial_no = ''
doclist = get_mapped_doc("Maintenance Schedule", source_name, { doclist = get_mapped_doc("Maintenance Schedule", source_name, {
"Maintenance Schedule": { "Maintenance Schedule": {
"doctype": "Maintenance Visit", "doctype": "Maintenance Visit",
"field_map": { "field_map": {
"name": "maintenance_schedule" "name": "maintenance_schedule"
},
"validation": {
"docstatus": ["=", 1]
},
"postprocess": update_status
}, },
"Maintenance Schedule Item": { "validation": {
"doctype": "Maintenance Visit Purpose", "docstatus": ["=", 1]
"field_map": { },
"parent": "prevdoc_docname", "postprocess": update_status
"parenttype": "prevdoc_doctype", },
}, "Maintenance Schedule Item": {
"condition": lambda doc: doc.item_name == item_name, "doctype": "Maintenance Visit Purpose",
"field_map": {
"postprocess": update_sid "parent": "prevdoc_docname",
"parenttype": "prevdoc_doctype",
} },
"condition": lambda doc: doc.item_name == item_name,
"postprocess": update_sid
}
}, target_doc) }, target_doc)
return doclist return doclist