Ver a proveniência

Merge branch 'hotfix'

version-14
Nabin Hait há 8 anos
ascendente
cometimento
a10425059f
4 ficheiros alterados com 4 adições e 3 eliminações
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/desk/reportview.py
  3. +1
    -1
      frappe/patches.txt
  4. +1
    -0
      frappe/patches/v8_0/setup_email_inbox.py

+ 1
- 1
frappe/__init__.py Ver ficheiro

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


__version__ = '8.0.0'
__version__ = '8.0.1'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/desk/reportview.py Ver ficheiro

@@ -45,7 +45,7 @@ def get_form_params():
if "." in key: if "." in key:
parenttype, fieldname = key.split(".")[0][4:-1], key.split(".")[1].strip("`") parenttype, fieldname = key.split(".")[0][4:-1], key.split(".")[1].strip("`")
else: else:
parenttype = doctype
parenttype = data.doctype
fieldname = fieldname.strip("`") fieldname = fieldname.strip("`")


df = frappe.get_meta(parenttype).get_field(fieldname) df = frappe.get_meta(parenttype).get_field(fieldname)


+ 1
- 1
frappe/patches.txt Ver ficheiro

@@ -15,6 +15,7 @@ frappe.patches.v8_0.drop_in_dialog
frappe.patches.v8_0.update_published_in_global_search frappe.patches.v8_0.update_published_in_global_search
execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
execute:frappe.reload_doc('core', 'doctype', 'deleted_document') execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
execute:frappe.reload_doc('core', 'doctype', 'version') #2016-12-28
frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16 frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16
frappe.patches.v7_2.setup_custom_perms #2017-01-19 frappe.patches.v7_2.setup_custom_perms #2017-01-19
frappe.patches.v8_0.set_user_permission_for_page_and_report #2017-03-20 frappe.patches.v8_0.set_user_permission_for_page_and_report #2017-03-20
@@ -24,7 +25,6 @@ execute:frappe.reload_doc('custom', 'doctype', 'custom_field') #2015-10-19
execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26 execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26
execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03 execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03
execute:frappe.reload_doc('core', 'doctype', 'translation') #2016-03-03 execute:frappe.reload_doc('core', 'doctype', 'translation') #2016-03-03
execute:frappe.reload_doc('core', 'doctype', 'version') #2016-12-28
execute:frappe.reload_doc('email', 'doctype', 'email_alert') #2014-07-15 execute:frappe.reload_doc('email', 'doctype', 'email_alert') #2014-07-15
execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31-1 execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31-1
execute:frappe.reload_doc('custom', 'doctype', 'property_setter') #2014-12-31-1 execute:frappe.reload_doc('custom', 'doctype', 'property_setter') #2014-12-31-1


+ 1
- 0
frappe/patches/v8_0/setup_email_inbox.py Ver ficheiro

@@ -28,6 +28,7 @@ def setup_inbox_from_email_account():
""" add user inbox child table entry for existing email account in not exists """ """ add user inbox child table entry for existing email account in not exists """


frappe.reload_doc("core", "doctype", "user_email") frappe.reload_doc("core", "doctype", "user_email")
frappe.reload_doc("email", "doctype", "email_account")


email_accounts = frappe.get_all("Email Account", filters={"enable_incoming": 1}, email_accounts = frappe.get_all("Email Account", filters={"enable_incoming": 1},
fields=["name", "email_id", "awaiting_password", "enable_outgoing"]) fields=["name", "email_id", "awaiting_password", "enable_outgoing"])


Carregando…
Cancelar
Guardar