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

This commit is contained in:
Rushabh Mehta 2012-11-26 10:49:15 +01:00
commit d3df97e2e2
2 changed files with 8 additions and 4 deletions

View File

@ -2,6 +2,6 @@ def execute():
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')
webnotes.reload_doc("core", "doctype", "report")
webnotes.reload_doc('selling', 'report', 'customer_addresses_and_contacts')

View File

@ -146,4 +146,8 @@ class DocType(TransactionBase):
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)