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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Saurabh 2017-10-10 11:22:39 +05:30
commit 9893a2d608
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

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

1
erpnext/hr/doctype/upload_attendance/upload_attendance.js
View File

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