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

Merge branch 'master' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	projects/doctype/project/project.py
	utilities/transaction_base.py
This commit is contained in:
Anand Doshi
2013-06-17 12:55:05 +05:30
parent 1e820f352e 11d311376e
commit b5fd788131
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/doctype/project/project.py
View File

@@ -19,6 +19,7 @@ import webnotes
from webnotes.utils import flt, getdate
from webnotes import msgprint
from utilities.transaction_base import delete_events
class DocType:
def __init__(self, doc, doclist=None):
@@ -54,7 +55,7 @@ class DocType:
def add_calendar_event(self):
# delete any earlier event for this project
self.delete_events()
delete_events(self.doc.doctype, self.doc.name)
# add events
for milestone in self.doclist.get({"parentfield": "project_milestones"}):
@@ -72,8 +73,4 @@ class DocType:
}).insert()
def on_trash(self):
self.delete_events()
def delete_events(self):
webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent`
where ref_type=%s and ref_name=%s""", (self.doc.doctype, self.doc.name)))
delete_events(self.doc.doctype, self.doc.name)