Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/projects/doctype/project/project.py b/projects/doctype/project/project.py
index f8ca430..66d6809 100644
--- a/projects/doctype/project/project.py
+++ b/projects/doctype/project/project.py
@@ -48,7 +48,7 @@
self.doc.name)[0][0]
if total:
completed = webnotes.conn.sql("""select count(*) from tabTask where
- project=%s and status='Closed'""", self.doc.name)[0][0]
+ project=%s and status in ('Closed', 'Cancelled')""", self.doc.name)[0][0]
webnotes.conn.set_value("Project", self.doc.name, "percent_complete",
int(float(completed) / total * 100))