Merge branch 'hotfix'

This commit is contained in:
Saurabh 2017-10-10 11:22:38 +05:30
commit e78601b040
2 changed files with 2 additions and 1 deletions

View File

@ -4,7 +4,7 @@ import inspect
import frappe
from erpnext.hooks import regional_overrides
__version__ = '9.1.2'
__version__ = '9.1.3'
def get_default_company(user=None):
'''Get default company for user'''

View File

@ -39,6 +39,7 @@ erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
args: {
method: 'erpnext.hr.doctype.upload_attendance.upload_attendance.upload'
},
no_socketio: true,
sample_url: "e.g. http://example.com/somefile.csv",
callback: function(attachment, r) {
var $log_wrapper = $(cur_frm.fields_dict.import_log.wrapper).empty();