[merge master

]
This commit is contained in:
Rushabh Mehta
2013-04-18 10:37:16 +05:30
38 changed files with 616 additions and 373 deletions

View File

@@ -136,10 +136,7 @@ erpnext.startup.set_periodic_updates = function() {
erpnext.hide_naming_series = function() {
if(cur_frm.fields_dict.naming_series) {
hide_field('naming_series');
if(cur_frm.doc.__islocal) {
unhide_field('naming_series');
}
cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
}
}