nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-so-cancellation-message

Browse Source
This commit is contained in:
Saqib
2021-10-27 15:19:18 +05:30
committed by GitHub
parent 78825f2c6c c9f3ea5fea
commit cc07c71bbd
243 changed files with 3227 additions and 1887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ class MaintenanceSchedule(TransactionBase):
"Yearly": 365
}
for item in self.items:
if item.periodicity and item.start_date:
if item.periodicity and item.periodicity != "Random" and item.start_date:
if not item.end_date:
if item.no_of_visits:
item.end_date = add_days(item.start_date, item.no_of_visits * days_in_period[item.periodicity])
@@ -199,12 +199,16 @@ class MaintenanceSchedule(TransactionBase):
if chk:
throw(_("Maintenance Schedule {0} exists against {1}").format(chk[0][0], d.sales_order))
def validate_no_of_visits(self):
return len(self.schedules) != sum(d.no_of_visits for d in self.items)
def validate(self):
self.validate_end_date_visits()
self.validate_maintenance_detail()
self.validate_dates_with_periodicity()
self.validate_sales_order()
self.generate_schedule()
if not self.schedules or self.validate_no_of_visits():
self.generate_schedule()
def on_update(self):
frappe.db.set(self, 'status', 'Draft')