瀏覽代碼

Merge branch 'develop'

version-14
Nabin Hait 7 年之前
父節點
當前提交
8895e89315
共有 4 個檔案被更改,包括 5 行新增3 行删除
  1. +1
    -1
      frappe/__init__.py
  2. +0
    -0
      frappe/change_log/v10/v10_0_0.md
  3. +3
    -1
      frappe/core/doctype/data_import/importer.py
  4. +1
    -1
      frappe/public/js/frappe/model/sync.js

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

@@ -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.2'
__version__ = '10.0.3'
__title__ = "Frappe Framework"

local = Local()


frappe/change_log/v10_0_0.md → frappe/change_log/v10/v10_0_0.md 查看文件


+ 3
- 1
frappe/core/doctype/data_import/importer.py 查看文件

@@ -211,7 +211,9 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
return True

if (autoname and autoname not in doc) or (autoname and not doc[autoname]):
frappe.throw(_("{0} is a mandatory field".format(autoname)))
from frappe.model.base_document import get_controller
if not hasattr(get_controller(doctype), "autoname"):
frappe.throw(_("{0} is a mandatory field".format(autoname)))
return True

users = frappe.db.sql_list("select name from tabUser")


+ 1
- 1
frappe/public/js/frappe/model/sync.js 查看文件

@@ -45,7 +45,7 @@ $.extend(frappe.model, {
}
}

if(cur_frm && isPlain) cur_frm.dirty();

}



Loading…
取消
儲存