Merge branch 'master' into staging

This commit is contained in:
Nabin Hait 2017-09-25 16:36:47 +05:30
commit 360c1efd18
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__ = '8.11.5'
__version__ = '8.11.6'
def get_default_company(user=None):
'''Get default company for user'''

View File

@ -4,4 +4,5 @@ import frappe
from erpnext.setup.install import create_print_zero_amount_taxes_custom_field
def execute():
frappe.reload_doc("printing", "doctype", "print_style")
create_print_zero_amount_taxes_custom_field()