Fixed merge conflict

This commit is contained in:
Nabin Hait
2017-01-13 14:34:54 +05:30
17 changed files with 167 additions and 108 deletions

View File

@@ -103,6 +103,8 @@ class StatusUpdater(Document):
def set_status(self, update=False, status=None, update_modified=True):
if self.is_new():
if self.get('amended_from'):
self.status = 'Draft'
return
if self.doctype in status_map: