Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/october_2012/remove_old_customer_contact_address.py b/patches/october_2012/remove_old_customer_contact_address.py
index 17674ce..1c62a68 100644
--- a/patches/october_2012/remove_old_customer_contact_address.py
+++ b/patches/october_2012/remove_old_customer_contact_address.py
@@ -2,6 +2,6 @@
import webnotes
webnotes.conn.sql("""delete from `tabSearch Criteria` \
where name = 'customer_address_contact'""")
-
- from webnotes.modules import reload_doc
- reload_doc('selling', 'report', 'customer_addresses_and_contacts')
\ No newline at end of file
+
+ webnotes.reload_doc("core", "doctype", "report")
+ webnotes.reload_doc('selling', 'report', 'customer_addresses_and_contacts')
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py
index 13bc888..f0ed650 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/support/doctype/support_ticket/support_ticket.py
@@ -146,4 +146,8 @@
def reopen_ticket(self):
webnotes.conn.set(self.doc,'status','Open')
- update_feed(self.doc)
+ update_feed(self.doc)
+
+ def on_trash(self):
+ webnotes.conn.sql("""update `tabCommunication set support_ticket=""
+ where support_ticket=%s`""", self.doc.name)