Merge branch 'version-13-pre-release' into version-13
This commit is contained in:
@@ -5,7 +5,7 @@ import frappe
|
||||
from erpnext.hooks import regional_overrides
|
||||
from frappe.utils import getdate
|
||||
|
||||
__version__ = '13.10.0'
|
||||
__version__ = '13.10.1'
|
||||
|
||||
def get_default_company(user=None):
|
||||
'''Get default company for user'''
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Copyright (c) 2020, Frappe and Contributors
|
||||
# License: GNU General Public License v3. See license.txt
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import frappe
|
||||
|
||||
from erpnext.regional.south_africa.setup import make_custom_fields, add_permissions
|
||||
|
||||
def execute():
|
||||
@@ -10,5 +10,9 @@ def execute():
|
||||
if not company:
|
||||
return
|
||||
|
||||
frappe.reload_doc('regional', 'doctype', 'south_africa_vat_settings')
|
||||
frappe.reload_doc('regional', 'report', 'vat_audit_report')
|
||||
frappe.reload_doc('accounts', 'doctype', 'south_africa_vat_account')
|
||||
|
||||
make_custom_fields()
|
||||
add_permissions()
|
||||
|
||||
Reference in New Issue
Block a user