Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
diff --git a/erpnext/support/doctype/support_ticket/__init__.py b/erpnext/support/doctype/support_ticket/__init__.py
index d745808..ed42d2b 100644
--- a/erpnext/support/doctype/support_ticket/__init__.py
+++ b/erpnext/support/doctype/support_ticket/__init__.py
@@ -171,5 +171,6 @@
"""
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()
\ No newline at end of file