merge whitespace

This commit is contained in:
Rushabh Mehta 2012-05-14 15:08:38 +05:30
commit 37cd700e08
4 changed files with 6 additions and 1 deletions

View file

@ -250,6 +250,7 @@ wn.datetime.time_to_hhmm = function(hh,mm,am) {
}
if(!mm) mm='00';
if(!hh) hh='00';
return hh + ':' + mm;
}

View file

@ -454,6 +454,9 @@ DataField.prototype.make_input = function() {
response(r.results);
}
});
},
select: function(event, ui) {
me.set(ui.item.value);
}
});
}

View file

@ -75,6 +75,7 @@ class DocType:
fieldnames = {}
illegal = ['.', ',', ' ', '-', '&', '%', '=', '"', "'", '*', '$']
for d in self.doclist:
if not d.permlevel: d.permlevel = 0
if d.parent and d.fieldtype and d.parent == self.doc.name:
# check if not double
if d.fieldname:

2
wnf.py
View file

@ -162,7 +162,7 @@ def run():
webnotes.connect(options.db_name, options.password)
else:
webnotes.connect(options.db_name)
elif not options.install:
elif not any([options.install, options.pull]):
webnotes.connect(conf.db_name)
# build