From 9f74dc1802bbfb8e7c67eb5eef635425c38de414 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 24 Aug 2021 14:21:14 +0530 Subject: [PATCH] fix: Use remove_all from file_manager (cherry picked from commit 1e05c9467bc5fa9315a67c7f8ed9ff5b17baa3e6) # Conflicts: # erpnext/regional/italy/utils.py --- erpnext/regional/italy/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py index 8dffd99eadb..5a2710d0d01 100644 --- a/erpnext/regional/italy/utils.py +++ b/erpnext/regional/italy/utils.py @@ -3,7 +3,10 @@ import json import frappe from frappe import _ +<<<<<<< HEAD from frappe.utils import cstr, flt +======= +>>>>>>> 1e05c9467b (fix: Use remove_all from file_manager) from frappe.utils.file_manager import remove_file from six import string_types