commit 360c1efd185e9ba3385698c2dbdb37b7c7f6cebc
author Nabin Hait <nabinhait@gmail.com> Mon Sep 25 16:36:47 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Sep 25 16:36:47 2017 +0530
tree e9f2f01620af81b982dde8fb77fcc48dbdbe4ec2
parent 39c2f75e6d268d40b364929c1f4953c1af014472
parent a0b85cd1ec0ad2e404226f01d86e66647a9663fe

Merge branch 'master' into staging

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index c434021..f327404 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
 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'''

erpnext/patches/v8_9/set_print_zero_amount_taxes.py

diff --git a/erpnext/patches/v8_9/set_print_zero_amount_taxes.py b/erpnext/patches/v8_9/set_print_zero_amount_taxes.py
index 33d3ced..621b573 100644
--- a/erpnext/patches/v8_9/set_print_zero_amount_taxes.py
+++ b/erpnext/patches/v8_9/set_print_zero_amount_taxes.py
@@ -4,4 +4,5 @@
 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()
\ No newline at end of file