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

fix: sider

Browse Source
This commit is contained in:
noahjacob 2021-05-20 14:20:50 +05:30
parent 08598238d7
commit 0169cd845a
2 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,65 +71,69 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
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 = "";
let d = new frappe.ui.Dialog({ let d = new frappe.ui.Dialog({
title: __("Enter Visit Details"), title: __("Enter Visit Details"),
fields: [{ fields: [{
fieldtype: "Select", fieldtype: "Select",
fieldname: "item_name", fieldname: "item_name",
label: __("Item Name"), label: __("Item Name"),
options: options, options: options,
reqd: 1, reqd: 1,
onchange: function () { onchange: function () {
let field = d.get_field("scheduled_date"); let field = d.get_field("scheduled_date");
me.frm.call('get_pending_data',{item_name:this.value,data_type:"date"}).then(r =>{ me.frm.call('get_pending_data',
field.df.options = r.message; {
field.refresh(); item_name: this.value,
}) data_type: "date"
} }).then(r => {
}, field.df.options = r.message;
{ field.refresh();
label: __('Scheduled Date'), });
fieldname: 'scheduled_date',
fieldtype: 'Select',
options: "",
reqd: 1,
onchange: function () {
let field = d.get_field('item_name');
me.frm.call(
'get_pending_data',
{
item_name: field.value,
s_date: this.value,
data_type: "id"
}).then(r =>{
schedule_id = r.message;
})
}
},
],
primary_action_label: 'Create Visit',
primary_action(values) {
frappe.call({
method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
args: {
item_name: values.item_name,
s_id: schedule_id,
source_name: me.frm.doc.name,
},
callback: function (r) {
if (!r.exc) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
} }
}); },
d.hide(); {
} label: __('Scheduled Date'),
}); fieldname: 'scheduled_date',
d.show(); fieldtype: 'Select',
options: "",
reqd: 1,
onchange: function () {
let field = d.get_field('item_name');
me.frm.call(
'get_pending_data',
{
item_name: field.value,
s_date: this.value,
data_type: "id"
}).then(r =>{
schedule_id = r.message;
});
}
},
],
primary_action_label: 'Create Visit',
primary_action(values) {
frappe.call({
method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
args: {
item_name: values.item_name,
s_id: schedule_id,
source_name: me.frm.doc.name,
},
callback: function (r) {
if (!r.exc) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
}
});
d.hide();
}
});
d.show();
}); });
}, __('Create')); }, __('Create'));
} }
@ -154,9 +158,9 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
set_no_of_visits: function (doc, cdt, cdn) { set_no_of_visits: function (doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
let me = this;
if (item.start_date && item.periodicity) { if (item.start_date && item.periodicity) {
me.frm.call('validate_end_date_visits') me.frm.call('validate_end_date_visits');
} }
}, },

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

@ -58,7 +58,7 @@ class MaintenanceSchedule(TransactionBase):
if not item.no_of_visits or item.no_of_visits == 0: 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]) item.end_date = add_days(item.start_date, days_in_period[item.periodicity])
diff = date_diff(item.end_date, item.start_date ) + 1 diff = date_diff(item.end_date, item.start_date) + 1
item.no_of_visits = cint(diff / days_in_period[item.periodicity]) item.no_of_visits = cint(diff / days_in_period[item.periodicity])
elif item.no_of_visits > no_of_visits: elif item.no_of_visits > no_of_visits:
@ -93,8 +93,8 @@ class MaintenanceSchedule(TransactionBase):
frappe.msgprint( frappe.msgprint(
_("Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}").format( _("Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}").format(
self.owner, "<br>" + "<br>".join(no_email_sp) self.owner, "<br>" + "<br>".join(no_email_sp)
)
) )
)
scheduled_date = frappe.db.sql("""select scheduled_date from scheduled_date = frappe.db.sql("""select scheduled_date from
`tabMaintenance Schedule Detail` where sales_person=%s and item_code=%s and `tabMaintenance Schedule Detail` where sales_person=%s and item_code=%s and