Merge branch 'develop' into UAE-VAT-Format

2020-10-28 21:06:11 +05:30
parent 81f2efd9b0 a51d9e3259
commit 6e9e6d2491
264 changed files with 16500 additions and 7159 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -286,7 +286,8 @@ doc_events = {
 # to maintain data integrity we exempted payment entry. it will un-link when sales invoice get cancelled.
 # if payment entry not in auto cancel exempted doctypes it will cancel payment entry.
 auto_cancel_exempted_doctypes= [
-	"Payment Entry"
+	"Payment Entry",
+	"Inpatient Medication Entry"
 ]

 scheduler_events = {