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

Merge branch 'master' into staging

Browse Source
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
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__ = '8.11.5' __version__ = '8.11.6'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

1
erpnext/patches/v8_9/set_print_zero_amount_taxes.py
View File

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