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

[tests] refactored (#9984)

Browse Source 
* [tests] refactored

* [fix] test_quotation.js

* [fix] tests.text

* [fix] fiscal year not needed

* [test] add long test

* [fix] add timeout in lead
This commit is contained in:
Rushabh Mehta
2017-07-20 15:35:03 +05:30
committed by GitHub
parent 0e6933a1e8
commit 9d27cf3c62
9 changed files with 150 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,10 +133,15 @@ var calculate_end_time = function(frm, cdt, cdn) {
var child = locals[cdt][cdn];
var d = moment(child.from_time);
d.add(child.hours, "hours");
frm._setting_hours = true;
frappe.model.set_value(cdt, cdn, "to_time", d.format(moment.defaultDatetimeFormat));
frm._setting_hours = false;
if(child.hours) {
d.add(child.hours, "hours");
frm._setting_hours = true;
frappe.model.set_value(cdt, cdn, "to_time",
d.format(moment.defaultDatetimeFormat)).then(() => {
frm._setting_hours = false;
});
}
if((frm.doc.__islocal || frm.doc.__onload.maintain_bill_work_hours_same) && child.hours){
frappe.model.set_value(cdt, cdn, "billing_hours", child.hours);