diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
index 7fce98a4..64c75a76 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
@@ -295,6 +295,18 @@ public class AdvancedOperationUtil {
 		return false;
 	}
 	
+	public static boolean hasEditableFineLavoriDate(IntPratica intPratica){
+		if(Validator.isNotNull(intPratica)){
+			try {
+				return Validator.isNotNull(
+						getEditableFineLavoriDate(intPratica));
+			} catch (Exception e) {
+				return false;
+			}
+		}
+		return false;
+	}
+	
 	public static Date getEditableFineLavoriDate(IntPratica intPratica){
 		if(Validator.isNotNull(intPratica)){
 			try {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
index 7950ddfa..222d3ee6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
@@ -416,7 +416,7 @@
 							</aui:row>
 						</liferay-ui:panel>
 					</div>
-					<% if(AdvancedOperationUtil.hasEditableFineLavori(intPratica)){ %>
+					<% if(AdvancedOperationUtil.hasEditableFineLavoriDate(intPratica) && AdvancedOperationUtil.hasEditableFineLavori(intPratica)){ %>
 						<div class="module-group">
 						 	<liferay-ui:panel title="FINE LAVORI" extended="true" collapsible="false">
 								<aui:row>
@@ -431,7 +431,6 @@
 									%>
 									<div style="display:flex;">
 										<aui:form action="<%= cambiaDataFineLavoriURL %>" method="post" name="cambiaDataFineLavori">
-											<div style="display:flex;">
 												<p><b>Data Fine Lavori:</b></p>
 												<aui:input 
 														name="dataFineLavoriInput" 
@@ -439,7 +438,7 @@
 														inlineLabel="left"
 														type="date"
 														value='<%= DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd").format(AdvancedOperationUtil.getEditableFineLavoriDate(intPratica)) %>'>
-													</aui:input>
+												</aui:input>
 												<aui:button 
 													type="button" 
 													cssClass="btn-primary"
@@ -448,7 +447,6 @@
 													value="Modifica Data"
 													>
 												</aui:button>
-											</div>
 										</aui:form>
 									</div>
 								</aui:row>