From 96aee284d2c2ddbc27959fb85b6ccb62719523b1 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Fri, 3 Sep 2021 12:29:27 +0530 Subject: [PATCH 1/3] fix: south africa vat patch failure (#27324) * fix: south africa vat patch failure (#27323) reload doc is necessary on new doctypes (cherry picked from commit d1fe060e4afb96324492beca77c69698cb32a085) # Conflicts: # erpnext/patches/v13_0/add_custom_field_for_south_africa.py * fix: resolve conflicts Co-authored-by: Ankush Menat --- erpnext/patches/v13_0/add_custom_field_for_south_africa.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py index 73ff1cad5b6..5bfa823b4a1 100644 --- a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py +++ b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py @@ -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,8 @@ def execute(): if not company: return + frappe.reload_doc('regional', 'doctype', 'south_africa_vat_settings') + frappe.reload_doc('accounts', 'doctype', 'south_africa_vat_account') + make_custom_fields() add_permissions() From 2565b1fb33fea8aa10516fad357ddf93fc12d9b6 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 6 Sep 2021 13:51:27 +0530 Subject: [PATCH 2/3] fix: patch failure for vat audit report (#27355) (#27356) (cherry picked from commit 14b01619dee91ff41381d180bc907ad18744e15a) Co-authored-by: Ankush Menat --- erpnext/patches/v13_0/add_custom_field_for_south_africa.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py index 5bfa823b4a1..32566b8d21d 100644 --- a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py +++ b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py @@ -11,6 +11,7 @@ def execute(): 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() From adb07ebe093b23e65e61291d0c234fe497c31bfe Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 6 Sep 2021 23:53:19 +0550 Subject: [PATCH 3/3] bumped to version 13.10.1 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 89e4b4a677b..4a12e657765 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -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'''