nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Frappe Bot
2019-02-15 10:22:33 +00:00
parent 3a88bc43dc 58dda68430
commit 74fd5daeb2
19 changed files with 99 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ frappe.ui.form.on("Timesheet", {
return{
filters: {
'project': child.project,
'status': ["!=", "Closed"]
'status': ["!=", "Cancelled"]
}
}
}