nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 06:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Sagar Vora
2019-01-22 15:56:39 +05:30
parent 5582cadae3 815c575a0b
commit 4d1a9b10ed
32 changed files with 2582 additions and 2041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/__init__.py
View File

@@ -7,5 +7,5 @@ from erpnext import get_region
def check_deletion_permission(doc, method):
region = get_region(doc.company)
if region in ["Nepal", "France"]:
if region in ["Nepal", "France"] and doc.docstatus != 0:
frappe.throw(_("Deletion is not permitted for country {0}".format(region)))