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

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-05 08:54:58 +00:00
commit ad908779be
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
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

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '10.1.55'
__version__ = '10.1.56'
def get_default_company(user=None):
'''Get default company for user'''

1
erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
View File

@ -142,6 +142,7 @@ frappe.ui.form.on('Patient Appointment', {
frm.set_value('service_unit', btn_selected.attr('data-service-unit') || '');
frm.set_value('duration', btn_selected.attr('data-duration'));
d.hide();
frm.enable_save();
frm.save();
frm.enable_save();
}