浏览代码

Merge pull request #843 from nabinhait/hotfix

minor fix
version-14
Nabin Hait 11 年前
父节点
当前提交
88bcc4cabe
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      frappe/model/delete_doc.py
  2. +1
    -1
      frappe/model/rename_doc.py

+ 1
- 1
frappe/model/delete_doc.py 查看文件

@@ -140,7 +140,7 @@ def check_if_doc_is_dynamically_linked(doc):
if frappe.get_meta(df.parent).issingle: if frappe.get_meta(df.parent).issingle:


# dynamic link in single doc # dynamic link in single doc
refdoc = frappe.get_singles_dict(df.parent)
refdoc = frappe.db.get_singles_dict(df.parent)
if refdoc.get(df.options)==doc.doctype and refdoc.get(df.fieldname)==doc.name: if refdoc.get(df.options)==doc.doctype and refdoc.get(df.fieldname)==doc.name:
frappe.throw(_("Cannot delete or cancel because {0} {1} is linked with {2} {3}").format(doc.doctype, frappe.throw(_("Cannot delete or cancel because {0} {1} is linked with {2} {3}").format(doc.doctype,
doc.name, df.parent, ""), frappe.LinkExistsError) doc.name, df.parent, ""), frappe.LinkExistsError)


+ 1
- 1
frappe/model/rename_doc.py 查看文件

@@ -299,7 +299,7 @@ def rename_dynamic_links(doctype, old, new):


# dynamic link in single, just one value to check # dynamic link in single, just one value to check
if frappe.get_meta(df.parent).issingle: if frappe.get_meta(df.parent).issingle:
refdoc = frappe.get_singles_dict(df.parent)
refdoc = frappe.db.get_singles_dict(df.parent)
if refdoc.get(df.options)==doctype and refdoc.get(df.fieldname)==old: if refdoc.get(df.options)==doctype and refdoc.get(df.fieldname)==old:


frappe.db.sql("""update tabSingles set value=%s where frappe.db.sql("""update tabSingles set value=%s where


正在加载...
取消
保存