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

Merge branch 'master' of github.com:webnotes/wnframework

Browse source
This commit is contained in:
Anand Doshi 2012-08-06 18:34:35 +05:30
commit 861d5464b9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/legacy/utils/datetime.js
View file

@ -110,7 +110,7 @@ wn.datetime = {
},
get_user_fmt: function() {
var t = wn.control_panel.date_format;
var t = sys_defaults.date_format;
if(!t) t = 'dd-mm-yyyy';
return t;
},

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

@ -524,7 +524,7 @@ function DateField() { } DateField.prototype = new Field();
DateField.prototype.make_input = function() {
var me = this;
this.user_fmt = wn.control_panel.date_format;
this.user_fmt = sys_defaults.date_format;
if(!this.user_fmt)this.user_fmt = 'dd-mm-yy';
this.input = $a(this.input_area, 'input');