Improvements after review

grails-app/domain/org/pih/warehouse/requisition/Requisition.groovy

@@ -414,8 +414,8 @@ class Requisition implements Comparable<Requisition>, Serializable {
  return destination.supports(ActivityCode.ENABLE_REQUESTOR_APPROVAL_NOTIFICATIONS)
  }
 
- // by default always send approval workflow notifications (if not handled above)
- return true
+ // If status is not handled above assume it is wrongly triggered and don't send notification
+ return false
  }
 
  Map toJson() {

grails-app/services/org/pih/warehouse/inventory/RequisitionStatusTransitionEventService.groovy

@@ -18,6 +18,8 @@ class RequisitionStatusTransitionEventService implements ApplicationListener<Req
  NotificationService notificationService
 
  void onApplicationEvent(RequisitionStatusTransitionEvent event) {
- notificationService.publishRequisitionStatusTransitionNotifications(event.requisition)
+ if (event.requisition.shouldSendApprovalNotification()) {
+ notificationService.publishRequisitionStatusTransitionNotifications(event.requisition)
+ }
  }
 }

grails-app/services/org/pih/warehouse/inventory/StockMovementService.groovy

@@ -268,9 +268,7 @@ class StockMovementService {
  log.warn("Transition from ${requisition.status.name()} to ${status.name()} is not allowed - use rollback instead")
  } else {
  requisitionService.triggerRequisitionStatusTransition(requisition, AuthService.currentUser.get(), status, comment)
- if (requisition.shouldSendApprovalNotification()) {
- publishEvent(new RequisitionStatusTransitionEvent(requisition))
- }
+ publishEvent(new RequisitionStatusTransitionEvent(requisition))
  }
  }