From f6826810a8e9562aab0d3d2f20327ab2d77be69b Mon Sep 17 00:00:00 2001
From: "Cristian.bahamonde"
 <123061822+cristianbahamondesantamaria@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:32:40 +0200
Subject: [PATCH] Feat/allow supervisor role to modify all projects (#99)

* Change project write permissions for supervisor role

* Match permissions from securityConfiguration.xml to securityConfiguration-test.xml

* Fix securityConfiguration-test.xml
---
 .../install/config/securityConfiguration.xml  |  11 +-
 .../securityConfiguration-test.xml            | 235 +++++++++---------
 2 files changed, 114 insertions(+), 132 deletions(-)

diff --git a/src/main/install/config/securityConfiguration.xml b/src/main/install/config/securityConfiguration.xml
index 38e80b85..11469a32 100755
--- a/src/main/install/config/securityConfiguration.xml
+++ b/src/main/install/config/securityConfiguration.xml
@@ -57,22 +57,13 @@
 
 		<entity name="Project">
  			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
-			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="write"  admin="all"  super="all" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true"  super="true" staff="true" user="true"  cli="false" projectManager="true"/>
 			<operation name="create" admin="true"  super="true" staff="true" user="false" cli="false" projectManager="false"/>
 			<operation name="menu"   admin="true"  super="true" staff="true" user="false" cli="false" projectManager="false"/>
 		</entity>
 
-		<entity name="ProjectRole">
- 			<operation name="delete" admin="all"  super="area" staff="all"  user="deny" cli="deny" projectManager="deny"/>
-			<operation name="write"  admin="all"  super="area" staff="all"  user="deny" cli="deny" projectManager="deny"/>
-			<operation name="read"   admin="all"  super="area"  staff="all" user="area" cli="deny" projectManager="area"/>
-			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-			<operation name="create" admin="true" super="true"  staff="true"  user="false" cli="false" projectManager="false"/>
-			<operation name="menu"	 admin="true" super="true" staff="true" user="false"  cli="false" projectManager="false"/>
-		</entity>
-
 		<entity name="UserCategory">
   			<operation name="delete" admin="all"  super="deny" staff="all"  user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all"  user="deny" cli="deny" projectManager="deny"/>
diff --git a/tntconcept-web/src/test/resources/configForTesting/securityConfiguration-test.xml b/tntconcept-web/src/test/resources/configForTesting/securityConfiguration-test.xml
index 9ddcc794..e2e67ca2 100755
--- a/tntconcept-web/src/test/resources/configForTesting/securityConfiguration-test.xml
+++ b/tntconcept-web/src/test/resources/configForTesting/securityConfiguration-test.xml
@@ -56,7 +56,7 @@
 		</entity>
 
 		<entity name="Project">
- 			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true"  super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -64,17 +64,8 @@
 			<operation name="menu"   admin="true"  super="true" staff="true" user="false" cli="false" projectManager="false"/>
 		</entity>
 
-		<entity name="ProjectRole">
- 			<operation name="delete" admin="all"  super="area" staff="all"  user="deny" cli="deny" projectManager="deny"/>
-			<operation name="write"  admin="all"  super="area" staff="all"  user="deny" cli="deny" projectManager="deny"/>
-			<operation name="read"   admin="all"  super="area"  staff="all" user="area" cli="deny" projectManager="area"/>
-			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-			<operation name="create" admin="true" super="true"  staff="true"  user="false" cli="false" projectManager="false"/>
-			<operation name="menu"	 admin="true" super="true" staff="true" user="false"  cli="false" projectManager="false"/>
-		</entity>
-
 		<entity name="UserCategory">
-  			<operation name="delete" admin="all"  super="deny" staff="all"  user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all"  user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all"  user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all" cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -83,7 +74,7 @@
 		</entity>
 
 		<entity name="Department">
-  			<operation name="delete" admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -92,7 +83,7 @@
 		</entity>
 
 		<entity name="Setting">
-  			<operation name="delete" admin="own"  super="own"  staff="own"  user="own"  cli="own" projectManager="own"/>
+			<operation name="delete" admin="own"  super="own"  staff="own"  user="own"  cli="own" projectManager="own"/>
 			<operation name="write"  admin="own"  super="own"  staff="own"  user="own"  cli="own" projectManager="own"/>
 			<operation name="read"   admin="own"  super="own"  staff="own"  user="own"  cli="own" projectManager="own"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="true" projectManager="true"/>
@@ -101,7 +92,7 @@
 		</entity>
 
 		<entity name="AccountEntryGroup">
-   			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all"  user="all" cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="false" cli="false" projectManager="false"/>
@@ -109,7 +100,7 @@
 		</entity>
 
 		<entity name="AccountEntryType">
-    		<operation name="delete" admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"   user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"   user="all"   cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -118,7 +109,7 @@
 		</entity>
 
 		<entity name="OrganizationType">
-    		<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -127,7 +118,7 @@
 		</entity>
 
 		<entity name="InteractionType">
-     		<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -136,7 +127,7 @@
 		</entity>
 
 		<entity name="OrganizationISOCategory">
-     		<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -145,7 +136,7 @@
 		</entity>
 
 		<entity name="ContractType">
-     		<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -154,7 +145,7 @@
 		</entity>
 
 		<entity name="Province">
-     		<operation name="delete" admin="deny" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="deny" super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all"  user="all"  cli="all" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
@@ -170,7 +161,7 @@
 		</entity>
 
 		<entity name="Bill">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -179,7 +170,7 @@
 		</entity>
 
 		<entity name="BillCategory">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -188,7 +179,7 @@
 		</entity>
 
 		<entity name="RectifiedBillCategory">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -197,7 +188,7 @@
 		</entity>
 
 		<entity name="IVAReason">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -206,7 +197,7 @@
 		</entity>
 
 		<entity name="IVAType">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -215,7 +206,7 @@
 		</entity>
 
 		<entity name="CreditTitle">
-     		<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -224,7 +215,7 @@
 		</entity>
 
 		<entity name="Account">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -233,7 +224,7 @@
 		</entity>
 
 		<entity name="AccountType">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
@@ -243,7 +234,7 @@
 
 
 		<entity name="AccountEntry">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -252,7 +243,7 @@
 		</entity>
 
 		<entity name="PeriodicalAccountEntry">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -261,7 +252,7 @@
 		</entity>
 
 		<entity name="Frequency">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="true"  cli="false" projectManager="true"/>
@@ -270,36 +261,36 @@
 		</entity>
 
 		<entity name="Contact">
-	     	<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="owners"  cli="deny" projectManager="owners"/>
 			<operation name="read"   admin="all"  super="area" staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 			<operation name="menu"	 admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 			<detailView>
-			    <field name="name" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+				<field name="name" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="email" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="phone" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="mobile" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="notified" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-				<field name="contactInfos" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/> 
+				<field name="contactInfos" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="email2" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="phone2" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="fax" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="address" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-				<field name="postalCode" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/> 
+				<field name="postalCode" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="city" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="country" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="province" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-				<field name="tags" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/> 
+				<field name="tags" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
 				<field name="history" admin="true" super="true" staff="true" user="false" cli="false" projectManager="false"/>
 				<field name="advancedSearch" admin="true" super="true" staff="true" user="false" cli="false" projectManager="false"/>
 				<field name="owners" admin="true" super="true" staff="true" user="false" cli="false" projectManager="false"/>
-		    	</detailView>
+			</detailView>
 		</entity>
 
 		<entity name="Interaction">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -308,7 +299,7 @@
 		</entity>
 
 		<entity name="Offer">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="false" cli="false" projectManager="false"/>
@@ -317,7 +308,7 @@
 		</entity>
 
 		<entity name="Document">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -326,7 +317,7 @@
 		</entity>
 
 		<entity name="DocumentCategory">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -335,7 +326,7 @@
 		</entity>
 
 		<entity name="BulletinBoard">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -344,7 +335,7 @@
 		</entity>
 
 		<entity name="CompanyState">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own"  cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -353,7 +344,7 @@
 		</entity>
 
 		<entity name="BulletinBoardCategory">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true" user="true"  cli="true" projectManager="true"/>
@@ -362,7 +353,7 @@
 		</entity>
 
 		<entity name="Idea">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own" cli="own" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all" cli="all" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="true" projectManager="true"/>
@@ -371,7 +362,7 @@
 		</entity>
 
 		<entity name="Activity">
-     		<operation name="delete" admin="own"  super="own" staff="own" user="own" cli="deny" projectManager="own"/>
+			<operation name="delete" admin="own"  super="own" staff="own" user="own" cli="deny" projectManager="own"/>
 			<operation name="write"  admin="own"  super="own" staff="own" user="own" cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="area" staff="own" user="own" cli="deny" projectManager="own"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -380,7 +371,7 @@
 		</entity>
 
 		<entity name="Occupation">
-     		<operation name="delete" admin="all"  super="area" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="area" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true" staff="false" user="false" cli="false" projectManager="false"/>
@@ -389,7 +380,7 @@
 		</entity>
 
 		<entity name="Objective">
-     		<operation name="delete" admin="all"  super="area" staff="own" user="own" cli="deny" projectManager="own"/>
+			<operation name="delete" admin="all"  super="area" staff="own" user="own" cli="deny" projectManager="own"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="area" staff="own" user="own" cli="deny" projectManager="own"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -398,7 +389,7 @@
 		</entity>
 
 		<entity name="Tutorial">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all" cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -407,7 +398,7 @@
 		</entity>
 
 		<entity name="Publication">
-     		<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -416,7 +407,7 @@
 		</entity>
 
 		<entity name="Magazine">
-     		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="false" projectManager="true"/>
@@ -425,7 +416,7 @@
 		</entity>
 
 		<entity name="Holiday">
-      		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="area" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="all" projectManager="all"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true"  cli="true" projectManager="true"/>
@@ -434,7 +425,7 @@
 		</entity>
 
 		<entity name="RequestHoliday">
-      		<operation name="delete" admin="all"  super="area"  staff="all" user="own" cli="deny" projectManager="own"/>
+			<operation name="delete" admin="all"  super="area"  staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="write"  admin="all"  super="area"  staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="read"   admin="all"  super="area"  staff="all" user="own" cli="deny" projectManager="own"/>
 			<operation name="list"   admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
@@ -443,7 +434,7 @@
 		</entity>
 
 		<entity name="AdminHoliday">
-      		<operation name="delete" admin="all"   super="area"  staff="all"   user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"   super="area"  staff="all"   user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"   super="area"  staff="all"   user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"   super="area"  staff="all"   user="deny"  cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true"  super="true"  staff="true"  user="false" cli="false" projectManager="false"/>
@@ -452,7 +443,7 @@
 		</entity>
 
 		<entity name="Book">
-      		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true"  super="true"  staff="true" user="true"  cli="false" projectManager="true"/>
@@ -461,7 +452,7 @@
 		</entity>
 
 		<entity name="Inventary">
-      		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true"  super="true"  staff="true" user="false" cli="false" projectManager="false"/>
@@ -470,7 +461,7 @@
 		</entity>
 
 		<entity name="OfferRejectReason">
-      		<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true"  super="true"  staff="true" user="true" cli="false" projectManager="true"/>
@@ -479,7 +470,7 @@
 		</entity>
 
 		<entity name="FinancialRatio">
-      		<operation name="delete" admin="all"  super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all"  super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all"  super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all"  super="deny" staff="deny" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="list"   admin="true"  super="false"  staff="false" user="false" cli="false" projectManager="false"/>
@@ -496,78 +487,78 @@
 			<operation name="menu"   admin="true"  super="false"  staff="true"  user="true"  cli="false" projectManager="true"/>
 		</entity>
 
-        <entity name="Collaborator">
-            <operation name="delete" admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
-            <operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
-            <operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="false" staff="true" user="false" cli="false" projectManager="false"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
-        </entity>
-
-        <entity name="Commissioning">
-            <operation name="delete" admin="all"  super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
-            <operation name="write"  admin="all"  super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
-            <operation name="read"   admin="all"  super="all"   staff="all"  user="all"  cli="deny" projectManager="all"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
-
-        <entity name="ExternalActivity">
-            <operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
-
-        <entity name="CommissioningPaymentData">
-            <operation name="delete" admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="write"  admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="read"   admin="all"  super="all"   staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
-
-        <entity name="CommissioningFile">
-            <operation name="delete" admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="write"  admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="read"   admin="all"  super="all"   staff="all"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
-
-        <entity name="ActivityFile">
-            <operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
-
-        <entity name="Tag">
-            <operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
-            <operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
-            <operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
-        </entity>
+		<entity name="Collaborator">
+			<operation name="delete" admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="write"  admin="all"  super="deny"  staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="read"   admin="all"  super="all"   staff="all"  user="deny"  cli="deny" projectManager="deny"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="false" staff="true" user="false" cli="false" projectManager="false"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="false" cli="false" projectManager="false"/>
+		</entity>
+
+		<entity name="Commissioning">
+			<operation name="delete" admin="all"  super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
+			<operation name="write"  admin="all"  super="all"  staff="all"  user="all"  cli="deny" projectManager="all"/>
+			<operation name="read"   admin="all"  super="all"   staff="all"  user="all"  cli="deny" projectManager="all"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
+
+		<entity name="ExternalActivity">
+			<operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
+
+		<entity name="CommissioningPaymentData">
+			<operation name="delete" admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="write"  admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="read"   admin="all"  super="all"   staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
+
+		<entity name="CommissioningFile">
+			<operation name="delete" admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="write"  admin="all"  super="all"  staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="read"   admin="all"  super="all"   staff="all"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
+
+		<entity name="ActivityFile">
+			<operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
+
+		<entity name="Tag">
+			<operation name="delete" admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="write"  admin="all"  super="own"  staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="read"   admin="all"  super="own"   staff="own"  user="own"  cli="deny" projectManager="own"/>
+			<operation name="list"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="create" admin="true" super="true" staff="true" user="true" cli="false" projectManager="true"/>
+			<operation name="menu"   admin="true" super="true"  staff="true" user="true" cli="false" projectManager="true"/>
+		</entity>
 
 		<entity name="Position">
-  			<operation name="delete" admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
+			<operation name="delete" admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="write"  admin="all" super="deny" staff="all" user="deny" cli="deny" projectManager="deny"/>
 			<operation name="read"   admin="all" super="all"  staff="all" user="all"  cli="deny" projectManager="all"/>
 			<operation name="list"   admin="true" super="true"  staff="true"  user="true"  cli="false" projectManager="true"/>
 			<operation name="create" admin="true" super="false" staff="false" user="false" cli="false" projectManager="false"/>
 			<operation name="menu"	 admin="true" super="true"  staff="true"  user="false" cli="false" projectManager="false"/>
 		</entity>
-        
+
 	</entities>
 
 	<actions>