Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed make_feed() function

Browse Source
This commit is contained in:
Nabin Hait 2011-09-16 11:24:54 +05:30
parent 7545b54a9e
commit 73c4a4a154
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/home/doctype/widget_control/widget_control.py
View File

@ -27,11 +27,6 @@ class DocType:
cmt.comment_date = nowdate() cmt.comment_date = nowdate()
cmt.comment_time = time.strftime('%H:%M') cmt.comment_time = time.strftime('%H:%M')
cmt.save(1) cmt.save(1)
try:
get_obj('Feed Control').upate_comment_in_feed(args['comment_doctype'], args['comment_docname'])
except:
pass
else: else:
raise Exception raise Exception
@ -39,7 +34,3 @@ class DocType:
def remove_comment(self, args): def remove_comment(self, args):
args = json.loads(args) args = json.loads(args)
sql("delete from `tabComment Widget Record` where name=%s",args['id']) sql("delete from `tabComment Widget Record` where name=%s",args['id'])
try:
get_obj('Feed Control').upate_comment_in_feed(args['dt'], args['dn'])
except: pass

6
erpnext/hr/doctype/it_checklist/it_checklist.py
View File

@ -411,9 +411,3 @@ class DocType:
new_tot_income = cint(self.doc.tax_tot_income) + cint(self.doc.edu_cess) - (cint(ret_income_tax[0][0]) or 0) new_tot_income = cint(self.doc.tax_tot_income) + cint(self.doc.edu_cess) - (cint(ret_income_tax[0][0]) or 0)
self.doc.tax_per_month = new_tot_income/cint(self.doc.rem_months) self.doc.tax_per_month = new_tot_income/cint(self.doc.rem_months)
# on update
def on_update(self):
obj = get_obj('Feed Control', 'Feed Control')
obj.make_feed(self.doc)

13
erpnext/selling/doctype/enquiry/enquiry.py
View File

@ -115,26 +115,17 @@ class DocType(TransactionBase):
ch = addchild(ev, 'event_individuals', 'Event User', 0) ch = addchild(ev, 'event_individuals', 'Event User', 0)
ch.person = d ch.person = d
ch.save(1) ch.save(1)
#user_list = ['Sales Manager', 'Sales User']
#for d in user_list:
# ch = addchild(ev, 'event_individuals', 'Event User', 0)
# ch.person = d
# ch.save()
#--------------Validation For Last Contact Date----------------- #--------------Validation For Last Contact Date-----------------
# ==================================================================================================================== # ====================================================================================================================
def set_last_contact_date(self): def set_last_contact_date(self):
#if not self.doc.contact_date_ref:
#self.doc.contact_date_ref=self.doc.contact_date
#self.doc.last_contact_date=self.doc.contact_date_ref
if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date: if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date:
if getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date): if getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date):
self.doc.last_contact_date=self.doc.contact_date_ref self.doc.last_contact_date=self.doc.contact_date_ref
else: else:
msgprint("Contact Date Cannot be before Last Contact Date") msgprint("Contact Date Cannot be before Last Contact Date")
raise Exception raise Exception
#set(self.doc, 'contact_date_ref',self.doc.contact_date)
# check if item present in item table # check if item present in item table
# ==================================================================================================================== # ====================================================================================================================
@ -171,8 +162,6 @@ class DocType(TransactionBase):
raise Exception raise Exception
else: else:
set(self.doc, 'status', 'Cancelled') set(self.doc, 'status', 'Cancelled')
get_obj('Feed Control').make_feed(self.doc, 'cancelled')
# declare as enquiry lost # declare as enquiry lost
#--------------------------- #---------------------------