diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
index c24f328a..17a80458 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java
index 5c2150aa..6e27c6e3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java
@@ -49,6 +49,15 @@ public class ReportAvvisoBean implements Serializable {
 	private Boolean parziale;
 	private String parzialeNumero;
 	private boolean richiestaAttestazione;
+	private String dataPraticaString;
+
+	public String getDataPraticaString() {
+		return dataPraticaString;
+	}
+
+	public void setDataPraticaString(String dataPraticaString) {
+		this.dataPraticaString = dataPraticaString;
+	}
 
 	public boolean isRichiestaAttestazione() {
 		return richiestaAttestazione;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java
index 123b8665..f763e89d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java
@@ -179,11 +179,14 @@ public class ReportAvvisoBeanBuilder {
 		if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) {
 			FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk());
 			bean.setDataPratica(fineLavori.getDtProtocollo());
+			bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo()));
 		} else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) {
 			Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk());
 			bean.setDataPratica(collaudo.getDtProtocollo());
+			bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo()));
 		} else {
 			bean.setDataPratica(intPratica.getDtPratica());
+			bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica()));
 		}
 		bean.setDataAvviso(avviso.getModifiedDate());
 		bean.setTipoPratica(intPratica.getTipoPratica());
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
index 29dc9460..2fafee6c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
@@ -80,7 +80,8 @@
 					<div class="row">
 						<div class="col-sm-2 col-md-2">Data Inizio Lavori:</div>
 						<div class="col-sm-4 col-md-4">
-							<strong><%= dateFormatDate.format(dettPratica.getDataInizioLavoriOpera()) %></strong>
+							<strong><%= Validator.isNotNull(dettPratica.getDataInizioLavoriOpera()) ? 
+									dateFormatDate.format(dettPratica.getDataInizioLavoriOpera()) : StringPool.DASH %></strong>
 						</div>
 					</div>
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp
index bad1d829..4f03caa5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp
@@ -27,7 +27,7 @@
 	>
 		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap" value='<%= Validator.isNotNull(fineLavori.getDataEffettuazione()) ? dateFormatDateTime.format(fineLavori.getDataEffettuazione()) : ""%>' />
 		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Direttore Lavori" value="<%= fineLavori.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data Fine Lavori" value='<%= dateFormatDate.format(fineLavori.getDataFineLavori()%>'/>
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data Fine Lavori" value='<%= dateFormatDate.format(fineLavori.getDataFineLavori())%>'/>
 		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia" value='<%= fineLavori.getParziale() ? "Parziale" : "Totale" %>'/>
 		
 		<liferay-ui:search-container-column-text>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
index 6f80e534..d45abb1a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
@@ -784,7 +784,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 		
 		try {
 			FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId);
-			if (!fineLavori.isCompletata()) {
+			if (!fineLavori.isCompletata() && Validator.isNotNull(dataFineLavori)) {
 				fineLavori.setParziale(parziale);
 				fineLavori.setDataFineLavori(dataFineLavori);
 				FineLavoriServiceUtil.updateFineLavori(fineLavori);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp
index 727a3218..01ad6ad2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp
@@ -18,10 +18,14 @@ if (dettPratica == null) {
 }
 String fmName = "fmFirstStepFineLavori";
 %>
+<liferay-portlet:renderURL var="successURL">
+	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/view.jsp"/>
+	<liferay-portlet:param name="backURL" value="<%= currentURL %>" />
+</liferay-portlet:renderURL>
 <liferay-portlet:actionURL name="salvaFirstStepFineLavori" var="salvaFirstStepFineLavoriURL" >
 	<liferay-portlet:param name="fineLavoriId" value="<%= String.valueOf(fineLavoriId) %>"/>
 	<liferay-portlet:param name="backURL" value="<%= backURL %>"/>
-	<liferay-portlet:param name="successURL" value="<%= currentURL %>"/>
+	<liferay-portlet:param name="successURL" value="<%= successURL %>"/>
 </liferay-portlet:actionURL>
 <aui:form 
 	name="<%= fmName %>" 
@@ -64,7 +68,7 @@ String fmName = "fmFirstStepFineLavori";
 									<%= LanguageUtil.get(pageContext, "fl-tipo") %>
 								</div>
 								<div class="col-sm-6 col-md-3">
-									<aui:select label="" name="tipoFineLavori" showEmptyOption="true" >
+									<aui:select label="" name="tipoFineLavori" showEmptyOption="true" required="true" >
 										<c:if test="<%= AzioniPraticheUtil.isAllowedAction(intPratica.getIntPraticaId(),
 												AzioniPraticheUtil.ACTION_FL_PARZIALE) %>">
 											<aui:option label='Parziale' value="true" />
@@ -91,6 +95,7 @@ String fmName = "fmFirstStepFineLavori";
 										<liferay-util:param name="fmName" value="<%= fmName %>" />
 										<liferay-util:param name="bean" value="bean.fineLavori" />
 										<liferay-util:param name="disabled" value="false" />
+										<liferay-util:param name="required" value="true" />
 									</liferay-util:include>
 								</div>
 							</div>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp
index 39bffa01..aea103e0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp
@@ -282,7 +282,7 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
 							</div>
 							<div class="row">
 								<div>
-									<%= LanguageUtil.get(pageContext, "label-disclaimer-bollo-16-euro"); %>
+									<%= LanguageUtil.get(pageContext, "label-disclaimer-bollo-16-euro") %>
 								</div>
 							</div>
 						</div>