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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-01-09 17:21:34 +05:30
parent 23b836dcdb 21544ca978
commit 6e9d2a3c1f
32 changed files with 403 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/projects/doctype/task/task.py
View File

@@ -55,7 +55,8 @@ class Task(Document):
def update_depends_on(self):
depends_on_tasks = ""
for d in self.depends_on:
depends_on_tasks += d.task + ","
if d.task:
depends_on_tasks += d.task + ","
self.depends_on_tasks = depends_on_tasks
def on_update(self):