Merge branch 'latest' of github.com:webnotes/erpnext into latest
This commit is contained in:
commit
e08b9425cb
@ -575,8 +575,7 @@ this.format_input();}
|
|||||||
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
||||||
if(this.txt){try{this.txt.focus();}catch(e){}
|
if(this.txt){try{this.txt.focus();}catch(e){}
|
||||||
this.txt.field_object=this;}}
|
this.txt.field_object=this;}}
|
||||||
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a(this.input_area,'input');if(this.df.fieldtype=='Password'){$(this.input).attr('type','password');}
|
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
||||||
this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
|
||||||
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
||||||
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
||||||
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
||||||
@ -1506,8 +1505,7 @@ this.format_input();}
|
|||||||
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
||||||
if(this.txt){try{this.txt.focus();}catch(e){}
|
if(this.txt){try{this.txt.focus();}catch(e){}
|
||||||
this.txt.field_object=this;}}
|
this.txt.field_object=this;}}
|
||||||
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a(this.input_area,'input');if(this.df.fieldtype=='Password'){$(this.input).attr('type','password');}
|
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
||||||
this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
|
||||||
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
||||||
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
||||||
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
||||||
|
@ -484,8 +484,7 @@ this.format_input();}
|
|||||||
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
if(this.input.focus){try{this.input.focus();}catch(e){}}}
|
||||||
if(this.txt){try{this.txt.focus();}catch(e){}
|
if(this.txt){try{this.txt.focus();}catch(e){}
|
||||||
this.txt.field_object=this;}}
|
this.txt.field_object=this;}}
|
||||||
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a(this.input_area,'input');if(this.df.fieldtype=='Password'){$(this.input).attr('type','password');}
|
function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
||||||
this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
|
|
||||||
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
|
||||||
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
|
||||||
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
|
||||||
|
@ -1 +1 @@
|
|||||||
462
|
464
|
Loading…
x
Reference in New Issue
Block a user