Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] [minor] time zone fix

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-10-24 12:52:23 +05:30
parent 3d0af67799
commit b9bca26671
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/doctype/global_defaults/global_defaults.js
View File

@ -4,7 +4,7 @@
$.extend(cur_frm.cscript, { $.extend(cur_frm.cscript, {
onload: function(doc) { onload: function(doc) {
var me = this; var me = this;
this.time_zone = doc.time_zone; this.timezone = doc.time_zone;
wn.call({ wn.call({
method:"webnotes.country_info.get_country_timezone_info", method:"webnotes.country_info.get_country_timezone_info",
@ -12,7 +12,7 @@ $.extend(cur_frm.cscript, {
erpnext.country_info = data.message.country_info; erpnext.country_info = data.message.country_info;
erpnext.all_timezones = data.message.all_timezones; erpnext.all_timezones = data.message.all_timezones;
me.set_timezone_options(); me.set_timezone_options();
cur_frm.set_value("time_zone", me.time_zone); cur_frm.set_value("time_zone", me.timezone);
} }
}); });
}, },
@ -36,10 +36,11 @@ $.extend(cur_frm.cscript, {
}, },
set_timezone_options: function(filtered_options) { set_timezone_options: function(filtered_options) {
var me = this;
if(!filtered_options) filtered_options = []; if(!filtered_options) filtered_options = [];
var remaining_timezones = $.map(erpnext.all_timezones, function(v) var remaining_timezones = $.map(erpnext.all_timezones, function(v)
{ return filtered_options.indexOf(v)===-1 ? v : null; }); { return filtered_options.indexOf(v)===-1 ? v : null; });
this.frm.set_df_property("time_zone", "options", this.frm.set_df_property("time_zone", "options",
(filtered_options.concat([""]).concat(remaining_timezones)).join("\n")); (filtered_options.concat([""]).concat(remaining_timezones)).join("\n"));
} }