浏览代码

Merge pull request #1174 from nabinhait/fix-1

Fixes
version-14
Rushabh Mehta 10 年前
父节点
当前提交
8b34c205ca
共有 3 个文件被更改,包括 6 次插入2 次删除
  1. +1
    -0
      frappe/core/doctype/doctype/doctype.py
  2. +1
    -1
      frappe/public/js/frappe/views/communication.js
  3. +4
    -1
      frappe/templates/pages/print.py

+ 1
- 0
frappe/core/doctype/doctype/doctype.py 查看文件

@@ -315,6 +315,7 @@ def validate_fields(meta):
if not d.permlevel: d.permlevel = 0
if not d.fieldname:
frappe.throw(_("Fieldname is required in row {0}").format(d.idx))
d.fieldname = d.fieldname.lower()
check_illegal_characters(d.fieldname)
check_unique_fieldname(d.fieldname)
check_illegal_mandatory(d)


+ 1
- 1
frappe/public/js/frappe/views/communication.js 查看文件

@@ -331,7 +331,7 @@ frappe.views.CommunicationComposer = Class.extend({
btn: btn,
callback: function(r) {
if(!r.exc) {
if(form_values.send_email)
if(form_values.send_email && r.message["recipients"])
msgprint(__("Email sent to {0}", [r.message["recipients"]]));
me.dialog.hide();



+ 4
- 1
frappe/templates/pages/print.py 查看文件

@@ -277,7 +277,10 @@ def get_visible_columns(data, table_meta, df):
# columns specified by column builder
for col_df in df.get("visible_columns"):
# load default docfield properties
newdf = table_meta.get_field(col_df.get("fieldname")).as_dict().copy()
docfield = table_meta.get_field(col_df.get("fieldname"))
if not docfield:
continue
newdf = docfield.as_dict().copy()
newdf.update(col_df)
if add_column(newdf):
columns.append(newdf)


正在加载...
取消
保存