Merge branch 'v4.x.x'

This commit is contained in:
Pratik Vyas 2015-03-20 17:26:09 +05:30
commit d0ada4b7cc
5 changed files with 7 additions and 4 deletions

View file

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

View file

@ -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))

View file

@ -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"

View file

@ -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 = {}

View file

@ -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()