nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi
2013-06-10 15:38:31 +05:30
parent 83ce95932a 670199b9c6
commit 097ac352d6
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selling/doctype/lead/lead.py
View File

@@ -65,14 +65,14 @@ class DocType(SellingController):
self.check_email_id_is_unique()
self.add_calendar_event()
def add_calendar_event(self, opts=None):
def add_calendar_event(self, opts=None, force=False):
super(DocType, self).add_calendar_event({
"owner": self.doc.lead_owner,
"subject": ('Contact ' + cstr(self.doc.lead_name)),
"description": ('Contact ' + cstr(self.doc.lead_name)) + \
(self.doc.contact_by and ('. By : ' + cstr(self.doc.contact_by)) or '') + \
(self.doc.remark and ('.To Discuss : ' + cstr(self.doc.remark)) or '')
})
}, force)
def check_email_id_is_unique(self):
if self.doc.email_id:

4
selling/doctype/opportunity/opportunity.py
View File

@@ -93,7 +93,7 @@ class DocType(TransactionBase):
self.add_calendar_event()
def add_calendar_event(self, opts=None):
def add_calendar_event(self, opts=None, force=False):
if not opts:
opts = webnotes._dict()
@@ -116,7 +116,7 @@ class DocType(TransactionBase):
if self.doc.to_discuss:
opts.description += ' To Discuss : ' + cstr(self.doc.to_discuss)
super(DocType, self).add_calendar_event(opts)
super(DocType, self).add_calendar_event(opts, force)
def set_last_contact_date(self):
if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date: