浏览代码

Merge branch 'v4.x.x'

version-14
Pratik Vyas 10 年前
父节点
当前提交
d0ada4b7cc
共有 5 个文件被更改,包括 7 次插入4 次删除
  1. +1
    -1
      frappe/__version__.py
  2. +2
    -0
      frappe/core/doctype/comment/comment.py
  3. +1
    -1
      frappe/hooks.py
  4. +2
    -1
      frappe/translate.py
  5. +1
    -1
      setup.py

+ 1
- 1
frappe/__version__.py 查看文件

@@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "4.13.2"
__version__ = "4.13.3"

+ 2
- 0
frappe/core/doctype/comment/comment.py 查看文件

@@ -60,6 +60,8 @@ class Comment(Document):
raise

def update_comments_in_parent(self, _comments):
if frappe.db.get_value("DocType", self.comment_doctype, "issingle"):
return
# use sql, so that we do not mess with the timestamp
frappe.db.sql("""update `tab%s` set `_comments`=%s where name=%s""" % (self.comment_doctype,
"%s", "%s"), (json.dumps(_comments), self.comment_docname))


+ 1
- 1
frappe/hooks.py 查看文件

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
app_publisher = "Web Notes Technologies Pvt. Ltd."
app_description = "Full Stack Web Application Framework in Python"
app_icon = "assets/frappe/images/frappe.svg"
app_version = "4.13.2"
app_version = "4.13.3"
app_color = "#3498db"
app_email = "support@frappe.io"



+ 2
- 1
frappe/translate.py 查看文件

@@ -138,7 +138,8 @@ def get_lang_js(fortype, name):
def get_full_dict(lang):
if lang == "en":
return {}
return frappe.cache().get_value("lang:" + lang, lambda:load_lang(lang))
translations = load_lang(lang)
return frappe.cache().get_value("lang:" + lang, lambda:translations) if translations else {}

def load_lang(lang, apps=None):
out = {}


+ 1
- 1
setup.py 查看文件

@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os

version = "4.13.2"
version = "4.13.3"

with open("requirements.txt", "r") as f:
install_requires = f.readlines()


正在加载...
取消
保存