commonfied regional function for checking delete permission
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 7ed9b88..a97f80f 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -201,11 +201,11 @@
"Sales Invoice": {
'validate': 'erpnext.regional.india.utils.set_place_of_supply',
"on_submit": "erpnext.regional.france.utils.create_transaction_log",
- "on_trash": ["erpnext.regional.france.utils.check_deletion_permission", "erpnext.regional.nepal.utils.check_deletion_permission"]
+ "on_trash": "erpnext.regional.check_deletion_permission"
},
"Payment Entry": {
"on_submit": ["erpnext.regional.france.utils.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.make_status_as_paid"],
- "on_trash": "erpnext.regional.france.utils.check_deletion_permission"
+ "on_trash": "erpnext.regional.check_deletion_permission"
},
'Address': {
'validate': 'erpnext.regional.india.utils.validate_gstin_for_india'
diff --git a/erpnext/regional/__init__.py b/erpnext/regional/__init__.py
index e69de29..510ed58 100644
--- a/erpnext/regional/__init__.py
+++ b/erpnext/regional/__init__.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2018, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _
+from erpnext import get_region
+
+def check_deletion_permission(doc, method):
+ region = get_region()
+ if region in ["Nepal", "France"]:
+ frappe.throw(_("Deletion is not permitted for country {0}".format(region)))
\ No newline at end of file
diff --git a/erpnext/regional/france/utils.py b/erpnext/regional/france/utils.py
index c963d74..9e9f0ad 100644
--- a/erpnext/regional/france/utils.py
+++ b/erpnext/regional/france/utils.py
@@ -9,9 +9,7 @@
region = get_region()
if region not in ["France"]:
return
-
else:
-
data = str(doc.as_dict())
frappe.get_doc({
@@ -21,14 +19,6 @@
"data": data
}).insert(ignore_permissions=True)
-def check_deletion_permission(doc, method):
- region = get_region()
- if region not in ["France"]:
- return
-
- else:
- frappe.throw(_("Deletion is not permitted for country {0}".format(region)))
-
# don't remove this function it is used in tests
def test_method():
'''test function'''
diff --git a/erpnext/regional/nepal/__init__.py b/erpnext/regional/nepal/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/regional/nepal/__init__.py
+++ /dev/null
diff --git a/erpnext/regional/nepal/utils.py b/erpnext/regional/nepal/utils.py
deleted file mode 100644
index 76801b9..0000000
--- a/erpnext/regional/nepal/utils.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe import _
-from erpnext import get_region
-
-def check_deletion_permission(doc, method):
- region = get_region()
- if region not in ["Nepal"]:
- return
- else:
- frappe.throw(_("Deletion is not permitted for country {0}".format(region)))
\ No newline at end of file