Browse Source

Merge branch 'develop'

version-14
Saurabh 8 years ago
parent
commit
a6da791765
3 changed files with 5 additions and 3 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -1
      frappe/email/doctype/email_account/email_account.py
  3. +1
    -1
      frappe/email/receive.py

+ 1
- 1
frappe/__init__.py View File

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template

__version__ = '8.0.27'
__version__ = '8.0.28'
__title__ = "Frappe Framework"

local = Local()


+ 3
- 1
frappe/email/doctype/email_account/email_account.py View File

@@ -251,8 +251,10 @@ class EmailAccount(Document):
return

emails = email_server.get_messages()
if not emails:
return

incoming_mails = emails.get("latest_messages")
incoming_mails = emails.get("latest_messages", [])
uid_list = emails.get("uid_list", [])
seen_status = emails.get("seen_status", [])
uid_reindexed = emails.get("uid_reindexed", False)


+ 1
- 1
frappe/email/receive.py View File

@@ -100,7 +100,7 @@ class EmailServer:
frappe.db.commit()

if not self.connect():
return []
return

uid_list = []



Loading…
Cancel
Save