From 49efaa47fcd5912755f870c0d60cf191176d75e4 Mon Sep 17 00:00:00 2001
From: Binal Patel <binalp@labkey.com>
Date: Thu, 21 Aug 2025 14:52:20 -0700
Subject: [PATCH] Add trigger name to error msg.

---
 .../resources/queries/EHR_ComplianceDB/requirements.js        | 2 +-
 .../resources/queries/onprc_billing/chargeableItems.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
index a957924f5..7f2a92c15 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
@@ -63,7 +63,7 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName], 'requirements')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
diff --git a/onprc_billing/resources/queries/onprc_billing/chargeableItems.js b/onprc_billing/resources/queries/onprc_billing/chargeableItems.js
index a9966e285..d3321ea10 100644
--- a/onprc_billing/resources/queries/onprc_billing/chargeableItems.js
+++ b/onprc_billing/resources/queries/onprc_billing/chargeableItems.js
@@ -11,11 +11,11 @@ var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.
 var ehrHelper = org.labkey.ehr.utils.TriggerScriptHelper.create(LABKEY.Security.currentUser.id, LABKEY.Security.currentContainer.id);
 
 function beforeDelete(row, errors){
-    if (helper.verifyNotUsed('onprc_billing', 'invoicedItems', 'chargeid', row['rowid'])){
+    if (helper.verifyNotUsed('onprc_billing', 'invoicedItems', 'chargeid', row['rowid'], 'chargeableItems')){
         addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table invoicedItems.  You should inactivate this item instead.');
     }
 
-    if (helper.verifyNotUsed('onprc_billing', 'miscCharges', 'chargeid', row['rowid'], ehrHelper.getEHRStudyContainerPath())){
+    if (helper.verifyNotUsed('onprc_billing', 'miscCharges', 'chargeid', row['rowid'], ehrHelper.getEHRStudyContainerPath(), 'chargeableItems')){
         addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table miscCharges.  You should inactivate this item instead.');
     }
 }