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

2012-05-15 12:15:44 +05:30
parent ed02a85184 4ce0cd7274
commit 0a1c5d9db6
1 changed files with 3 additions and 2 deletions
--- a/erpnext/support/doctype/support_ticket/init.py
+++ b/erpnext/support/doctype/support_ticket/init.py
@@ -171,5 +171,6 @@ def get_support_mails():
 	"""
 		Gets new emails from support inbox and updates / creates Support Ticket records
 	"""
-	SupportMailbox().get_messages()
-
+	import webnotes
+	if webnotes.conn.get_value('Email Settings', None, 'sync_support_mails'):
+		SupportMailbox().get_messages()