merge ture

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java

@@ -1695,10 +1695,15 @@ public class ValidazionePraticaUtil {
 	public static boolean isAllRequiredValid(String codiceDoc, long intPraticaId, List<String> signatures,
 			List<String> tipologiaSoggetti, DocPratica docPratica) throws SystemException, PortalException {
 
-		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk());
+		boolean collaudatoreNotRequired = true;
-		boolean collaudatoreNotRequired = dettPratica.getCollaudoStatico() || dettPratica.getLavoriPubblici();
+		boolean direttoreLavoriNotRequired = true;
-		boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici();
+		boolean dittaNotRequired = true;
-		boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici();
+		if (docPratica.getClassName().equals(DettPratica.class.getName())) {
+			DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk());
+			collaudatoreNotRequired = dettPratica.getCollaudoStatico() || dettPratica.getLavoriPubblici();
+			direttoreLavoriNotRequired = dettPratica.getLavoriPubblici();
+			dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici();
+		}
 
 		for (String tipoSoggetto : tipologiaSoggetti) {
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException;
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.model.impl.AvvisoImpl;
 import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.impl.CollaudoImpl;
 import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.impl.ComuneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ComunePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException;
 import it.tref.liferay.portos.bo.model.Comunicazione;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException;
 import it.tref.liferay.portos.bo.model.Configurazione;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException;
 import it.tref.liferay.portos.bo.model.Delega;
 import it.tref.liferay.portos.bo.model.impl.DelegaImpl;
 import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException;
 import it.tref.liferay.portos.bo.model.DocAggiuntiva;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException;
 import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException;
 import it.tref.liferay.portos.bo.model.FineLavori;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException;
 import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java

@@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException;
 import it.tref.liferay.portos.bo.model.Pagamento;
 import it.tref.liferay.portos.bo.model.impl.PagamentoImpl;
 import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException;
 import it.tref.liferay.portos.bo.model.ParereGeologo;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java

@@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException;
 import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException;
 import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.model.impl.SoggettoImpl;
 import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException;
 import it.tref.liferay.portos.bo.model.Sorteggio;
 import it.tref.liferay.portos.bo.model.impl.SorteggioImpl;
 import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException;
 import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException;
 import it.tref.liferay.portos.bo.model.Tempistica;
 import it.tref.liferay.portos.bo.model.impl.TempisticaImpl;
 import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java

@@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException;
 import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.model.impl.TerritorioImpl;
 import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence;
 
 import java.io.Serializable;
 

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=2634
+    build.number=2638
-    build.date=1621841315604
+    build.date=1621613001566
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp

@@ -66,6 +66,7 @@
 				/>
 			</c:if>
 			<c:if test="<%= !isEsente %>">
+				<% System.out.println("################################# fineLavoriId = " + fineLavoriId); %>
 				<liferay-ui:icon
 					linkCssClass='<%=ValidazionePraticaUtil.pagamentoFineLavoriIsEnable(fineLavoriId)?"btn btn-primary":"btn btn-primary disabled" %>'
 					iconCssClass="fa fa-cogs"