diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
index 88aeccff..46a12de8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
@@ -12,12 +12,6 @@
         <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="portos-bo-portlet"/>
         <property name="java-output-path" value="/portos-bo-portlet/docroot/WEB-INF/classes"/>
     </wb-module>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
index 195c4274..734aa7a3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
@@ -250,13 +250,17 @@ public class DocumentiPraticaUtil {
 		/*
 		 * if (dettPratica.getNormLavoriInProprio()) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A29); }
 		 */
+		
 		if (!dettPratica.getTcNoOpereEscavazione()
 				&& (!intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8)
-						|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8)
-						|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9)
-						|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)
-						|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || !intPratica
-						.getTipoProcedura().equals(Constants.PROCEDURA_P10))) {
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1)
+					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1)
+			)) {
 			docObbligatori.add(TIPOLOGIA_ALLEGATO_A10);
 		}
 		if (richiestoA24(dettPratica)) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
index 0251d6e4..b1e1311e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
@@ -491,7 +491,7 @@ public class ValidazionePraticaUtil {
 			}
 			boolean tipologiaCostruttiva = dettPratica.getTcNuovaCostruzione()
 					|| dettPratica.getTcNuovaCostruzionePertinenza() || dettPratica.getTcCostruzioniEsistenti()
-					|| dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi();
+					|| dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi() || dettPratica.getTcNoOpereEscavazione();
 			if (!tipologiaCostruttiva && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1)
 					&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1)) {
 				notCompleted.add("Tipologia intervento mancante");
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java
index fff6ea31..6aec0ba4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java
@@ -252,7 +252,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		}
 		// Dichiarazioni del titolare digitale
 		boolean a27 = dettPratica.getNoCollaudo();
-		boolean a27bis = dettPratica.getCollaudoStatico();
+		boolean a27bis = dettPratica.getNominaCollaudatore();
 		boolean a29 = dettPratica.getNormLavoriInProprio();
 		boolean a29bis = dettPratica.getNominaImpresa();
 		boolean a30 = dettPratica.getNormLavoriNoDirettore();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
index 18e017b1..11605c30 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=3308
-    build.date=1630678547546
+    build.number=3313
+    build.date=1630941534079
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
index 26b0e067..e1d846ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
@@ -2,10 +2,10 @@
     <wb-module deploy-name="portos-fe-portlet">
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
+        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
+        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="portos-fe-portlet"/>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
index 4cb9b02a..6b75bff3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
@@ -69,14 +69,14 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
                 <liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali">
                     <div class="container-fluid">
                           <div class="col-sm-12 col-md-12">
-                            <div class="module-group group_dati_catastali <%= hide1 %> <%= hide8 %> <%= hide10 %>">
+                            <div class="module-group group_dati_catastali  <%= hide8 %> <%= hide10 %>">
                                 <liferay-ui:panel extended="false" defaultState="open" collapsible="false"
                                                   title="Normativa">
 	                                <div class="row">
 										<div class="col-xs-12">
 											<div class="container-fluid">
 											   <c:if test="<%= (intPratica.getTipoRichiesta() == Constants.SANATORIE) %>">
-	                                           		<div class="row" >
+	                                           		<div class="row " >
 	                                           			<div class="col-xs-12" style="margin:5px 0;">
 	                                           				<p><%=LanguageUtil.get(pageContext, "sanatoria-edilizia") %></p>
                                            				</div>
@@ -109,24 +109,24 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 												   <c:if test="<%= (intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA) %>">
 	                                               		<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" type="text"  name="interventoVoceP7" style="display:inline-block;width:80px;" label="intervento-voce-p7" />
 	                                               </c:if>
-												   <div class="row row-padding-custom ">
+												   <div class="row row-padding-custom <%= hide1 %>">
 	                                                   <div class="col-xs-12">
 	                                                       <aui:input disabled="<%=disabledInput %>"  
 	                                                                  name="lavoriPubblici"
 	                                                                  label="lavori-pubblici"/>
 	                                                   </div>
 	                                               </div>
-													<div class="row row-padding-custom altro_check">
+													<div class="row row-padding-custom altro_check <%= hide1 %>">
 														<div class="col-xs-12">
 															<aui:input disabled="<%=disabledInput %>" name="intervFinPub" label="interv-fin-pub"/>
 														</div>
 													</div>
-													<div class="row altro_check">
+													<div class="row altro_check <%= hide1 %>">
 														<div class="col-xs-12">
 															<aui:input type="textarea" name="intervFinPubDesc" disabled="<%=!dettPratica.getIntervFinPub() || disabledInput %>" label=""></aui:input>
 														</div>
 													</div>
-													<div class="row row-padding-custom altro_check excludeOther <%= hide3 %>" data-cont="viarch">
+													<div class="row row-padding-custom altro_check excludeOther <%= hide3 %> <%= hide1 %>" data-cont="viarch">
 														<div class="col-md-12 col-lg-12">
 															<h4><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></h4>
 														</div>
@@ -149,13 +149,13 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 	                                                   </div>
 	                                               </div>
 	                                               
-	                                               <div class="row row-padding-custom ">
+	                                               <div class="row row-padding-custom <%= hide1 %>">
 														<div class="col-xs-12 col-sm-6">
 															<aui:input disabled="<%=disabledInput %>"  type="text" name="estremiPratCom"
 																				label="estremi-prat-com"/>
 														</div>
 													</div>
-													<div class="excludeOther" data-cont="impresa">
+													<div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="impresa">
 		                                               <div class="row row-padding-custom ">
 		                                                   <div class="col-xs-12">
 		                                                       <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  
@@ -164,7 +164,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 		                                                   </div>
 		                                               </div>
 	                                               
-		                                               <div class="row row-padding-custom ">
+		                                               <div class="row row-padding-custom <%= hide3 %>">
 		                                                   <div class="col-xs-12">
 		                                                       <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  
 		                                                                  name="nominaImpresa"
@@ -172,7 +172,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 		                                                   </div>
 		                                               </div>
 	                                               </div>
-	                                               <div class="excludeOther" data-cont="direttore_lavori">
+	                                               <div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="direttore_lavori">
 		                                               <div class="row row-padding-custom ">
 		                                                   <div class="col-xs-12">
 		                                                       <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  
@@ -190,7 +190,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 		                                                   </div>
 		                                               </div>
 	                                               </div>
-	                                               <div class="excludeOther" data-cont="collaudo">
+	                                               <div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="collaudo">
 		                                               <div class="row row-padding-custom ">
 		                                                   <div class="col-xs-12">
 		                                                       <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="noCollaudo"
@@ -215,7 +215,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 		                                               </div>
 	                                               </div>
 	
-	                                               <div class="row  row-padding-custom" style="display:none;">
+	                                               <div class="row  row-padding-custom <%= hide1 %> <%= hide3 %>" style="display:none;">
 														<div class="col-xs-1  col-sm-1 col-md-1 col-lg-1">
 															<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  name="normArt3com3" label="" />
 														</div>
@@ -231,7 +231,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 															</div>
 														</div>
 													</div>
-													<div class="row  row-padding-custom" style="display:none;">
+													<div class="row  row-padding-custom <%= hide1 %> <%= hide3 %>" style="display:none;">
 														<div class="col-xs-1">
 															<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="normArt3com4" label=""/>
 														</div>
@@ -252,7 +252,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
 							<div class="module-group group_dati_catastali">
 								<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp-dc">
 									<div class="dati_catastali">
-                                        <div class="col-xs-12 cont_maps">
+                                        <div class="col-xs-12 cont_maps <%= hide1 %>">
 											<liferay-ui:tabs names="mappe-bbcc,mappe-openstreetmap"
 													refresh="false" value="mappe-bbcc">
 												<liferay-ui:section>
@@ -366,7 +366,7 @@ function messageListener(event) {
 													</div>
                                                 </div>
                                             </div>
-                                            <div class="col-xs-12 col-md-6">
+                                            <div class="col-xs-12 col-md-6 <%= hide1 %>">
                                                 <div class="container-fluid">
                                                     <div class="row <%= hide1 %>" style="margin-bottom:20px;">
                                                         <div class="col-xs-12">
@@ -558,16 +558,16 @@ function messageListener(event) {
 										<div class="col-xs-12">
 											<ul>
 												<li>
-													<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNuovaCostruzione" label="tc-nuova-costruzione" id="tc-nuova-costruzione"/>
+													<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch  %>" name="tcNuovaCostruzione" label="tc-nuova-costruzione" id="tc-nuova-costruzione"/>
 												</li>
 												<li>
-													<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNuovaCostruzionePertinenza" label="tc-nuova-costruzione-pertinenza" id="tc-nuova-costruzione-pertinenza"/>
+													<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcNuovaCostruzionePertinenza" label="tc-nuova-costruzione-pertinenza" id="tc-nuova-costruzione-pertinenza"/>
 												</li>
 												<li>
-													<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcCostruzioniEsistenti" label="tc-costruzioni-esistenti" id="tc-costruzioni-esistenti"/>
+													<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcCostruzioniEsistenti" label="tc-costruzioni-esistenti" id="tc-costruzioni-esistenti"/>
 												</li>
 												<li>
-													<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/>
+													<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/>
 												</li>
 												<li class="<%= hide8 %> <%= hide9 %>">
 													<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNoOpereEscavazione" label="tc-no-opere-escavazione" id="tc-no-opere-escavazione"/>
@@ -577,7 +577,7 @@ function messageListener(event) {
 										<div class="col-xs-12">
 											<div class="row altro_check">
 												<div class="col-xs-12">
-													<aui:input disabled="<%=disabledInput %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
+													<aui:input disabled="<%=disabledInput || !disableViarch %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
 												</div>
 											</div>
 											<div class="row altro_check">