From 73c4a4a1546f366bc9f7c114a3fa477062ad5e90 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 16 Sep 2011 11:24:54 +0530 Subject: [PATCH] removed make_feed() function --- .../home/doctype/widget_control/widget_control.py | 9 --------- erpnext/hr/doctype/it_checklist/it_checklist.py | 6 ------ erpnext/selling/doctype/enquiry/enquiry.py | 13 +------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/erpnext/home/doctype/widget_control/widget_control.py b/erpnext/home/doctype/widget_control/widget_control.py index fa41cc9db2f..d6bb9d1c459 100644 --- a/erpnext/home/doctype/widget_control/widget_control.py +++ b/erpnext/home/doctype/widget_control/widget_control.py @@ -27,11 +27,6 @@ class DocType: cmt.comment_date = nowdate() cmt.comment_time = time.strftime('%H:%M') cmt.save(1) - - try: - get_obj('Feed Control').upate_comment_in_feed(args['comment_doctype'], args['comment_docname']) - except: - pass else: raise Exception @@ -39,7 +34,3 @@ class DocType: def remove_comment(self, args): args = json.loads(args) 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 diff --git a/erpnext/hr/doctype/it_checklist/it_checklist.py b/erpnext/hr/doctype/it_checklist/it_checklist.py index abed301573a..182e171746a 100644 --- a/erpnext/hr/doctype/it_checklist/it_checklist.py +++ b/erpnext/hr/doctype/it_checklist/it_checklist.py @@ -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) 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) \ No newline at end of file diff --git a/erpnext/selling/doctype/enquiry/enquiry.py b/erpnext/selling/doctype/enquiry/enquiry.py index 12597022bd3..773bedf1fe6 100644 --- a/erpnext/selling/doctype/enquiry/enquiry.py +++ b/erpnext/selling/doctype/enquiry/enquiry.py @@ -115,26 +115,17 @@ class DocType(TransactionBase): ch = addchild(ev, 'event_individuals', 'Event User', 0) ch.person = d 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----------------- # ==================================================================================================================== 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 getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date): self.doc.last_contact_date=self.doc.contact_date_ref else: msgprint("Contact Date Cannot be before Last Contact Date") raise Exception - #set(self.doc, 'contact_date_ref',self.doc.contact_date) # check if item present in item table # ==================================================================================================================== @@ -171,8 +162,6 @@ class DocType(TransactionBase): raise Exception else: set(self.doc, 'status', 'Cancelled') - - get_obj('Feed Control').make_feed(self.doc, 'cancelled') # declare as enquiry lost #---------------------------