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

fix: fixed sider issues and translation syntax.

Browse Source
This commit is contained in:
noahjacob 2021-04-16 15:48:36 +05:30
parent 2c802720c3
commit e6fd3b86bd
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,6 @@ frappe.ui.form.on('Maintenance Schedule', {
frm.set_query('contact_person', erpnext.queries.contact_query);
frm.set_query('customer_address', erpnext.queries.address_query);
frm.set_query('customer', erpnext.queries.customer);
frm.add_fetch('item_code', 'item_name', 'item_name');
frm.add_fetch('item_code', 'description', 'description');
},
onload: function (frm) {
if (!frm.doc.status) {
@ -46,7 +43,7 @@ frappe.ui.form.on('Maintenance Schedule', {
// TODO commonify this code
erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
refresh: function () {
frappe.dynamic_link = { doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer' }
frappe.dynamic_link = { doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer' };
var me = this;
@ -89,10 +86,10 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
this.set_no_of_visits(doc, cdt, cdn);
},
no_of_visits: function(doc,cdt,cdn){
this.set_no_of_visits(doc,cdt,cdn);
no_of_visits: function (doc, cdt, cdn) {
this.set_no_of_visits(doc, cdt, cdn);
},
set_no_of_visits: function (doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
@ -111,23 +108,21 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
var no_of_visits = cint(date_diff / days_in_period[item.periodicity]);
if (no_of_visits == 0 || !no_of_visits) {
let end_date = frappe.datetime.add_days(item.start_date, days_in_period[item.periodicity])
frappe.model.set_value(item.doctype, item.name, "end_date", end_date)
var date_diff = frappe.datetime.get_diff(item.end_date, item.start_date) + 1;
var no_of_visits = cint(date_diff / days_in_period[item.periodicity]);
let end_date = frappe.datetime.add_days(item.start_date, days_in_period[item.periodicity]);
frappe.model.set_value(item.doctype, item.name, "end_date", end_date);
date_diff = frappe.datetime.get_diff(item.end_date, item.start_date) + 1;
no_of_visits = cint(date_diff / days_in_period[item.periodicity]);
frappe.model.set_value(item.doctype, item.name, "no_of_visits", no_of_visits);
} else if (item.no_of_visits > no_of_visits) {
let end_date = frappe.datetime.add_days(item.start_date, item.no_of_visits * days_in_period[item.periodicity]);
frappe.model.set_value(item.doctype, item.name, "end_date", end_date);
} else if (item.no_of_visits < no_of_visits) {
let end_date = frappe.datetime.add_days(item.start_date, item.no_of_visits * days_in_period[item.periodicity]);
frappe.model.set_value(item.doctype, item.name, "end_date", end_date);
}
else if(item.no_of_visits > no_of_visits){
var end_date = frappe.datetime.add_days(item.start_date, item.no_of_visits*days_in_period[item.periodicity])
frappe.model.set_value(item.doctype, item.name, "end_date", end_date)
}
else if(item.no_of_visits < no_of_visits){
var end_date = frappe.datetime.add_days(item.start_date, item.no_of_visits*days_in_period[item.periodicity])
frappe.model.set_value(item.doctype, item.name, "end_date", end_date)
}
}
},
});

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

@ -135,8 +135,7 @@ class MaintenanceSchedule(TransactionBase):
}
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]))
def validate_maintenance_detail(self):