diff --git a/jasper/.settings/org.eclipse.core.resources.prefs b/jasper/.settings/org.eclipse.core.resources.prefs
index 423359ce..6173bace 100644
--- a/jasper/.settings/org.eclipse.core.resources.prefs
+++ b/jasper/.settings/org.eclipse.core.resources.prefs
@@ -5,4 +5,5 @@ encoding/Modello_C.jrxml=UTF-8
encoding/Modello_Sorteggio.jrxml=UTF-8
encoding/Modello_deposito.jrxml=UTF-8
encoding/Modello_vidimazione.jrxml=UTF-8
+encoding/annullamento.jrxml=UTF-8
encoding/visualizza_fascicolo.jrxml=UTF-8
diff --git a/jasper/annullamento.jrxml b/jasper/annullamento.jrxml
new file mode 100644
index 00000000..cb2f0ccd
--- /dev/null
+++ b/jasper/annullamento.jrxml
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv-1.4.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv-1.4.jar
new file mode 100644
index 00000000..e9eb0bd3
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv-1.4.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison-1.3.8.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison-1.3.8.jar
new file mode 100644
index 00000000..915b6cff
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison-1.3.8.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
index 26a2285c..35152d40 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
@@ -241,7 +241,7 @@ sanatoria-edilizia-47 = L. 47/85 - L.R. 37/85
sanatoria-edilizia-724 = L. n. 724/2004
sanatoria-edilizia-326 = L. n. 326/2003 - L.R. 15/2004 (obbligo certificazione A17)
norm-lavori-in-proprio = il committente esegue i lavori in proprio (IN ECONOMIA) - lavori per i quali non è necessaria la nomina di un'impresa (obbligo dichiarazione A29)
-norm-lavori-no-direttore = lavori per i quali non è necessaria la nomia del Direttore dei Lavori (obbligo dichiarazione A30)
+norm-lavori-no-direttore = lavori per i quali non è necessaria la nomina del Direttore dei Lavori (obbligo dichiarazione A30)
lavori-pubblici = Lavori pubblici o di interesse pubblico
norm-esente-bollo = esente da bollo ai sensi di D.P.R. 26/10/1972 n. 642 e s.m.i.
norm-esente-spese = esente da spese istruttoria
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 4bffbc1d..332a3b2c 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=2707
- build.date=1604072280422
+ build.number=2709
+ build.date=1604334467371
build.auto.upgrade=true
##
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 681bebfc..80355c9e 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
@@ -425,6 +425,8 @@ public class FascicoloFePortlet extends MVCPortlet {
parameters.put(ReportConstants.LOGO_REGIONE,
getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath());
+ parameters.put(ReportConstants.LOGO_DIPARTIMENTO,
+ getClass().getResource(ReportConstants.PATH_LOGO_DIPARTIMENTO).getPath());
JRDataSource dataSource = new JREmptyDataSource();
@@ -471,6 +473,8 @@ public class FascicoloFePortlet extends MVCPortlet {
parameters.put(ReportConstants.LOGO_REGIONE,
getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath());
+ parameters.put(ReportConstants.LOGO_DIPARTIMENTO,
+ getClass().getResource(ReportConstants.PATH_LOGO_DIPARTIMENTO).getPath());
JRDataSource dataSource = new JREmptyDataSource();
@@ -522,7 +526,9 @@ public class FascicoloFePortlet extends MVCPortlet {
parameters.put(ReportConstants.LOGO_REGIONE,
getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath());
-
+ parameters.put(ReportConstants.LOGO_DIPARTIMENTO,
+ getClass().getResource(ReportConstants.PATH_LOGO_DIPARTIMENTO).getPath());
+
JRDataSource dataSource = new JREmptyDataSource();
JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,