浏览代码

[minor] import and assign

version-14
Rushabh Mehta 7 年前
父节点
当前提交
6470d26d19
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. +5
    -0
      frappe/core/page/data_import_tool/importer.py
  2. +2
    -2
      frappe/public/js/frappe/form/footer/assign_to.js

+ 5
- 0
frappe/core/page/data_import_tool/importer.py 查看文件

@@ -119,6 +119,9 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
fieldname = column_idx_to_fieldname[(dt, parentfield)][column_idx]
fieldtype = column_idx_to_fieldtype[(dt, parentfield)][column_idx]

if not fieldname:
continue

d[fieldname] = rows[idx][column_idx]
if fieldtype in ("Int", "Check"):
d[fieldname] = cint(d[fieldname])
@@ -184,6 +187,8 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
autoname = autoname[6:]
elif autoname=='naming_series:':
autoname = 'naming_series'
else:
return True

if autoname and not doc[autoname]:
frappe.throw(_("{0} is a mandatory field".format(autoname)))


+ 2
- 2
frappe/public/js/frappe/form/footer/assign_to.js 查看文件

@@ -136,12 +136,12 @@ frappe.ui.form.AssignToDialog = Class.extend({
{fieldtype: 'Link', fieldname:'assign_to', options:'User',
label:__("Assign To"), reqd:true, filters: {'user_type': 'System User'}},
{fieldtype:'Check', fieldname:'myself', label:__("Assign to me"), "default":0},
{fieldtype:'Small Text', fieldname:'description', label:__("Comment"), reqd:true},
{fieldtype:'Small Text', fieldname:'description', label:__("Comment")},
{fieldtype: 'Section Break'},
{fieldtype: 'Column Break'},
{fieldtype:'Date', fieldname:'date', label: __("Complete By")},
{fieldtype:'Check', fieldname:'notify',
label:__("Notify by Email"), "default":1},
label:__("Notify by Email")},
{fieldtype: 'Column Break'},
{fieldtype:'Select', fieldname:'priority', label: __("Priority"),
options:[


正在加载...
取消
保存