浏览代码

Merge pull request #2993 from nabinhait/develop

Reload contact to update new module, which is required while reloading communication
version-14
Nabin Hait 8 年前
committed by GitHub
父节点
当前提交
2de7f5c1aa
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. +1
    -1
      frappe/core/doctype/user/user.js
  2. +4
    -2
      frappe/patches/v7_2/update_communications.py

+ 1
- 1
frappe/core/doctype/user/user.js 查看文件

@@ -84,7 +84,7 @@ frappe.ui.form.on('User', {
}
}
if (!found){
frm.add_custom_button("Create User Email", function() {
frm.add_custom_button(__("Create User Email"), function() {
frm.events.create_user_email(frm)
})
}


+ 4
- 2
frappe/patches/v7_2/update_communications.py 查看文件

@@ -6,10 +6,12 @@ def execute():
remove Guest None from sender full name
setup feedback request trigger's is_manual field
"""

frappe.reload_doc('core', 'doctype', 'dynamic_link')
frappe.reload_doc('email', 'doctype', 'contact')
frappe.reload_doc("core", "doctype", "feedback_request")
frappe.reload_doc("core", "doctype", "communication")
if frappe.db.has_column('Communication', 'feedback'):
frappe.db.sql("""update tabCommunication set content=ifnull(feedback, "feedback details not provided")
where communication_type="Feedback" and content is NULL""")


正在加载...
取消
保存