vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Saurabh 2018-02-08 15:28:44 +05:30
commit bc40ed5a87
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.0.21'
__version__ = '10.0.22'
__title__ = "Frappe Framework"
local = Local()

2
frappe/public/js/legacy/client_script_helpers.js
View file

@ -437,7 +437,7 @@ _f.Frm.prototype.set_indicator_formatter = function(fieldname, get_color, get_te
function(value, df, options, doc) {
if(value) {
return repl('<a class="indicator %(color)s" href="#Form/%(doctype)s/%(name)s">%(label)s</a>', {
color: get_color(doc),
color: get_color(doc || {}),
doctype: df.options,
name: value,
label: get_text ? get_text(doc) : value