schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-13-pre-release' into version-13

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-09-06 23:33:19 +05:30
parent 6440e4f970 adb07ebe09
commit f28cb55d0f
2 changed files with 6 additions and 2 deletions
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 erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '13.10.0' __version__ = '13.10.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

6
erpnext/patches/v13_0/add_custom_field_for_south_africa.py
View File

@@ -1,8 +1,8 @@
# Copyright (c) 2020, Frappe and Contributors # Copyright (c) 2020, Frappe and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe import frappe
from erpnext.regional.south_africa.setup import make_custom_fields, add_permissions from erpnext.regional.south_africa.setup import make_custom_fields, add_permissions
def execute(): def execute():
@@ -10,5 +10,9 @@ def execute():
if not company: if not company:
return 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() make_custom_fields()
add_permissions() add_permissions()