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

Merge branch 'staging'

Browse source
This commit is contained in:
mbauskar 2017-09-06 19:26:31 +05:30
commit 3d1027a79d
2 changed files with 3 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__ = '8.10.0'
__version__ = '8.10.1'
__title__ = "Frappe Framework"
local = Local()

3
frappe/public/js/frappe/form/controls/data.js
View file

@ -29,7 +29,8 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
if (!this.df.parent) return;
this.meta = frappe.get_meta(this.df.parent);
if (this.meta && this.meta.autoname
&& this.meta.autoname.substr(0, 6)==='field:') {
&& this.meta.autoname.substr(0, 6)==='field:'
&& this.meta.autoname.substr(6) === this.df.fieldname) {
this.$input.on('keyup', () => {
this.set_description('');
if (this.doc && this.doc.__islocal) {