vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[minor] [data import] [reportview] fixes

Browse source
This commit is contained in:
Rushabh Mehta 2013-08-20 15:18:06 +05:30
parent 33c9db9552
commit 7728c8bcfc
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/page/data_import_tool/data_import_tool.py
View file

@ -312,7 +312,7 @@ def upload():
except IndexError, e:
pass
if sum([0 if val=='' else 1 for val in d.values()]):
if sum([0 if not val else 1 for val in d.values()]):
d['doctype'] = dt
if dt != doctype:
if not overwrite:

2
public/js/wn/views/reportview.js
View file

@ -553,6 +553,8 @@ wn.ui.ColumnPicker = Class.extend({
var fieldselect = new wn.ui.FieldSelect(w, this.doctype);
fieldselect.$select.css({"display": "inline"});
fieldselect.$select
.css({width: '70%', 'margin-top':'5px'})
.val((c[1] || this.doctype) + "." + c[0]);