nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] ux fixes

Browse Source
This commit is contained in:
Rushabh Mehta
2017-06-20 09:30:53 +05:30
parent 9a5c39d329
commit 36311020de
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/projects/doctype/timesheet/timesheet.js
View File

@@ -1,9 +1,9 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
frappe.ui.form.on("Timesheet", {
setup: function(frm) {
frm.add_fetch('employee', 'employee_name', 'employee_name');
frm.fields_dict.employee.get_query = function() {
return {
filters:{
@@ -51,8 +51,8 @@ frappe.ui.form.on("Timesheet", {
}
if(frm.doc.per_billed > 0) {
cur_frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
cur_frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
}
},
@@ -77,7 +77,7 @@ frappe.ui.form.on("Timesheet Detail", {
},
from_time: function(frm, cdt, cdn) {
calculate_end_time(frm, cdt, cdn)
calculate_end_time(frm, cdt, cdn);
},
to_time: function(frm, cdt, cdn) {
@@ -109,18 +109,20 @@ frappe.ui.form.on("Timesheet Detail", {
},
activity_type: function(frm, cdt, cdn) {
var child = locals[cdt][cdn];
frm.script_manager.copy_from_first_row('time_logs', frm.selected_doc,
'project');
frappe.call({
method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
args: {
employee: frm.doc.employee,
activity_type: child.activity_type
activity_type: frm.selected_doc.activity_type
},
callback: function(r){
if(r.message){
frappe.model.set_value(cdt, cdn, 'billing_rate', r.message['billing_rate']);
frappe.model.set_value(cdt, cdn, 'costing_rate', r.message['costing_rate']);
calculate_billing_costing_amount(frm, cdt, cdn)
calculate_billing_costing_amount(frm, cdt, cdn);
}
}
})
@@ -174,8 +176,8 @@ var calculate_time_and_amount = function(frm) {
}
}
cur_frm.set_value("total_billable_hours", total_billing_hr);
cur_frm.set_value("total_hours", total_working_hr);
cur_frm.set_value("total_billable_amount", total_billable_amount);
cur_frm.set_value("total_costing_amount", total_costing_amount);
frm.set_value("total_billable_hours", total_billing_hr);
frm.set_value("total_hours", total_working_hr);
frm.set_value("total_billable_amount", total_billable_amount);
frm.set_value("total_costing_amount", total_costing_amount);
}