Browse Source

Merge branch 'staging'

version-14
mbauskar 7 years ago
parent
commit
3d1027a79d
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -1
      frappe/public/js/frappe/form/controls/data.js

+ 1
- 1
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()


+ 2
- 1
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) {


Loading…
Cancel
Save