diff --git a/js/legacy/utils/datetime.js b/js/legacy/utils/datetime.js index 33d2bec9ea..e4c2d7011b 100644 --- a/js/legacy/utils/datetime.js +++ b/js/legacy/utils/datetime.js @@ -250,6 +250,7 @@ wn.datetime.time_to_hhmm = function(hh,mm,am) { } if(!mm) mm='00'; if(!hh) hh='00'; + return hh + ':' + mm; } diff --git a/js/legacy/widgets/form/fields.js b/js/legacy/widgets/form/fields.js index 10b9ef1eb2..ef34f32ebc 100644 --- a/js/legacy/widgets/form/fields.js +++ b/js/legacy/widgets/form/fields.js @@ -454,6 +454,9 @@ DataField.prototype.make_input = function() { response(r.results); } }); + }, + select: function(event, ui) { + me.set(ui.item.value); } }); } diff --git a/py/core/doctype/doctype/doctype.py b/py/core/doctype/doctype/doctype.py index ff3e766f3c..44d1a47581 100644 --- a/py/core/doctype/doctype/doctype.py +++ b/py/core/doctype/doctype/doctype.py @@ -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: diff --git a/wnf.py b/wnf.py index 1290adf807..2a4675aeaf 100755 --- a/wnf.py +++ b/wnf.py @@ -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