From 029ce45b915e951d208a011b6a5048d3041e4b84 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 14 Jul 2021 23:59:17 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                            | 13 +++++++------
 ayanova/src/components/work-order-item-expenses.vue | 12 ++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 7ce8edb4..bb5913b5 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -421,16 +421,17 @@ todo: many biz objects are not using new PUT methodology
 ########################################################################################################################
 
 
-CURRENTLY DOING: 
+CURRENTLY DOING: Sections substantially done, next step is to do the individual form fields
+	i.e. make userid read only, remove hyperlinks to source object, hide and readonly fields as required for each available section
 
 
-tasks:
-	
+
+tasks:	
 	Modify client to not show and / or prevent restricted actions	
-		Hide sections / fields as required
-	
+		Hide sections / fields as required	
 	Test again and ensure it looks correct and works correct for each role
 		Test each of the three restricted roles and one full role 
+		Test reporting, does it really not show reports outside of roles??
 
 
 	value.userIsRestrictedType
@@ -459,7 +460,7 @@ Subcontractor / tech limited modifications
 
 TODO: Outside Service repair COST is still showing for restricted and other users
 	should it?
-	
+
 todo: units on work order are not limited to customer on work order??
 todo: looks like wont' need subrights system, need to disentangle and remove it from workorder
 todo: Status on work order doesn't seem to be preventing "Who can select" by role properly
diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index dde6cf0f..17340c69 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -774,10 +774,18 @@ export default {
       return this.pvm.rights.change && this.pvm.subRights.expenses.create;
     },
     canDelete: function() {
-      return this.activeItemIndex != null && this.canDeleteAll;
+      return (
+        this.activeItemIndex != null &&
+        this.pvm.rights.change &&
+        this.pvm.subRights.expenses.delete
+      );
     },
     canDeleteAll: function() {
-      return this.pvm.rights.change && this.pvm.subRights.expenses.delete;
+      return (
+        this.pvm.rights.change &&
+        this.pvm.subRights.expenses.delete &&
+        !this.value.userIsRestrictedType
+      );
     }
   }
 };