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

fixes

Browse source
This commit is contained in:
Rushabh Mehta 2011-09-16 15:36:51 +05:30
parent ff6fa63d29
commit 42358b1d90
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/legacy/widgets/form/fields.js
View file

@ -1208,7 +1208,7 @@ _f.ButtonField.prototype.make_input = function() { var me = this;
this.input.onclick = function() {
if(me.not_in_form) return;
this.disabled = true;
this.disabled = 'disabled';
if(cur_frm.cscript[me.df.label] && (!me.in_filter)) {
cur_frm.runclientscript(me.df.label, me.doctype, me.docname);
this.disabled = false;

6
wnf.py
View file

@ -58,6 +58,12 @@ def run():
vc.merge(vc.repo, vc.master)
vc.close()
elif cmd=='merge-local':
vc = version.VersionControl()
vc.setup_master()
vc.merge(vc.master, vc.repo)
vc.close()
elif cmd=='setup':
setup()