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

Merge pull request #5816 from rohitwaghchaure/minor_issue

Browse Source 
[Fix] To time issue in timesheet
This commit is contained in:
Rushabh Mehta 2016-07-21 14:58:49 +05:30 committed by GitHub
commit 4a5cc77352
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,15 +78,8 @@ frappe.ui.form.on("Timesheet Detail", {
var child = locals[cdt][cdn];
if(frm._setting_hours) return;
if(flt(child.hours) == 0.0){
frappe.model.set_value(cdt, cdn, "hours", moment(child.to_time).diff(moment(child.from_time),
"seconds") / 3600);
}else{
var d = moment(child.to_time);
d.add(child.hours, "hours");
frappe.model.set_value(cdt, cdn, "from_time", d.format(moment.defaultDatetimeFormat));
}
frappe.model.set_value(cdt, cdn, "hours", moment(child.to_time).diff(moment(child.from_time),
"seconds") / 3600);
},
hours: function(frm, cdt, cdn) {