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

fix: requested changes

Browse Source
This commit is contained in:
Anurag Mishra 2020-02-05 12:45:43 +05:30
parent 3496104ebe
commit eacc1bc2dc
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/hr/doctype/vehicle_log/vehicle_log.js
View File

@ -5,32 +5,32 @@ frappe.ui.form.on("Vehicle Log", {
refresh: function(frm) { refresh: function(frm) {
if(frm.doc.license_plate && frm.doc.__islocal){ if(frm.doc.license_plate && frm.doc.__islocal){
frm.events.set_vehicle_details(frm) frm.events.set_vehicle_details(frm);
} }
if(frm.doc.docstatus == 1) { if(frm.doc.docstatus == 1) {
frm.add_custom_button(__('Expense Claim'), function() { frm.add_custom_button(__('Expense Claim'), function() {
frm.events.expense_claim(frm) frm.events.expense_claim(frm);
}, __('Create')); }, __('Create'));
frm.page.set_inner_btn_group_as_primary(__('Create')); frm.page.set_inner_btn_group_as_primary(__('Create'));
} }
}, },
license_plate: function(frm){ license_plate: function(frm) {
if(frm.doc.license_plate){ if(frm.doc.license_plate){
frm.events.set_vehicle_details(frm) frm.events.set_vehicle_details(frm);
} }
}, },
set_vehicle_details: function(frm){ set_vehicle_details: function(frm) {
frappe.call({ frappe.call({
method: "erpnext.hr.doctype.vehicle_log.vehicle_log.get_make_model", method: "erpnext.hr.doctype.vehicle_log.vehicle_log.get_make_model",
args: { args: {
license_plate: frm.doc.license_plate license_plate: frm.doc.license_plate
}, },
callback: function(r) { callback: function(r) {
frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "model", r.message[0]); frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "make", r.message[0]);
frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "make", r.message[1]); frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "model", r.message[1]);
frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "last_odometer", r.message[2]); frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "last_odometer", r.message[2]);
frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "employee", r.message[3]); frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "employee", r.message[3]);
} }

11
erpnext/hr/doctype/vehicle_log/vehicle_log.py
View File

@ -18,12 +18,17 @@ class VehicleLog(Document):
if not (service_detail.service_item and service_detail.type and service_detail.frequency and service_detail.expense_amount): if not (service_detail.service_item and service_detail.type and service_detail.frequency and service_detail.expense_amount):
frappe.throw(_("Service Item,Type,frequency and expense amount are required")) frappe.throw(_("Service Item,Type,frequency and expense amount are required"))
def before_save(self):
model_details = get_make_model(self.license_plate)
self.make = model_details[0]
self.model = model_details[1]
self.last_odometer = model_details[2]
self.employee = model_details[3]
def on_submit(self): def on_submit(self):
print("I am here")
frappe.db.set_value("Vehicle", self.license_plate, "last_odometer", self.odometer) frappe.db.set_value("Vehicle", self.license_plate, "last_odometer", self.odometer)
def on_cancel(self): def on_cancel(self):
print("sel"*10, self.last_odometer, self.odometer)
distance_travelled = self.odometer - self.last_odometer distance_travelled = self.odometer - self.last_odometer
if(distance_travelled > 0): if(distance_travelled > 0):
updated_odometer_value = int(frappe.db.get_value("Vehicle", self.license_plate, "last_odometer")) - distance_travelled updated_odometer_value = int(frappe.db.get_value("Vehicle", self.license_plate, "last_odometer")) - distance_travelled
@ -32,7 +37,7 @@ class VehicleLog(Document):
@frappe.whitelist() @frappe.whitelist()
def get_make_model(license_plate): def get_make_model(license_plate):
vehicle=frappe.get_doc("Vehicle",license_plate) vehicle=frappe.get_doc("Vehicle",license_plate)
return (vehicle.make,vehicle.model,vehicle.last_odometer,vehicle.employee) return (vehicle.make, vehicle.model, vehicle.last_odometer, vehicle.employee)
@frappe.whitelist() @frappe.whitelist()
def make_expense_claim(docname): def make_expense_claim(docname):