diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath
index 9975372f..6de1aafe 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
+	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component
index 49dfc4a9..f8d0fffc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component
@@ -2,6 +2,7 @@
     <wb-module deploy-name="portos-accesso-atti-portlet">
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
         <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>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/model/impl/RichiestaAccessoAttiImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/model/impl/RichiestaAccessoAttiImpl.java
index 161bf9ff..2ca0d89b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/model/impl/RichiestaAccessoAttiImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/model/impl/RichiestaAccessoAttiImpl.java
@@ -15,19 +15,22 @@
 package it.tref.liferay.portos.accesso.atti.model.impl;
 
 /**
- * The extended model implementation for the RichiestaAccessoAtti service. Represents a row in the &quot;portos_atti_RichiestaAccessoAtti&quot; database table, with each column mapped to a property of this class.
+ * The extended model implementation for the RichiestaAccessoAtti service. Represents a row in the
+ * &quot;portos_atti_RichiestaAccessoAtti&quot; database table, with each column mapped to a property of this class.
  *
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the
+ * {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface.
  * </p>
  *
  * @author 3F Consulting
  */
+@SuppressWarnings("serial")
 public class RichiestaAccessoAttiImpl extends RichiestaAccessoAttiBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a richiesta accesso atti model instance should use the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a richiesta accesso atti model
+	 * instance should use the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface instead.
 	 */
 	public RichiestaAccessoAttiImpl() {
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiLocalServiceImpl.java
index 27bdb870..080da7c6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiLocalServiceImpl.java
@@ -37,211 +37,173 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil;
  * The implementation of the richiesta accesso atti local service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalService} interface.
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalService}
+ * interface.
  *
  * <p>
- * This is a local service. Methods of this service will not have security checks based on the propagated JAAS credentials because this service can only be accessed from within the same VM.
+ * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
+ * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
  * @author 3F Consulting
  * @see it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiLocalServiceBaseImpl
  * @see it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil
  */
-public class RichiestaAccessoAttiLocalServiceImpl
-extends RichiestaAccessoAttiLocalServiceBaseImpl {
+public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLocalServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil} to access the richiesta accesso atti local service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil} to access the richiesta accesso
+	 * atti local service.
 	 */
 
-	public List<RichiestaAccessoAtti> findByGestita(boolean gestita, int start, int end) throws SystemException{
+	@Override
+	public List<RichiestaAccessoAtti> findByGestita(boolean gestita, int start, int end) throws SystemException {
 		return richiestaAccessoAttiPersistence.findByGestita(gestita, start, end);
 	}
 
-	public List<RichiestaAccessoAtti> findCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl, int start, int end) throws SystemException, ParseException{
+	@Override
+	public List<RichiestaAccessoAtti> findCompletate(String numeroProgetto, String protocollo, String dataDal,
+			String dataAl, int start, int end) throws SystemException, ParseException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", true));
-
-		if(!numeroProgetto.equals("")){
+		if (!numeroProgetto.equals("")) {
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
-
-		if(!protocollo.equals("")){
-
+		if (!protocollo.equals("")) {
 			Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
 			disjunction.add(PropertyFactoryUtil.forName("protocolloEntrata").eq(protocollo));
 			disjunction.add(PropertyFactoryUtil.forName("protocolloUscita").eq(protocollo));
 			dq.add(disjunction);
 		}
-		
-		if(!dataDal.equals("") && !dataAl.equals("")){
-			
+		if (!dataDal.equals("") && !dataAl.equals("")) {
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
-			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
-			
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
-		
-		if(!dataDal.equals("") && dataAl.equals("")){
-			
+		if (!dataDal.equals("") && dataAl.equals("")) {
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
-			
 			Date now = new Date();
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, now));
-			
 		}
-		
-		if(dataDal.equals("") && !dataAl.equals("")){
-			
+
+		if (dataDal.equals("") && !dataAl.equals("")) {
 			Date now = new Date("01/01/2018");
-			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(now, dateAl));
-			
 		}
-
-		return  richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
+		return richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
 	}
-	
-	public int countCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl) throws SystemException, ParseException{
+
+	@Override
+	public int countCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl)
+			throws SystemException, ParseException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", true));
-
-		if(!numeroProgetto.equals("")){
+		if (!numeroProgetto.equals("")) {
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
-
-		if(!protocollo.equals("")){
-
+		if (!protocollo.equals("")) {
 			Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
 			disjunction.add(PropertyFactoryUtil.forName("protocolloEntrata").eq(protocollo));
 			disjunction.add(PropertyFactoryUtil.forName("protocolloUscita").eq(protocollo));
 			dq.add(disjunction);
 		}
-		
-		if(!dataDal.equals("") && !dataAl.equals("")){
-		
+		if (!dataDal.equals("") && !dataAl.equals("")) {
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
-			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
-			
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
-		
-		if(!dataDal.equals("") && dataAl.equals("")){
-			
+		if (!dataDal.equals("") && dataAl.equals("")) {
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
-			
 			Date now = new Date();
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, now));
-			
 		}
-		
-		if(dataDal.equals("") && !dataAl.equals("")){
-			
+		if (dataDal.equals("") && !dataAl.equals("")) {
 			Date now = new Date("01/01/2018");
-			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
-			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(now, dateAl));
-			
 		}
-		
 		List<RichiestaAccessoAtti> lista = richiestaAccessoAttiLocalService.dynamicQuery(dq);
-
 		return lista.size();
 	}
 
-	public RichiestaAccessoAtti findByAccessToken(String accessToken) throws SystemException{
+	@Override
+	public RichiestaAccessoAtti findByAccessToken(String accessToken) throws SystemException {
 
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("accessToken", accessToken));
-
 		List<RichiestaAccessoAtti> lista = richiestaAccessoAttiLocalService.dynamicQuery(dq);
-		if(lista != null && !lista.isEmpty()){
+		if (lista != null && !lista.isEmpty()) {
 			return lista.get(0);
 		}
-
 		return null;
 	}
 
-	public List<RichiestaAccessoAtti> findRichiesteByGroup(long userId, int start, int end) throws SystemException{
+	@Override
+	public List<RichiestaAccessoAtti> findRichiesteByGroup(long userId, int start, int end) throws SystemException {
 
 		List<Long> listaLong = new ArrayList<Long>();
-
 		List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(userId);
-		if(organizationList != null && !organizationList.isEmpty()){
+		if (organizationList != null && !organizationList.isEmpty()) {
 			for (Organization organization : organizationList) {
 				listaLong.add(organization.getGroupId());
 			}
 		}
-
 		listaLong.add(0L);
-
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", false));
 		dq.add(RestrictionsFactoryUtil.in("groupId", listaLong));
-
 		return richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
-
 	}
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiServiceImpl.java
index 1cf6862e..96b4b287 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiServiceImpl.java
@@ -20,21 +20,22 @@ import it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiServ
  * The implementation of the richiesta accesso atti remote service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiService} interface.
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiService} interface.
  *
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
  * @author 3F Consulting
  * @see it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiServiceBaseImpl
  * @see it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil
  */
-public class RichiestaAccessoAttiServiceImpl
-	extends RichiestaAccessoAttiServiceBaseImpl {
+public class RichiestaAccessoAttiServiceImpl extends RichiestaAccessoAttiServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil} to access the richiesta accesso atti remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil} to access the richiesta accesso atti
+	 * remote service.
 	 */
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/AccessoAttiAccessTokenUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/AccessoAttiAccessTokenUtil.java
index e69c92d6..9f1bf01c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/AccessoAttiAccessTokenUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/AccessoAttiAccessTokenUtil.java
@@ -8,34 +8,24 @@ import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.StringPool;
 
 public class AccessoAttiAccessTokenUtil {
-	
+
 	private static final Log _log = LogFactoryUtil.getLog(AccessoAttiAccessTokenUtil.class);
-	
-	public static String generateAccessToken(long richiestaAccessoAttiId, String numeroProgetto, long richiedenteUserId){
-		
+
+	public static String generateAccessToken(long richiestaAccessoAttiId, String numeroProgetto, long richiedenteUserId) {
+
 		StringBuffer sb = new StringBuffer();
-		
 		try {
-			
-			String concatString = String.valueOf(richiestaAccessoAttiId) + StringPool.UNDERLINE + 
-					numeroProgetto + StringPool.UNDERLINE + richiedenteUserId;
-			
+			String concatString = String.valueOf(richiestaAccessoAttiId) + StringPool.UNDERLINE + numeroProgetto
+					+ StringPool.UNDERLINE + richiedenteUserId;
 			MessageDigest md = MessageDigest.getInstance("MD5");
-			
 			md.update(concatString.getBytes());
-	        
-	        byte byteData[] = md.digest();
-	        
-	        for (int i = 0; i < byteData.length; i++) {
-	         sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
-	        }
-	        
+			byte byteData[] = md.digest();
+			for (int i = 0; i < byteData.length; i++) {
+				sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
+			}
 		} catch (NoSuchAlgorithmException e) {
-			_log.error(e,e);
+			_log.error(e, e);
 		}
-		
 		return sb.toString();
-		
 	}
-	
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/DocumentLibraryUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/DocumentLibraryUtil.java
index 1412700f..f9e80da6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/DocumentLibraryUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/DocumentLibraryUtil.java
@@ -17,62 +17,48 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
 import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil;
 
 public class DocumentLibraryUtil {
-	
+
 	public static Log _log = LogFactoryUtil.getLog(DocumentLibraryUtil.class);
 
 	public static final String RICHIESTA_ATTI_FOLDER_NAME = "RICHIESTA_ATTI";
 	public static final String PAGAMENTO_CODEC_FILENAME = "PAGAMENTO_";
 	public static final String DOCUMENTO_CODEC_FILENAME = "DOCUMENTO_";
-	
-	public static long saveFileEntryAccessoAtti(long companyGroupId, long richiestaAccessoAttiId, String originFileName,
-			File file, boolean pagamento) {
-		
+
+	public static long saveFileEntryAccessoAtti(long companyGroupId, long richiestaAccessoAttiId,
+			String originFileName, File file, boolean pagamento) {
+
 		long fileEntryId = 0L;
-		
 		try {
 			DLFolder folder = getRichiestaAttiFolder(companyGroupId);
-			if(folder != null){
-				
-				RichiestaAccessoAtti richiestaAccessoAtti = 
-						RichiestaAccessoAttiLocalServiceUtil.fetchRichiestaAccessoAtti(richiestaAccessoAttiId);
-				
-				if(richiestaAccessoAtti != null){
-					
+			if (folder != null) {
+				RichiestaAccessoAtti richiestaAccessoAtti = RichiestaAccessoAttiLocalServiceUtil
+						.fetchRichiestaAccessoAtti(richiestaAccessoAttiId);
+				if (richiestaAccessoAtti != null) {
 					ServiceContext serviceContext = new ServiceContext();
 					serviceContext.setCompanyId(richiestaAccessoAtti.getCompanyId());
 					serviceContext.setUserId(richiestaAccessoAtti.getUserId());
-					
 					String mineType = FileUtil.getExtension(originFileName);
-					
 					String prefixedFileName = "";
-					if(pagamento){
+					if (pagamento) {
 						prefixedFileName = PAGAMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
 					} else {
 						prefixedFileName = DOCUMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
 					}
-				
-					FileEntry fileEntry = DLAppLocalServiceUtil.addFileEntry(
-							richiestaAccessoAtti.getUserId(), folder.getRepositoryId(), folder.getFolderId(), 
-							prefixedFileName, mineType, prefixedFileName, "", "", file, serviceContext);
-				
+					FileEntry fileEntry = DLAppLocalServiceUtil.addFileEntry(richiestaAccessoAtti.getUserId(),
+							folder.getRepositoryId(), folder.getFolderId(), prefixedFileName, mineType,
+							prefixedFileName, "", "", file, serviceContext);
 					fileEntryId = fileEntry.getFileEntryId();
-					
 				}
 			}
-		
 		} catch (PortalException | SystemException e) {
-			_log.error(e,e);
+			_log.error(e, e);
 		}
-		
 		return fileEntryId;
-		
 	}
-	
-	private static DLFolder getRichiestaAttiFolder(long companyGroupId) throws PortalException, SystemException{
-		
+
+	private static DLFolder getRichiestaAttiFolder(long companyGroupId) throws PortalException, SystemException {
+
 		DLFolder folder = DLFolderLocalServiceUtil.getFolder(companyGroupId, 0L, RICHIESTA_ATTI_FOLDER_NAME);
-		
 		return folder;
 	}
-	
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties
index 6055d871..432067b4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_atti
-    build.number=24
-    build.date=1598539119654
+    build.number=26
+    build.date=1629993357414
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml
index 153113cf..23f10eb5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.1.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_1_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.bo">
-	<author>Davide Barbagallo, 3F Consulting</author>
+	<author>Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.</author>
 	<namespace>portos_bo</namespace>
 
 	<entity name="Provincia" local-service="true" remote-service="true">
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileFormatException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileFormatException.java
index 1fb49dbd..5313deff 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileFormatException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileFormatException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CSVFileFormatException extends PortalException {
 
 	public CSVFileFormatException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileNotFoundException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileNotFoundException.java
index 46a11628..942febd9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileNotFoundException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CSVFileNotFoundException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CSVFileNotFoundException extends PortalException {
 
 	public CSVFileNotFoundException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceBelfioreException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceBelfioreException.java
index 998a142c..9ee8c6a9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceBelfioreException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceBelfioreException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CodiceBelfioreException extends PortalException {
 
 	public CodiceBelfioreException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceComuneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceComuneException.java
index c10421f6..0c3182e3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceComuneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceComuneException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CodiceComuneException extends PortalException {
 
 	public CodiceComuneException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceIstatException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceIstatException.java
index 304f255e..8b7fd4ab 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceIstatException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceIstatException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CodiceIstatException extends PortalException {
 
 	public CodiceIstatException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceProvinciaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceProvinciaException.java
index 4bb96257..6345d34b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceProvinciaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/CodiceProvinciaException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CodiceProvinciaException extends PortalException {
 
 	public CodiceProvinciaException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DenominazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DenominazioneException.java
index bdfe7078..cfe0d33a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DenominazioneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DenominazioneException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class DenominazioneException extends PortalException {
 
 	public DenominazioneException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateComuneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateComuneException.java
index af7eb452..276e1f3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateComuneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateComuneException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class DuplicateComuneException extends PortalException {
 
 	public DuplicateComuneException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateProvinciaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateProvinciaException.java
index 5d823ff0..5e6d7d39 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateProvinciaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/DuplicateProvinciaException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class DuplicateProvinciaException extends PortalException {
 
 	public DuplicateProvinciaException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAllegatoManualeException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAllegatoManualeException.java
index 9fbbe1fd..0e10f36c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAllegatoManualeException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAllegatoManualeException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchAllegatoManualeException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAsseverazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAsseverazioneException.java
index 80f7bca9..8f3a9c7d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAsseverazioneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAsseverazioneException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchAsseverazioneException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAvvisoException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAvvisoException.java
index 98de6e5b..1dc92d83 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAvvisoException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchAvvisoException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchAvvisoException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchCollaudoException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchCollaudoException.java
index 32e68ed2..b6ab12e6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchCollaudoException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchCollaudoException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchCollaudoException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComuneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComuneException.java
index 9ed15dfd..c2fdbd0e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComuneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComuneException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchComuneException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComunicazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComunicazioneException.java
index 123f9bf3..08a7b83d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComunicazioneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchComunicazioneException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchComunicazioneException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchConfigurazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchConfigurazioneException.java
index 30aa280e..1c9a35b5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchConfigurazioneException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchConfigurazioneException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchConfigurazioneException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchControlloPraticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchControlloPraticaException.java
index 722ef9c4..18e5756d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchControlloPraticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchControlloPraticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchControlloPraticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDelegaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDelegaException.java
index 6862a0d5..c8298b3f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDelegaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDelegaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchDelegaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDettPraticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDettPraticaException.java
index aab1989a..d9eede68 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDettPraticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDettPraticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchDettPraticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocAggiuntivaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocAggiuntivaException.java
index 1ef42703..d9d09b94 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocAggiuntivaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocAggiuntivaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchDocAggiuntivaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocPraticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocPraticaException.java
index 56fead4c..c7e5316c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocPraticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchDocPraticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchDocPraticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchFineLavoriException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchFineLavoriException.java
index e3c7e4d4..bb5b783c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchFineLavoriException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchFineLavoriException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchFineLavoriException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchHistoryWorkflowActionException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchHistoryWorkflowActionException.java
index 8de526f8..a0bf6f80 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchHistoryWorkflowActionException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchHistoryWorkflowActionException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchHistoryWorkflowActionException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchIntPraticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchIntPraticaException.java
index 1537f606..aabccae3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchIntPraticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchIntPraticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchIntPraticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchPagamentoException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchPagamentoException.java
index ce0bf323..e2f53a7b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchPagamentoException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchPagamentoException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchPagamentoException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchParereGeologoException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchParereGeologoException.java
index f8545b12..d3480cda 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchParereGeologoException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchParereGeologoException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchParereGeologoException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchProvinciaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchProvinciaException.java
index 1d2c0697..00be9da5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchProvinciaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchProvinciaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchProvinciaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSoggettoException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSoggettoException.java
index d115ae56..870a0583 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSoggettoException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSoggettoException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchSoggettoException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSorteggioException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSorteggioException.java
index 59613285..0e4e225b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSorteggioException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchSorteggioException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchSorteggioException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchStoricoSoggettoPraticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchStoricoSoggettoPraticaException.java
index 4dbc7a5c..d944ce25 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchStoricoSoggettoPraticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchStoricoSoggettoPraticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchStoricoSoggettoPraticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTempisticaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTempisticaException.java
index 4bf4b683..21bd4b6e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTempisticaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTempisticaException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchTempisticaException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTerritorioException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTerritorioException.java
index d69f4846..199986af 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTerritorioException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/NoSuchTerritorioException.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.NoSuchModelException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class NoSuchTerritorioException extends NoSuchModelException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/ProvinciaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/ProvinciaException.java
index d6beb455..3e507750 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/ProvinciaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/ProvinciaException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class ProvinciaException extends PortalException {
 
 	public ProvinciaException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/SiglaException.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/SiglaException.java
index f6cf8199..bc65691a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/SiglaException.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/SiglaException.java
@@ -17,8 +17,9 @@ package it.tref.liferay.portos.bo;
 import com.liferay.portal.kernel.exception.PortalException;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class SiglaException extends PortalException {
 
 	public SiglaException() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManuale.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManuale.java
index afeb48bd..f0337f04 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManuale.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManuale.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the AllegatoManuale service. Represents a row in the &quot;portos_bo_AllegatoManuale&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeModel
  * @see it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl
  * @see it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeClp.java
index 37072e19..1d9fe1e1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class AllegatoManualeClp extends BaseModelImpl<AllegatoManuale>
 	implements AllegatoManuale {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeModel.java
index b64e461f..fe84194b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManuale
  * @see it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl
  * @see it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeSoap.java
index 9817089c..7da3e891 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.AllegatoManualeServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.AllegatoManualeServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeWrapper.java
index 3f49775e..502fa368 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AllegatoManualeWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link AllegatoManuale}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManuale
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Asseverazione.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Asseverazione.java
index 3d4dbbfa..0dc929be 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Asseverazione.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Asseverazione.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Asseverazione service. Represents a row in the &quot;portos_bo_Asseverazione&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneModel
  * @see it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneClp.java
index 06633d60..e1319e06 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class AsseverazioneClp extends BaseModelImpl<Asseverazione>
 	implements Asseverazione {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneModel.java
index ab9e8a6c..316f2383 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Asseverazione
  * @see it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneSoap.java
index 5a2fd3ec..9724b447 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.AsseverazioneServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.AsseverazioneServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneWrapper.java
index 9ec52f6c..f27250bc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AsseverazioneWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Asseverazione}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Asseverazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java
index 28e10f5c..347fda56 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Avviso service. Represents a row in the &quot;portos_bo_Avviso&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoModel
  * @see it.tref.liferay.portos.bo.model.impl.AvvisoImpl
  * @see it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java
index 4f580745..39d79c50 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class AvvisoClp extends BaseModelImpl<Avviso> implements Avviso {
 	public AvvisoClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoModel.java
index 4d78678b..77a279ec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.AvvisoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Avviso
  * @see it.tref.liferay.portos.bo.model.impl.AvvisoImpl
  * @see it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoSoap.java
index 515e63da..f73d7a2f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.AvvisoServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.AvvisoServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java
index d620b4b3..07ea88ad 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Avviso}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Avviso
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Collaudo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Collaudo.java
index ca58aa67..6d27d737 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Collaudo.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Collaudo.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Collaudo service. Represents a row in the &quot;portos_bo_Collaudo&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoModel
  * @see it.tref.liferay.portos.bo.model.impl.CollaudoImpl
  * @see it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java
index 69f2607d..ae4a0614 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class CollaudoClp extends BaseModelImpl<Collaudo> implements Collaudo {
 	public CollaudoClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java
index c3f66f09..ab8575dd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.CollaudoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Collaudo
  * @see it.tref.liferay.portos.bo.model.impl.CollaudoImpl
  * @see it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java
index 073e5032..e71a0ce5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.CollaudoServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.CollaudoServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java
index 313e67a7..1206bbbf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Collaudo}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Collaudo
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comune.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comune.java
index b5780c8f..77c1def1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comune.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comune.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Comune service. Represents a row in the &quot;portos_bo_Comune&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneModel
  * @see it.tref.liferay.portos.bo.model.impl.ComuneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ComuneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneClp.java
index 8ae8d1d0..3df3c946 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ComuneClp extends BaseModelImpl<Comune> implements Comune {
 	public ComuneClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneModel.java
index 354846f2..7c2de1fc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ComuneModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ComuneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comune
  * @see it.tref.liferay.portos.bo.model.impl.ComuneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ComuneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneSoap.java
index 72f620f1..25267fd6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ComuneServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ComuneServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneWrapper.java
index 199d2bee..1606ecd1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComuneWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Comune}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comune
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comunicazione.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comunicazione.java
index 8e2243d7..da13d663 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comunicazione.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Comunicazione.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Comunicazione service. Represents a row in the &quot;portos_bo_Comunicazione&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneModel
  * @see it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneClp.java
index d6ac4bf1..d13f4c63 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ComunicazioneClp extends BaseModelImpl<Comunicazione>
 	implements Comunicazione {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneModel.java
index 8be7b131..90eac8d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comunicazione
  * @see it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneSoap.java
index 82f58dbd..ec1d6662 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ComunicazioneServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ComunicazioneServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneWrapper.java
index b9a74938..917a4986 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ComunicazioneWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Comunicazione}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comunicazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Configurazione.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Configurazione.java
index e58b7fcf..b796496f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Configurazione.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Configurazione.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Configurazione service. Represents a row in the &quot;portos_bo_Configurazione&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneModel
  * @see it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneClp.java
index d0cc1c00..aa640067 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ConfigurazioneClp extends BaseModelImpl<Configurazione>
 	implements Configurazione {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneModel.java
index d1ce0a9d..5f3ca669 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Configurazione
  * @see it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl
  * @see it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneSoap.java
index 4879246a..48ad647d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ConfigurazioneServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ConfigurazioneServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneWrapper.java
index f528ebaf..f12bc8e5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ConfigurazioneWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Configurazione}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Configurazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java
index 277c1440..1579fc54 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the ControlloPratica service. Represents a row in the &quot;portos_bo_ControlloPratica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaModel
  * @see it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java
index 5517cc66..f30dec14 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ControlloPraticaClp extends BaseModelImpl<ControlloPratica>
 	implements ControlloPratica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaModel.java
index 1eb5552d..c94ec1ee 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaModel.java
@@ -35,7 +35,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPratica
  * @see it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaSoap.java
index 334dd3de..9f2199d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ControlloPraticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ControlloPraticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java
index 76be329e..03c64d19 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link ControlloPratica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java
index 189615fe..7f3c0c83 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Delega service. Represents a row in the &quot;portos_bo_Delega&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaModel
  * @see it.tref.liferay.portos.bo.model.impl.DelegaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DelegaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java
index 66d25f55..350d5fcf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class DelegaClp extends BaseModelImpl<Delega> implements Delega {
 	public DelegaClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaModel.java
index de7e4a02..7bf4eb4c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.DelegaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.DelegaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Delega
  * @see it.tref.liferay.portos.bo.model.impl.DelegaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DelegaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaSoap.java
index 3008dbd9..09235f42 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.DelegaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.DelegaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java
index acd4a4a3..d09f73ed 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Delega}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Delega
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java
index 9b9b7864..d9f45921 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the DettPratica service. Represents a row in the &quot;portos_bo_DettPratica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaModel
  * @see it.tref.liferay.portos.bo.model.impl.DettPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java
index 38344197..a48e2889 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class DettPraticaClp extends BaseModelImpl<DettPratica>
 	implements DettPratica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java
index 8d66d339..ca38f2ed 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java
@@ -35,7 +35,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.DettPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPratica
  * @see it.tref.liferay.portos.bo.model.impl.DettPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java
index a5c34582..1a7841d6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.DettPraticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.DettPraticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java
index 5dbe881a..6543591d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link DettPratica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntiva.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntiva.java
index 09fe39ff..6c8669b2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntiva.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntiva.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the DocAggiuntiva service. Represents a row in the &quot;portos_bo_DocAggiuntiva&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaModel
  * @see it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaClp.java
index a255b5d6..53287dc3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class DocAggiuntivaClp extends BaseModelImpl<DocAggiuntiva>
 	implements DocAggiuntiva {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaModel.java
index 0b2a3c22..d4425ee0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntiva
  * @see it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaSoap.java
index 68a1992e..036be4eb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.DocAggiuntivaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.DocAggiuntivaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaWrapper.java
index 5e85bdec..5a642320 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocAggiuntivaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link DocAggiuntiva}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntiva
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java
index 2cb65a75..177ee7a5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the DocPratica service. Represents a row in the &quot;portos_bo_DocPratica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaModel
  * @see it.tref.liferay.portos.bo.model.impl.DocPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java
index 64d4a693..c6027f4b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class DocPraticaClp extends BaseModelImpl<DocPratica>
 	implements DocPratica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java
index df154541..20d8ceca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.DocPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPratica
  * @see it.tref.liferay.portos.bo.model.impl.DocPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java
index ec9c56f4..d97c4e32 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.DocPraticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.DocPraticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java
index 7c528ccc..4c702ab8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link DocPratica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavori.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavori.java
index f77cff96..1e077fa9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavori.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavori.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the FineLavori service. Represents a row in the &quot;portos_bo_FineLavori&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriModel
  * @see it.tref.liferay.portos.bo.model.impl.FineLavoriImpl
  * @see it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java
index 7b1699ce..a7da3f5f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class FineLavoriClp extends BaseModelImpl<FineLavori>
 	implements FineLavori {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java
index af48c702..3dafabc1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.FineLavoriImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavori
  * @see it.tref.liferay.portos.bo.model.impl.FineLavoriImpl
  * @see it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java
index 9eb254fd..7ec8c4cf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.FineLavoriServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.FineLavoriServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java
index 23a1b864..497afb7a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link FineLavori}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavori
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowAction.java
index ed1dd14e..839f5d30 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowAction.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the HistoryWorkflowAction service. Represents a row in the &quot;portos_bo_HistoryWorkflowAction&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionModel
  * @see it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl
  * @see it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionClp.java
index 97b1b54d..324fb35f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionClp.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class HistoryWorkflowActionClp extends BaseModelImpl<HistoryWorkflowAction>
 	implements HistoryWorkflowAction {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionModel.java
index 49228ffb..ef9c0d44 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowAction
  * @see it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl
  * @see it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionSoap.java
index fd4890db..159cc1a6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.HistoryWorkflowActionServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.HistoryWorkflowActionServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionWrapper.java
index c83891e0..90dd354f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/HistoryWorkflowActionWrapper.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * This class is a wrapper for {@link HistoryWorkflowAction}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowAction
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java
index a0bc4333..5cbf71f7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the IntPratica service. Represents a row in the &quot;portos_bo_IntPratica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaModel
  * @see it.tref.liferay.portos.bo.model.impl.IntPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java
index 4a154806..10023836 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class IntPraticaClp extends BaseModelImpl<IntPratica>
 	implements IntPratica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java
index d2aef338..7c54b82d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.IntPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPratica
  * @see it.tref.liferay.portos.bo.model.impl.IntPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java
index 8328cd2d..2f65c90c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.IntPraticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.IntPraticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java
index edfa2f0c..10be971b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link IntPratica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Pagamento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Pagamento.java
index d6b9dc5e..f12b0c95 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Pagamento.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Pagamento.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Pagamento service. Represents a row in the &quot;portos_bo_Pagamento&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoModel
  * @see it.tref.liferay.portos.bo.model.impl.PagamentoImpl
  * @see it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java
index 6ff59a74..d7c59b3d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class PagamentoClp extends BaseModelImpl<Pagamento> implements Pagamento {
 	public PagamentoClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java
index 5b457689..a384e116 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.PagamentoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Pagamento
  * @see it.tref.liferay.portos.bo.model.impl.PagamentoImpl
  * @see it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java
index 5aeb3eff..37ded0d5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.PagamentoServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.PagamentoServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java
index 7587cc67..89b38a7e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Pagamento}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Pagamento
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologo.java
index b3512cb5..6af31498 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologo.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologo.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the ParereGeologo service. Represents a row in the &quot;portos_bo_ParereGeo&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoModel
  * @see it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl
  * @see it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java
index 708a98de..7f23a986 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 	implements ParereGeologo {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java
index 52c9a426..ff0db05e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologo
  * @see it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl
  * @see it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java
index b35197e9..c2cd1668 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ParereGeologoServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ParereGeologoServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java
index b50d5d6a..ad9260d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link ParereGeologo}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologo
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Provincia.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Provincia.java
index 0bb88aac..2d1b6d6c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Provincia.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Provincia.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Provincia service. Represents a row in the &quot;portos_bo_Provincia&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaModel
  * @see it.tref.liferay.portos.bo.model.impl.ProvinciaImpl
  * @see it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaClp.java
index 20c38dbe..a993ebac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaClp.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ProvinciaClp extends BaseModelImpl<Provincia> implements Provincia {
 	public ProvinciaClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaModel.java
index 79760e7b..dd4bc57b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.ProvinciaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Provincia
  * @see it.tref.liferay.portos.bo.model.impl.ProvinciaImpl
  * @see it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaSoap.java
index aa857794..59f8db3c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.ProvinciaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.ProvinciaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaWrapper.java
index f6ee3378..9808b290 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ProvinciaWrapper.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Provincia}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Provincia
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Soggetto.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Soggetto.java
index 62968351..5e3231e8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Soggetto.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Soggetto.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Soggetto service. Represents a row in the &quot;portos_bo_Soggetto&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoModel
  * @see it.tref.liferay.portos.bo.model.impl.SoggettoImpl
  * @see it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoClp.java
index fe71cc47..b82413d5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class SoggettoClp extends BaseModelImpl<Soggetto> implements Soggetto {
 	public SoggettoClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoModel.java
index 1a134504..9a14a8e0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.SoggettoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Soggetto
  * @see it.tref.liferay.portos.bo.model.impl.SoggettoImpl
  * @see it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoSoap.java
index 942f628f..0c2aea0f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.SoggettoServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.SoggettoServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoWrapper.java
index 3204a37b..6dcdfec3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SoggettoWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Soggetto}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Soggetto
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Sorteggio.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Sorteggio.java
index d5389b74..820eb124 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Sorteggio.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Sorteggio.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Sorteggio service. Represents a row in the &quot;portos_bo_Sorteggio&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioModel
  * @see it.tref.liferay.portos.bo.model.impl.SorteggioImpl
  * @see it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java
index 296f7b48..d5d0b3bd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class SorteggioClp extends BaseModelImpl<Sorteggio> implements Sorteggio {
 	public SorteggioClp() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java
index d1d890d3..5ca1af20 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java
@@ -35,7 +35,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.SorteggioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Sorteggio
  * @see it.tref.liferay.portos.bo.model.impl.SorteggioImpl
  * @see it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java
index e1d17aa8..5433d768 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.SorteggioServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.SorteggioServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java
index 200de935..55b5103c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Sorteggio}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Sorteggio
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPratica.java
index 6b04b25d..fa8bf071 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPratica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPratica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the StoricoSoggettoPratica service. Represents a row in the &quot;portos_bo_StoricoSoggettoPratica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaModel
  * @see it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java
index dd0513dc..7ea74f6d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class StoricoSoggettoPraticaClp extends BaseModelImpl<StoricoSoggettoPratica>
 	implements StoricoSoggettoPratica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java
index 39cee054..1650885a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPratica
  * @see it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaSoap.java
index 8dcb03f8..68310f4c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.StoricoSoggettoPraticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.StoricoSoggettoPraticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaWrapper.java
index 505c0e23..2faecb81 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaWrapper.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * This class is a wrapper for {@link StoricoSoggettoPratica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Tempistica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Tempistica.java
index 27ba1964..21cdd372 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Tempistica.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Tempistica.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Tempistica service. Represents a row in the &quot;portos_bo_Tempistica&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaModel
  * @see it.tref.liferay.portos.bo.model.impl.TempisticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaClp.java
index 1a8d4d14..5de7ccac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaClp.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class TempisticaClp extends BaseModelImpl<Tempistica>
 	implements Tempistica {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java
index 91947abc..61249cb4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.TempisticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Tempistica
  * @see it.tref.liferay.portos.bo.model.impl.TempisticaImpl
  * @see it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java
index 0c049d92..a4f8f78a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.TempisticaServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.TempisticaServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java
index 15c520d6..fd31067e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Tempistica}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Tempistica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Territorio.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Territorio.java
index 4b33ad91..15087e3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Territorio.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Territorio.java
@@ -19,7 +19,7 @@ import com.liferay.portal.model.PersistedModel;
 /**
  * The extended model interface for the Territorio service. Represents a row in the &quot;portos_bo_Territorio&quot; database table, with each column mapped to a property of this class.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioModel
  * @see it.tref.liferay.portos.bo.model.impl.TerritorioImpl
  * @see it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioClp.java
index 6f863a3c..a871f7ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioClp.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class TerritorioClp extends BaseModelImpl<Territorio>
 	implements Territorio {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioModel.java
index b540170c..9fa5010f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioModel.java
@@ -34,7 +34,7 @@ import java.util.Date;
  * This interface and its corresponding implementation {@link it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.tref.liferay.portos.bo.model.impl.TerritorioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Territorio
  * @see it.tref.liferay.portos.bo.model.impl.TerritorioImpl
  * @see it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioSoap.java
index cce2abad..d4844ac4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioSoap.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * This class is used by SOAP remote services, specifically {@link it.tref.liferay.portos.bo.service.http.TerritorioServiceSoap}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.http.TerritorioServiceSoap
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioWrapper.java
index 83db0b9e..9f15a678 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TerritorioWrapper.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * This class is a wrapper for {@link Territorio}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Territorio
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
index 0f92a271..fd198022 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
@@ -55,6 +55,7 @@ public class ControlloPraticaAdvancedSearch {
 	private static final Log _log = LogFactoryUtil.getLog(ControlloPraticaAdvancedSearch.class);
 
 	public static Hits searchMieiTask(HttpServletRequest request, User user, int start, int end) {
+
 		// Parametro proveniente dalla ricerca
 		int ufficioSearch = ParamUtil.getInteger(request, "ufficio");
 		boolean searchForExport = ParamUtil.getBoolean(request, "searchForExport", false);
@@ -163,8 +164,7 @@ public class ControlloPraticaAdvancedSearch {
 					&& !organizationRoleList.isEmpty()) {
 				booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST);
 			} else {
-				TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds",
-						("R" + 0 + "G" + 0));
+				TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", "R0G0");
 				booleanQueryRoleIds.add(roleIdTerm, BooleanClauseOccur.SHOULD);
 				booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST);
 			}
@@ -504,6 +504,7 @@ public class ControlloPraticaAdvancedSearch {
 
 	private static void retrieveQuery(HttpServletRequest request, User user, BooleanQuery booleanQuery,
 			SearchContext searchContext) {
+
 		String numeroProgettoSearch = ParamUtil.getString(request, "numeroProgetto");
 		String protocolloSearch = ParamUtil.getString(request, "protocollo");
 		String tipoPraticaSearch = ParamUtil.getString(request, "tipoPratica");
@@ -518,9 +519,6 @@ public class ControlloPraticaAdvancedSearch {
 		String tipoAttivita = ParamUtil.getString(request, "tipoAttivita");
 		String controlloObbligatorioSearch = ParamUtil.getString(request, "controlloObbligatorio");
 		String sorteggiataSearch = ParamUtil.getString(request, "sorteggiata");
-		
-		_log.info(tipoProcedura);
-				
 		try {
 			if (Validator.isNotNull(tipoAttivita) && !tipoAttivita.equals("-1")) {
 				TermQuery tipoAttivitaTermQuery = TermQueryFactoryUtil.create(searchContext, "workflowState",
@@ -638,6 +636,7 @@ public class ControlloPraticaAdvancedSearch {
 	}
 
 	private static Sort[] getOrderedQuery(HttpServletRequest request) {
+
 		Properties properties = PropsUtil.getProperties("elasticsearch.", true);
 		String orderField = ParamUtil.getString(request, "ordinaPer", "numeroProgetto");
 		String orderType = ParamUtil.getString(request, "ordinaTipo", "desc");
@@ -650,17 +649,17 @@ public class ControlloPraticaAdvancedSearch {
 				sort.setFieldName(orderField);
 			}
 			switch (orderField) {
-			case "createDate":
-			case "dataInizioProcedimento":
-			case "protocollo":
-				sort.setType(Sort.LONG_TYPE);
-				break;
-			case "taskName":
-				sort.setType(Sort.STRING_TYPE);
-				break;
-			default:
-				sort.setType(Sort.INT_TYPE);
-				break;
+				case "createDate":
+				case "dataInizioProcedimento":
+				case "protocollo":
+					sort.setType(Sort.LONG_TYPE);
+					break;
+				case "taskName":
+					sort.setType(Sort.STRING_TYPE);
+					break;
+				default:
+					sort.setType(Sort.INT_TYPE);
+					break;
 			}
 		}
 		if (Validator.isNotNull(orderType) && !orderType.equals("-1")) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java
index 8aa501d6..02c377b4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java
@@ -10,14 +10,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
-
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -53,9 +49,8 @@ public class IntPraticaAdvancedSearch {
 
 	public static final String[] OVERRIDE_KEYWORDS = { PortosIndexField.INT_PRATICA_ID,
 			PortosIndexField.NUMERO_PROGETTO, PortosIndexField.TIPO_PRATICA, PortosIndexField.STATO_PRATICA,
-			PortosIndexField.DATA_RICHIESTA, PortosIndexField.COMMITTENTE,
-			PortosIndexField.SOGGETTI_INTERESSATI, PortosIndexField.STATUS, Field.ENTRY_CLASS_NAME,
-			Field.USER_ID, PortosIndexField.DESC_INTERVENTO };
+			PortosIndexField.DATA_RICHIESTA, PortosIndexField.COMMITTENTE, PortosIndexField.SOGGETTI_INTERESSATI,
+			PortosIndexField.STATUS, Field.ENTRY_CLASS_NAME, Field.USER_ID, PortosIndexField.DESC_INTERVENTO };
 
 	public static final Format DATE_FORMAT_LUCENE = FastDateFormatFactoryUtil.getSimpleDateFormat("yyyyMMdd");
 
@@ -64,15 +59,12 @@ public class IntPraticaAdvancedSearch {
 	public static Hits searchMieiProgetti(HttpServletRequest request, User user, int start, int end) {
 
 		SearchContext searchContext = SearchContextFactory.getInstance(request);
-
 		searchContext.setKeywords(OVERRIDE_KEYWORDS.toString());
 		searchContext.setAttribute("paginationType", "more");
 		searchContext.setStart(start);
 		searchContext.setEnd(end);
-
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
-
 		Hits hits = null;
 		try {
 			BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext);
@@ -81,23 +73,16 @@ public class IntPraticaAdvancedSearch {
 			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME,
 					IntPratica.class.getName());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, Field.USER_ID, user.getUserId());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "true");
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-			
 			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.IN_LAVORAZIONE_SUE, "false");
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			// Condizioni aggiuntive
 			query(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
-
 			logResults(user, booleanQuery, hits);
-
 		} catch (SearchException | ParseException e) {
 			_log.error(e, e);
 		}
@@ -112,35 +97,25 @@ public class IntPraticaAdvancedSearch {
 		searchContext.setAttribute("paginationType", "more");
 		searchContext.setStart(start);
 		searchContext.setEnd(end);
-
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
-
 		Hits hits = null;
 		try {
 			BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext);
-
-			// Condizioni necessarie per questa ricerca :
-			// entryClassName=IntPratica & soggettiInteressati=userScreenName e
-			// userId!=myUserId e stato!=chiuso ??
+			// Condizioni necessarie per questa ricerca: entryClassName=IntPratica & soggettiInteressati=userScreenName
+			// e userId!=myUserId e stato!=chiuso ??
 			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME,
 					IntPratica.class.getName());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
-			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.SOGGETTI_INTERESSATI,
-					user.getScreenName().toUpperCase());
+			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.SOGGETTI_INTERESSATI, user
+					.getScreenName().toUpperCase());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "true");
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			// Condizioni aggiuntive
 			query(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
-
 			logResults(user, booleanQuery, hits);
-
 		} catch (ParseException | SearchException e) {
 			_log.error(e, e);
 		}
@@ -154,46 +129,30 @@ public class IntPraticaAdvancedSearch {
 		searchContext.setAttribute("paginationType", "more");
 		searchContext.setStart(start);
 		searchContext.setEnd(end);
-
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
 		Hits hits = null;
-
 		try {
-
-			// Condizioni necessarie per questa ricerca :
-			// entryClassName=IntPratica & soggettiInteressati=userScreenName e
-			// stato==chiuso
-
+			// Condizioni necessarie per questa ricerca: entryClassName=IntPratica & soggettiInteressati=userScreenName
+			// e stato==chiuso
 			BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext);
 			BooleanQuery altriProgettiBooleanQuery = BooleanQueryFactoryUtil.create(searchContext);
-
-			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext,
-					PortosIndexField.SOGGETTI_INTERESSATI, user.getScreenName().toUpperCase());
+			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.SOGGETTI_INTERESSATI,
+					user.getScreenName().toUpperCase());
 			altriProgettiBooleanQuery.add(termQuery, BooleanClauseOccur.SHOULD);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, Field.USER_ID, user.getUserId());
 			altriProgettiBooleanQuery.add(termQuery, BooleanClauseOccur.SHOULD);
-
-			termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME,
-					IntPratica.class.getName());
+			termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME, IntPratica.class.getName());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "false");
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-			
 			termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.IN_LAVORAZIONE_SUE, "false");
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			booleanQuery.add(altriProgettiBooleanQuery, BooleanClauseOccur.MUST);
-
 			// Condizioni aggiuntive
 			query(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
-
 			logResults(user, booleanQuery, hits);
-
 		} catch (ParseException | SearchException e) {
 			_log.error(e, e);
 		}
@@ -203,41 +162,30 @@ public class IntPraticaAdvancedSearch {
 	public static Hits searchProgettiBO(HttpServletRequest request, User user, int start, int end) {
 
 		SearchContext searchContext = SearchContextFactory.getInstance(request);
-
 		searchContext.setKeywords(OVERRIDE_KEYWORDS.toString());
-
 		boolean searchForExport = ParamUtil.getBoolean(request, "searchForExport", false);
-
 		if (searchForExport) {
-
 			int maxEnd = GetterUtil.getInteger(PropsUtil.get(PropsKeys.INDEX_FILTER_SEARCH_LIMIT));
-
 			searchContext.setStart(0);
 			searchContext.setEnd(maxEnd);
 			searchContext.setAttribute("paginationType", "none");
-
 		} else {
 			searchContext.setAttribute("paginationType", "more");
 			searchContext.setStart(start);
 			searchContext.setEnd(end);
 		}
-
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
-
 		Hits hits = null;
 		try {
 			BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext);
-			// Condizioni necessarie per questa ricerca :
-			// entryClassName=IntPratica & dtPratica valorizzato & GroupId
+			// Condizioni necessarie per questa ricerca: entryClassName=IntPratica & dtPratica valorizzato & GroupId
 			// facente parte dei miei gruopId delle mie organizzazioni
 			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME,
 					IntPratica.class.getName());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, "dtPratica", 0);
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST_NOT);
-
 			// Ricavo i groupId legati all utente che effettua la ricerca
 			int ufficio = ParamUtil.getInteger(request, "ufficio");
 			if (ufficio != 0 && ufficio != -1) {
@@ -247,11 +195,9 @@ public class IntPraticaAdvancedSearch {
 				List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(user
 						.getUserId());
 				BooleanQuery groupIdsQuery = BooleanQueryFactoryUtil.create(searchContext);
-
 				if (Validator.isNotNull(organizationList)) {
 					for (Organization org : organizationList) {
-						termQuery = TermQueryFactoryUtil.create(searchContext, Field.GROUP_ID,
-								org.getGroupId());
+						termQuery = TermQueryFactoryUtil.create(searchContext, Field.GROUP_ID, org.getGroupId());
 						groupIdsQuery.add(termQuery, BooleanClauseOccur.SHOULD);
 					}
 					booleanQuery.add(groupIdsQuery, BooleanClauseOccur.MUST);
@@ -260,126 +206,96 @@ public class IntPraticaAdvancedSearch {
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				}
 			}
-
 			// Condizioni aggiuntive
 			query(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
-
 			logResults(user, booleanQuery, hits);
-
 		} catch (ParseException | SearchException | SystemException e) {
 			_log.error(e, e);
 		}
 		return hits;
 	}
 
-	// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione
-	// tutte i record
+	// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione tutte i record
 	public static Hits searchAttivitaIstruttore(HttpServletRequest request, User user, int start, int end) {
+
 		return searchAttivitaIstruttore(request, user, start, end, false);
 	}
 
-	// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione
-	// tutte i record
+	// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione tutte i record
 	public static Hits searchAttivitaIstruttore(HttpServletRequest request, User user, int start, int end,
 			boolean isExport) {
 
 		SearchContext searchContext = SearchContextFactory.getInstance(request);
-
 		searchContext.setKeywords(OVERRIDE_KEYWORDS.toString());
-		// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione
-		// tutte i record
-		// Bug 33248
+		// ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV - Esportazione tutte i record
 		if (!isExport)
 			searchContext.setAttribute("paginationType", "more");
 		else
 			searchContext.setAttribute("paginationType", "none");
-
 		searchContext.setStart(start);
 		searchContext.setEnd(end);
-
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
-
 		Hits hits = null;
 		try {
 			BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext);
-
 			// Condizioni necessarie per questa ricerca :
 			// entryClassName=IntPratica &
 			// statusByUserId = myUserId
 			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME,
 					IntPratica.class.getName());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			termQuery = TermQueryFactoryUtil.create(searchContext, "istruttoreUserId", user.getUserId());
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
-
 			// Condizioni aggiuntive
 			queryForIstruttore(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
-
 			logResults(user, booleanQuery, hits);
-
 		} catch (ParseException | SearchException e) {
 			_log.error(e, e);
 		}
-
 		return hits;
 	}
 
 	/*
-	 * Manifattura Web Group per Regione Siciliana
-	 * 
-	 * Modifiche per rendere i campi di testo ricercabili per parole contenute e
-	 * non per corrispondenza esatta.
+	 * Manifattura Web Group per Regione Siciliana Modifiche per rendere i campi di testo ricercabili per parole
+	 * contenute e non per corrispondenza esatta.
 	 */
 	private static void query(HttpServletRequest request, User user, BooleanQuery booleanQuery,
 			SearchContext searchContext) {
 
 		try {
-
 			TermQuery termQuery;
-
 			queryPraticaAperta(request, booleanQuery, searchContext);
 			queryNumeroProgetto(request, booleanQuery, searchContext);
-
 			String protocollo = ParamUtil.getString(request, PortosIndexField.PROTOCOLLO);
 			if (Validator.isNotNull(protocollo)) {
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PROTOCOLLO,
-						protocollo);
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PROTOCOLLO, protocollo);
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 			}
-
 			queryTipoPratica(request, booleanQuery, searchContext);
-
 			String tipoIntervento = ParamUtil.getString(request, "tipoIntervento");
 			if (Validator.isNotNull(tipoIntervento)) {
 				if (tipoIntervento.equals("interventoLocale")) {
 					termQuery = TermQueryFactoryUtil.create(searchContext, "interventoLocale", "true");
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				} else if (tipoIntervento.equals("miglioramento")) {
-					termQuery = TermQueryFactoryUtil.create(searchContext,
-							PortosIndexField.MIGLIORAMENTO_SISMICO, "true");
+					termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.MIGLIORAMENTO_SISMICO,
+							"true");
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				} else if (tipoIntervento.equals("adeguamento")) {
-					termQuery = TermQueryFactoryUtil.create(searchContext,
-							PortosIndexField.ADEGUAMENTO_SISMICO, "true");
+					termQuery = TermQueryFactoryUtil
+							.create(searchContext, PortosIndexField.ADEGUAMENTO_SISMICO, "true");
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				} else if (tipoIntervento.equals(PortosIndexField.NUOVA_COSTRUZIONE)) {
-					termQuery = TermQueryFactoryUtil.create(searchContext,
-							PortosIndexField.NUOVA_COSTRUZIONE, "true");
+					termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.NUOVA_COSTRUZIONE, "true");
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				}
 			}
-
 			queryStatoPratica(request, booleanQuery, searchContext);
 			queryTipoProcedura(request, booleanQuery, searchContext);
-
-			addRequiredTerms(booleanQuery, PortosIndexField.COMMITTENTI,
-					ParamUtil.getString(request, "committente"));
+			addRequiredTerms(booleanQuery, PortosIndexField.COMMITTENTI, ParamUtil.getString(request, "committente"));
 			addRequiredTerms(booleanQuery, PortosIndexField.ISTRUTTORE_FULL_NAME,
 					ParamUtil.getString(request, "tecnicoIstruttore"));
 			addRequiredTerms(booleanQuery, PortosIndexField.PROPRIETARIO_DIGITALE_FULL_NAME,
@@ -387,32 +303,25 @@ public class IntPraticaAdvancedSearch {
 			for (String field : new String[] { PortosIndexField.SOGGETTI_INTERCONNESSI,
 					PortosIndexField.DESC_INTERVENTO, PortosIndexField.INDIRIZZO })
 				addRequiredTerms(booleanQuery, field, ParamUtil.getString(request, field));
-
 			String provincia = ParamUtil.getString(request, PortosIndexField.PROVINCIA);
 			if (Validator.isNotNull(provincia) && !provincia.equals("000")) {
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PROVINCIA_CODICE,
-						provincia);
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PROVINCIA_CODICE, provincia);
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 			}
-
 			queryComune(request, booleanQuery, searchContext);
 			queryDate(request, booleanQuery, searchContext);
-
 		} catch (ParseException | java.text.ParseException e) {
 			_log.error(e, e);
 		}
-
 	}
 
 	private static void queryForIstruttore(HttpServletRequest request, User user, BooleanQuery booleanQuery,
 			SearchContext searchContext) {
 
 		try {
-
 			queryNumeroProgetto(request, booleanQuery, searchContext);
 			queryPraticaAperta(request, booleanQuery, searchContext);
 			queryTipoPratica(request, booleanQuery, searchContext);
-
 			if (!ParamUtil.getBoolean(request, "interventoTutti")) {
 				if (ParamUtil.getBoolean(request, "interventoNuovaCostruzione")) {
 					TermQuery termQuery = TermQueryFactoryUtil.create(searchContext,
@@ -435,14 +344,12 @@ public class IntPraticaAdvancedSearch {
 					booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 				}
 			}
-
 			queryStatoPratica(request, booleanQuery, searchContext);
-			for (String field : new String[] { PortosIndexField.COMMITTENTI,
-					PortosIndexField.SOGGETTI_INTERCONNESSI, PortosIndexField.DIRETTORE_LAVORI })
+			for (String field : new String[] { PortosIndexField.COMMITTENTI, PortosIndexField.SOGGETTI_INTERCONNESSI,
+					PortosIndexField.DIRETTORE_LAVORI })
 				addRequiredTerms(booleanQuery, field, ParamUtil.getString(request, field));
 			queryDate(request, booleanQuery, searchContext);
 			queryComune(request, booleanQuery, searchContext);
-
 			String ufficio = ParamUtil.getString(request, "ufficio");
 			if (Validator.isNotNull(ufficio) && !ufficio.equals("-1")) {
 				TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, Field.GROUP_ID, ufficio);
@@ -454,30 +361,29 @@ public class IntPraticaAdvancedSearch {
 	}
 
 	private static void addRequiredTerms(BooleanQuery booleanQuery, String field, String terms) {
-		if (Validator.isNotNull(terms))
-			for (String term : StringUtil.split(terms, " "))
-				if (Validator.isNotNull(term))
+
+		if (Validator.isNotNull(terms)) {
+			for (String term : StringUtil.split(terms, " ")) {
+				if (Validator.isNotNull(term)) {
 					booleanQuery.addRequiredTerm(field, term);
+				}
+			}
+		}
 	}
 
 	private static Sort[] getOrderedQuery(HttpServletRequest request) {
 
 		Properties properties = PropsUtil.getProperties("elasticsearch.", true);
-
 		String orderField = ParamUtil.getString(request, "ordinaPer");
 		String orderType = ParamUtil.getString(request, "ordinaTipo");
-
 		List<Sort> sortes = new ArrayList<Sort>();
 		Sort sort = new Sort();
-
 		if (orderField != null && !orderField.equals("") && !orderField.equals("-1")) {
-
 			if (properties.size() > 0) {
 				sort.setFieldName(orderField + "_sortable");
 			} else {
 				sort.setFieldName(orderField);
 			}
-
 			if (orderField.equals(PortosIndexField.NUMERO_PROGETTO)) {
 				sort.setType(Sort.INT_TYPE);
 			} else if (orderField.equals(PortosIndexField.PROTOCOLLO)) {
@@ -486,7 +392,6 @@ public class IntPraticaAdvancedSearch {
 				sort.setType(Sort.LONG_TYPE);
 			}
 		}
-
 		if (orderType != null && !orderType.equals("") && !orderType.equals("-1")) {
 			if (orderType.equals("asc")) {
 				sort.setReverse(false);
@@ -494,93 +399,83 @@ public class IntPraticaAdvancedSearch {
 				sort.setReverse(true);
 			}
 		}
-
 		sortes.add(sort);
-
 		return sortes.toArray(new Sort[0]);
 	}
 
 	/*
-	 * Manifattura Web Group per Regione Siciliana
-	 * 
-	 * Rimosse numerose righe di codice che trattavano separatamente i 3 casi:
-	 * entrambe le date inserite, inserita solo la data iniziale, inserita solo
-	 * la data finale. Le funzioni seguenti sono state create per ridurre la
-	 * duplicazione di codice.
+	 * Manifattura Web Group per Regione Siciliana Rimosse numerose righe di codice che trattavano separatamente i 3
+	 * casi: entrambe le date inserite, inserita solo la data iniziale, inserita solo la data finale. Le funzioni
+	 * seguenti sono state create per ridurre la duplicazione di codice.
 	 */
-	private static void queryDate(HttpServletRequest request, BooleanQuery booleanQuery,
-			SearchContext searchContext) throws ParseException, java.text.ParseException {
+	private static void queryDate(HttpServletRequest request, BooleanQuery booleanQuery, SearchContext searchContext)
+			throws ParseException, java.text.ParseException {
+
 		String dataDaSearch = ParamUtil.getString(request, "dataRichiestaInizio");
 		String dataASearch = ParamUtil.getString(request, "dataRichiestaFine");
-
 		if (Validator.isNotNull(dataDaSearch) || Validator.isNotNull(dataASearch)) {
-
-			String dataDa = Validator.isNull(dataDaSearch) ? "00000000" : DATE_FORMAT_LUCENE
-					.format(DATE_FORMAT_STRING.parse(dataDaSearch));
-			String dataA = DATE_FORMAT_LUCENE.format(Validator.isNull(dataASearch) ? new Date()
-					: DATE_FORMAT_STRING.parse(dataASearch));
-
+			String dataDa = Validator.isNull(dataDaSearch) ? "00000000" : DATE_FORMAT_LUCENE.format(DATE_FORMAT_STRING
+					.parse(dataDaSearch));
+			String dataA = DATE_FORMAT_LUCENE.format(Validator.isNull(dataASearch) ? new Date() : DATE_FORMAT_STRING
+					.parse(dataASearch));
 			TermRangeQuery termRangeQuery = TermRangeQueryFactoryUtil.create(searchContext,
 					PortosIndexField.DATA_RICHIESTA, dataDa, dataA, true, true);
 			booleanQuery.add(termRangeQuery, BooleanClauseOccur.MUST);
 		}
 	}
 
-	private static void queryComune(HttpServletRequest request, BooleanQuery booleanQuery,
-			SearchContext searchContext) throws ParseException {
+	private static void queryComune(HttpServletRequest request, BooleanQuery booleanQuery, SearchContext searchContext)
+			throws ParseException {
+
 		String comune = ParamUtil.getString(request, PortosIndexField.COMUNE);
 		if (Validator.isNotNull(comune) && !comune.equals("000")) {
-			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COMUNE_ID,
-					comune);
+			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COMUNE_ID, comune);
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 		}
 	}
 
 	private static void queryNumeroProgetto(HttpServletRequest request, BooleanQuery booleanQuery,
 			SearchContext searchContext) throws ParseException {
+
 		String numeroProgetto = ParamUtil.getString(request, PortosIndexField.NUMERO_PROGETTO);
 		if (Validator.isNotNull(numeroProgetto)) {
-			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext,
-					PortosIndexField.NUMERO_PROGETTO, numeroProgetto);
+			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.NUMERO_PROGETTO,
+					numeroProgetto);
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 		}
 	}
 
 	private static void queryStatoPratica(HttpServletRequest request, BooleanQuery booleanQuery,
 			SearchContext searchContext) throws ParseException {
+
 		String statoPratica = ParamUtil.getString(request, PortosIndexField.STATO_PRATICA);
 		if (Validator.isNotNull(statoPratica)) {
 			TermQuery termQuery = null;
-			if (statoPratica.equals(StatoPraticaConstants.COLLAUDO_PARZIALE))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COLLAUDO_PARZIALE,
-						"true");
-			else if (statoPratica.equals(StatoPraticaConstants.COLLAUDO))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COLLAUDO_COMPLETATO,
-						"true");
-			else if (statoPratica.equals(StatoPraticaConstants.FINE_LAVORI))
-				termQuery = TermQueryFactoryUtil.create(searchContext,
-						PortosIndexField.FINE_LAVORI_COMPLETATI, "true");
-			else if (statoPratica.equals(StatoPraticaConstants.FINE_LAVORI_PARZIALE))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.FINE_LAVORI_PARZIALI,
-						"true");
-			else if (statoPratica.equals(StatoPraticaConstants.SORTEGGIATA))
-				termQuery = TermQueryFactoryUtil.create(searchContext,
-						PortosIndexField.LAVORAZIONE_SORTEGGIATA, "true");
-			else if (statoPratica.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.SOTTOPOSTO_A_PARERE,
-						"true");
-			else if (statoPratica.equals(PortosIndexField.STATUS_SOSPESA))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.STATUS_SOSPESA,
-						"true");
-			else if (statoPratica.equals("IC"))
+			if (statoPratica.equals(StatoPraticaConstants.COLLAUDO_PARZIALE)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COLLAUDO_PARZIALE, "true");
+			} else if (statoPratica.equals(StatoPraticaConstants.COLLAUDO)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.COLLAUDO_COMPLETATO, "true");
+			} else if (statoPratica.equals(StatoPraticaConstants.FINE_LAVORI)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.FINE_LAVORI_COMPLETATI, "true");
+			} else if (statoPratica.equals(StatoPraticaConstants.FINE_LAVORI_PARZIALE)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.FINE_LAVORI_PARZIALI, "true");
+			} else if (statoPratica.equals(StatoPraticaConstants.SORTEGGIATA)) {
+				termQuery = TermQueryFactoryUtil
+						.create(searchContext, PortosIndexField.LAVORAZIONE_SORTEGGIATA, "true");
+			} else if (statoPratica.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.SOTTOPOSTO_A_PARERE, "true");
+			} else if (statoPratica.equals(PortosIndexField.STATUS_SOSPESA)) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.STATUS_SOSPESA, "true");
+			} else if (statoPratica.equals("IC")) {
 				termQuery = TermQueryFactoryUtil.create(searchContext, "dtPratica", "0");
-			else if (statoPratica.equals(StatoPraticaConstants.VARIATA))
+			} else if (statoPratica.equals(StatoPraticaConstants.VARIATA)) {
 				termQuery = TermQueryFactoryUtil.create(searchContext, "variata", "true");
-			else if (!statoPratica.equals("-1"))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.STATO_PRATICA,
-						statoPratica);
-			if (Validator.isNotNull(termQuery))
+			} else if (!statoPratica.equals("-1")) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.STATO_PRATICA, statoPratica);
+			}
+			if (Validator.isNotNull(termQuery)) {
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+			}
 		}
 	}
 
@@ -589,14 +484,14 @@ public class IntPraticaAdvancedSearch {
 		String praticaAperta = ParamUtil.getString(request, PortosIndexField.PRATICA_APERTA);
 		if (Validator.isNotNull(praticaAperta)) {
 			TermQuery termQuery = null;
-			if (praticaAperta.equals("aperta"))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA,
-						"true");
-			else if (praticaAperta.equals("chiusa"))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA,
-						"false");
-			if (Validator.isNotNull(termQuery))
+			if (praticaAperta.equals("aperta")) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "true");
+			} else if (praticaAperta.equals("chiusa")) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "false");
+			}
+			if (Validator.isNotNull(termQuery)) {
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+			}
 		}
 	}
 
@@ -605,25 +500,28 @@ public class IntPraticaAdvancedSearch {
 		String tipoPratica = ParamUtil.getString(request, PortosIndexField.TIPO_PRATICA);
 		if (Validator.isNotNull(tipoPratica)) {
 			TermQuery termQuery = null;
-			if (tipoPratica.equals("sorteggio"))
+			if (tipoPratica.equals("sorteggio")) {
 				termQuery = TermQueryFactoryUtil.create(searchContext, "sorteggiata", "true");
-			else if (tipoPratica.equals("co"))
+			} else if (tipoPratica.equals("co")) {
 				termQuery = TermQueryFactoryUtil.create(searchContext, "controlloObbligatorio", "true");
-			else if (!tipoPratica.equals("-1"))
-				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PRATICA,
-						tipoPratica);
-			if (Validator.isNotNull(termQuery))
+			} else if (!tipoPratica.equals("-1")) {
+				termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PRATICA, tipoPratica);
+			}
+			if (Validator.isNotNull(termQuery)) {
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+			}
 		}
 	}
-	
+
 	private static void queryTipoProcedura(HttpServletRequest request, BooleanQuery booleanQuery,
 			SearchContext searchContext) throws ParseException {
 		String tipoProcedura = ParamUtil.getString(request, PortosIndexField.TIPO_PROCEDURA);
 		if (Validator.isNotNull(tipoProcedura)) {
-			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PROCEDURA, tipoProcedura);
-			if (Validator.isNotNull(termQuery))
+			TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PROCEDURA,
+					tipoProcedura);
+			if (Validator.isNotNull(termQuery)) {
 				booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+			}
 		}
 	}
 
@@ -633,5 +531,4 @@ public class IntPraticaAdvancedSearch {
 			_log.debug("Number of hint find : " + hits.getLength());
 		}
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalService.java
index 32343959..8251d995 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceClp.java
index 99799fda..7c1961c0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AllegatoManualeLocalServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceUtil.java
index 2994aee9..a65956e1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeLocalService
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceWrapper.java
index c7ae0e88..93bc33c2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AllegatoManualeLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeService.java
index 2197077e..bc4f56c9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceClp.java
index fb66f294..39612941 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AllegatoManualeServiceClp implements AllegatoManualeService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceUtil.java
index b3630915..7a27f961 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeService
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceWrapper.java
index 60eaaa9a..b483144c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AllegatoManualeServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AllegatoManualeService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalService.java
index 970fec6a..bd416ace 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceClp.java
index 51837876..b332fbde 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AsseverazioneLocalServiceClp implements AsseverazioneLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceUtil.java
index eca88317..15a1fe11 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneLocalService
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceWrapper.java
index 6dbb0d2f..5fef018f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AsseverazioneLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneService.java
index 0b4bfd85..99b20591 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceClp.java
index 51f7d4a2..b0041b74 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AsseverazioneServiceClp implements AsseverazioneService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceUtil.java
index dcf84739..661f5440 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneService
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceWrapper.java
index f7d02a5d..a794fea3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AsseverazioneServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AsseverazioneService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java
index 361c17b5..b06801d3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java
index 9fd160cb..b2969f87 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AvvisoLocalServiceClp implements AvvisoLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java
index d10ce12b..5b74fc8a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoLocalService
  * @see it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java
index 3d068421..dda0e8a3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AvvisoLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoService.java
index 1f2210b8..ae55fae7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.AvvisoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceClp.java
index a0e8b785..98cbe1f5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AvvisoServiceClp implements AvvisoService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceUtil.java
index 76db6a14..002c8c03 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoService
  * @see it.tref.liferay.portos.bo.service.base.AvvisoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceWrapper.java
index ff2cfe46..710e12c7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link AvvisoService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ClpSerializer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ClpSerializer.java
index 77a7c7c4..798d494b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ClpSerializer.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ClpSerializer.java
@@ -58,7 +58,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ClpSerializer {
 	public static String getServletContextName() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java
index bf139b57..c15af400 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.CollaudoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java
index 108efa5c..883eab84 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class CollaudoLocalServiceClp implements CollaudoLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java
index 45c5bed8..d5c27830 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoLocalService
  * @see it.tref.liferay.portos.bo.service.base.CollaudoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java
index 3b698da1..bdf809b3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link CollaudoLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoService.java
index af9eec57..b2a2af53 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.CollaudoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceClp.java
index fb91621d..718e4473 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class CollaudoServiceClp implements CollaudoService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceUtil.java
index 7ab2edd2..70dda1d9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoService
  * @see it.tref.liferay.portos.bo.service.base.CollaudoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceWrapper.java
index bf2f144f..31dfffeb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link CollaudoService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalService.java
index fe3faeef..a1b51a62 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ComuneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComuneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceClp.java
index 4b5cf5ca..b77cecca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComuneLocalServiceClp implements ComuneLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceUtil.java
index 98aaa753..2f39b388 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneLocalService
  * @see it.tref.liferay.portos.bo.service.base.ComuneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComuneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceWrapper.java
index 8a99cb8e..e952f5b2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ComuneLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneService.java
index 39678d99..9a324c73 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ComuneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComuneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceClp.java
index 3ceb19c1..15689ca5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComuneServiceClp implements ComuneService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceUtil.java
index 7653778f..8e7bd7a6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneService
  * @see it.tref.liferay.portos.bo.service.base.ComuneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComuneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceWrapper.java
index 76557a89..3b0c2a78 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComuneServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ComuneService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalService.java
index 5c00a344..aabdfb3f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceClp.java
index b96df784..6d33ccea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComunicazioneLocalServiceClp implements ComunicazioneLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceUtil.java
index 965bdd0f..3cd937f3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneLocalService
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceWrapper.java
index af2f7e4c..bea3fe44 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ComunicazioneLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneService.java
index 469e3c4c..0bdaabbf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceClp.java
index 8587161d..6a4e00a4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComunicazioneServiceClp implements ComunicazioneService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceUtil.java
index 555dd7c7..792ce040 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneService
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceWrapper.java
index 395c8d92..e05abc49 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ComunicazioneServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ComunicazioneService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java
index 5699777e..15e0274e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java
index 4372bf83..ca6ccfef 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java
index 263aa65c..66b6e53c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneLocalService
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java
index f74419b1..c87b6bb8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ConfigurazioneLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneService.java
index 5e99cd3f..1a90a880 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceClp.java
index 357786b0..69c7da7e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ConfigurazioneServiceClp implements ConfigurazioneService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceUtil.java
index c5c9cad2..5f7acfb4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneService
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceWrapper.java
index 120284e5..f3f3a9e2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ConfigurazioneService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java
index 603a9955..dd38ed75 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java
index 3877b8b6..0e9c01af 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ControlloPraticaLocalServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java
index 3be17f12..4dcd469a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java
index 54d7ef90..50a6403a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ControlloPraticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaService.java
index 79410ca7..b39dc892 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceClp.java
index 86793e53..53ec9f68 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ControlloPraticaServiceClp implements ControlloPraticaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceUtil.java
index 5713c9d2..ce3a8f4c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaService
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceWrapper.java
index 95744bb7..e2095ad3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ControlloPraticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalService.java
index f33cddc1..06908b20 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DelegaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DelegaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceClp.java
index ac1633a7..d3312a8a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DelegaLocalServiceClp implements DelegaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceUtil.java
index 0534ed19..299aaa4b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaLocalService
  * @see it.tref.liferay.portos.bo.service.base.DelegaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DelegaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceWrapper.java
index a14e62c9..4b417340 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DelegaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaService.java
index e98bbe0e..e841af3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DelegaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DelegaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceClp.java
index 3f018c34..67a86a2e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DelegaServiceClp implements DelegaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceUtil.java
index 730dd58f..af7f4ded 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaService
  * @see it.tref.liferay.portos.bo.service.base.DelegaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DelegaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceWrapper.java
index 9b86e3c1..08aa8c65 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DelegaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DelegaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java
index 4e6b25e9..d0af643d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java
index 8805db97..8e886a3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DettPraticaLocalServiceClp implements DettPraticaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java
index 449ac335..776dad0d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java
index b0cf3709..5cc94b9e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DettPraticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java
index b8ae4f2d..84b2ecac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java
index 989542fc..dc6db316 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DettPraticaServiceClp implements DettPraticaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java
index 11d8f895..3a411945 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaService
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java
index 88e6ff94..e001d430 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DettPraticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalService.java
index 61ce0a6f..4393e614 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceClp.java
index e83698b9..96c00c9b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocAggiuntivaLocalServiceClp implements DocAggiuntivaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceUtil.java
index ffe40e52..ef995ccb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaLocalService
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceWrapper.java
index 99f3945a..29d8accc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DocAggiuntivaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaService.java
index cda0dcb9..5d021b12 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceClp.java
index c34617da..13de7414 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocAggiuntivaServiceClp implements DocAggiuntivaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceUtil.java
index a753eb29..9244db75 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaService
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceWrapper.java
index 674c8209..9449d2b8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocAggiuntivaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DocAggiuntivaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java
index 5bec1c44..e496a626 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java
index 92508af8..9ad36a6b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocPraticaLocalServiceClp implements DocPraticaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java
index 7deebb7f..0a84a1d2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java
index 4c97719c..265a81b1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DocPraticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaService.java
index f3c49451..8b9e722d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceClp.java
index 1a519d85..77864765 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocPraticaServiceClp implements DocPraticaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceUtil.java
index 164a375a..d8b52760 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaService
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceWrapper.java
index 99df1c79..87f859b9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link DocPraticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java
index 54d6b4ce..0f9d95e7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java
index 1ddfe738..e43bcf80 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class FineLavoriLocalServiceClp implements FineLavoriLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java
index 9679fdb9..86a5b26d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriLocalService
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java
index 633caf83..78d23d4d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link FineLavoriLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriService.java
index fe73e0fd..ecdf69ea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceClp.java
index 8c0e4916..5b05b33f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class FineLavoriServiceClp implements FineLavoriService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceUtil.java
index 78e469e9..49dee193 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriService
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceWrapper.java
index 050f5db2..f5e6c830 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link FineLavoriService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalService.java
index a75a9342..852ad8a3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceClp.java
index 8a00312d..08fef325 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class HistoryWorkflowActionLocalServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceUtil.java
index cdf74bd8..7d07408b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionLocalService
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceWrapper.java
index 64d71b90..270c22be 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link HistoryWorkflowActionLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionService.java
index fd218433..4aa3f62e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceClp.java
index 5dcc51c5..f05908fa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class HistoryWorkflowActionServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceUtil.java
index a74a7ccf..0afc0579 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionService
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceWrapper.java
index f743e9b5..f5957513 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/HistoryWorkflowActionServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link HistoryWorkflowActionService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java
index 9604d96a..dcba1c08 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java
index c239b9ee..8fcb7d8b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java
index 980bf520..f4d400b7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java
index 64046bab..eb9ec52a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link IntPraticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java
index def352bd..04c44316 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java
index 04c2867c..eb6806f8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class IntPraticaServiceClp implements IntPraticaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java
index 8b8d52a9..2e3036c1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaService
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java
index 31dbadbe..9e43a72c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link IntPraticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java
index d65f2f90..018321ee 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.PagamentoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java
index b99488a4..fc2c811d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class PagamentoLocalServiceClp implements PagamentoLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java
index dfcf4eb7..e858f983 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoLocalService
  * @see it.tref.liferay.portos.bo.service.base.PagamentoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java
index c191190b..7b60314c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link PagamentoLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java
index 7a3eddc5..e41e13d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.PagamentoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java
index f3ddef39..769770f2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class PagamentoServiceClp implements PagamentoService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java
index 05ceda17..e8c55de6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoService
  * @see it.tref.liferay.portos.bo.service.base.PagamentoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java
index fa270301..a901e60f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link PagamentoService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java
index 795f1072..f7bf65e6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java
index 051993f0..0d80a15f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java
index d44b8684..d937d120 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoLocalService
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java
index b1e7dcf8..44c81bd4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ParereGeologoLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java
index b0997fb2..b7cce35f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java
index c9d4e272..066a89d9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ParereGeologoServiceClp implements ParereGeologoService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java
index 44e390fd..042779e5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoService
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java
index 708e71ee..ad63e49f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ParereGeologoService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalService.java
index 6880fa47..70709d1a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaLocalServiceImpl
@@ -254,9 +254,6 @@ public interface ProvinciaLocalService extends BaseLocalService,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
 
-	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-	public java.util.List<it.tref.liferay.portos.bo.model.Provincia> getProvinceAttive();
-
 	public it.tref.liferay.portos.bo.model.Provincia addProvincia(long userId,
 		java.lang.String codiceProvincia, java.lang.String provincia,
 		java.lang.String regione, java.lang.String sigla,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceClp.java
index e867fd55..dcc625a7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
@@ -114,65 +114,61 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 
 		_methodParameterTypes17 = new String[] { "java.lang.String" };
 
-		_methodName19 = "getProvinceAttive";
+		_methodName19 = "addProvincia";
 
-		_methodParameterTypes19 = new String[] {  };
-
-		_methodName20 = "addProvincia";
-
-		_methodParameterTypes20 = new String[] {
+		_methodParameterTypes19 = new String[] {
 				"long", "java.lang.String", "java.lang.String",
 				"java.lang.String", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName21 = "findAll";
+		_methodName20 = "findAll";
 
-		_methodParameterTypes21 = new String[] {
+		_methodParameterTypes20 = new String[] {
 				"int", "int", "com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName22 = "countByCompanyId";
+		_methodName21 = "countByCompanyId";
+
+		_methodParameterTypes21 = new String[] { "long" };
 
-		_methodParameterTypes22 = new String[] { "long" };
+		_methodName22 = "countByKeywords";
 
-		_methodName23 = "countByKeywords";
+		_methodParameterTypes22 = new String[] { "long", "java.lang.String" };
+
+		_methodName23 = "fetchByC_C";
 
 		_methodParameterTypes23 = new String[] { "long", "java.lang.String" };
 
-		_methodName24 = "fetchByC_C";
+		_methodName24 = "fetchByC_S";
 
 		_methodParameterTypes24 = new String[] { "long", "java.lang.String" };
 
-		_methodName25 = "fetchByC_S";
+		_methodName25 = "findByCompanyId";
 
-		_methodParameterTypes25 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes25 = new String[] { "long", "int", "int" };
 
 		_methodName26 = "findByCompanyId";
 
-		_methodParameterTypes26 = new String[] { "long", "int", "int" };
-
-		_methodName27 = "findByCompanyId";
-
-		_methodParameterTypes27 = new String[] {
+		_methodParameterTypes26 = new String[] {
 				"long", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName28 = "findByC_C";
+		_methodName27 = "findByC_C";
 
-		_methodParameterTypes28 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes27 = new String[] { "long", "java.lang.String" };
 
-		_methodName29 = "findByKeywords";
+		_methodName28 = "findByKeywords";
 
-		_methodParameterTypes29 = new String[] {
+		_methodParameterTypes28 = new String[] {
 				"long", "java.lang.String", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName30 = "updateProvincia";
+		_methodName29 = "updateProvincia";
 
-		_methodParameterTypes30 = new String[] {
+		_methodParameterTypes29 = new String[] {
 				"long", "long", "java.lang.String", "java.lang.String",
 				"java.lang.String", "com.liferay.portal.service.ServiceContext"
 			};
@@ -728,29 +724,6 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public java.util.List<it.tref.liferay.portos.bo.model.Provincia> getProvinceAttive() {
-		Object returnObj = null;
-
-		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName19,
-					_methodParameterTypes19, new Object[] {  });
-		}
-		catch (Throwable t) {
-			t = ClpSerializer.translateThrowable(t);
-
-			if (t instanceof RuntimeException) {
-				throw (RuntimeException)t;
-			}
-			else {
-				throw new RuntimeException(t.getClass().getName() +
-					" is not a valid exception");
-			}
-		}
-
-		return (java.util.List<it.tref.liferay.portos.bo.model.Provincia>)ClpSerializer.translateOutput(returnObj);
-	}
-
 	@Override
 	public it.tref.liferay.portos.bo.model.Provincia addProvincia(long userId,
 		java.lang.String codiceProvincia, java.lang.String provincia,
@@ -761,8 +734,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName20,
-					_methodParameterTypes20,
+			returnObj = _invokableLocalService.invokeMethod(_methodName19,
+					_methodParameterTypes19,
 					new Object[] {
 						userId,
 						
@@ -808,8 +781,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName21,
-					_methodParameterTypes21,
+			returnObj = _invokableLocalService.invokeMethod(_methodName20,
+					_methodParameterTypes20,
 					new Object[] {
 						start,
 						
@@ -843,8 +816,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName22,
-					_methodParameterTypes22, new Object[] { companyId });
+			returnObj = _invokableLocalService.invokeMethod(_methodName21,
+					_methodParameterTypes21, new Object[] { companyId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -871,8 +844,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName23,
-					_methodParameterTypes23,
+			returnObj = _invokableLocalService.invokeMethod(_methodName22,
+					_methodParameterTypes22,
 					new Object[] {
 						companyId,
 						
@@ -905,8 +878,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName24,
-					_methodParameterTypes24,
+			returnObj = _invokableLocalService.invokeMethod(_methodName23,
+					_methodParameterTypes23,
 					new Object[] {
 						companyId,
 						
@@ -939,8 +912,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName25,
-					_methodParameterTypes25,
+			returnObj = _invokableLocalService.invokeMethod(_methodName24,
+					_methodParameterTypes24,
 					new Object[] { companyId, ClpSerializer.translateInput(
 							sigla) });
 		}
@@ -970,8 +943,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName26,
-					_methodParameterTypes26,
+			returnObj = _invokableLocalService.invokeMethod(_methodName25,
+					_methodParameterTypes25,
 					new Object[] { companyId, start, end });
 		}
 		catch (Throwable t) {
@@ -1001,8 +974,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName27,
-					_methodParameterTypes27,
+			returnObj = _invokableLocalService.invokeMethod(_methodName26,
+					_methodParameterTypes26,
 					new Object[] {
 						companyId,
 						
@@ -1040,8 +1013,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName28,
-					_methodParameterTypes28,
+			returnObj = _invokableLocalService.invokeMethod(_methodName27,
+					_methodParameterTypes27,
 					new Object[] {
 						companyId,
 						
@@ -1079,8 +1052,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName29,
-					_methodParameterTypes29,
+			returnObj = _invokableLocalService.invokeMethod(_methodName28,
+					_methodParameterTypes28,
 					new Object[] {
 						companyId,
 						
@@ -1122,8 +1095,8 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName30,
-					_methodParameterTypes30,
+			returnObj = _invokableLocalService.invokeMethod(_methodName29,
+					_methodParameterTypes29,
 					new Object[] {
 						userId,
 						
@@ -1220,6 +1193,4 @@ public class ProvinciaLocalServiceClp implements ProvinciaLocalService {
 	private String[] _methodParameterTypes28;
 	private String _methodName29;
 	private String[] _methodParameterTypes29;
-	private String _methodName30;
-	private String[] _methodParameterTypes30;
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceUtil.java
index d7fd2203..1ab308a9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaLocalService
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaLocalServiceImpl
@@ -275,10 +275,6 @@ public class ProvinciaLocalServiceUtil {
 		return getService().invokeMethod(name, parameterTypes, arguments);
 	}
 
-	public static java.util.List<it.tref.liferay.portos.bo.model.Provincia> getProvinceAttive() {
-		return getService().getProvinceAttive();
-	}
-
 	public static it.tref.liferay.portos.bo.model.Provincia addProvincia(
 		long userId, java.lang.String codiceProvincia,
 		java.lang.String provincia, java.lang.String regione,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceWrapper.java
index f8d32b79..c8016b5a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ProvinciaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaLocalService
  * @generated
  */
@@ -286,11 +286,6 @@ public class ProvinciaLocalServiceWrapper implements ProvinciaLocalService,
 			arguments);
 	}
 
-	@Override
-	public java.util.List<it.tref.liferay.portos.bo.model.Provincia> getProvinceAttive() {
-		return _provinciaLocalService.getProvinceAttive();
-	}
-
 	@Override
 	public it.tref.liferay.portos.bo.model.Provincia addProvincia(long userId,
 		java.lang.String codiceProvincia, java.lang.String provincia,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaService.java
index d8cbcb83..48a013e9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceClp.java
index 7c440e3e..185b07a3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ProvinciaServiceClp implements ProvinciaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceUtil.java
index e7f76cf2..e7780f4e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaService
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceWrapper.java
index 7871c772..1c3c273e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ProvinciaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link ProvinciaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java
index 97b9132a..1a2904ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java
index 7a49dbca..6a0dfed4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SoggettoLocalServiceClp implements SoggettoLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java
index 764ef2a1..d718e39b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoLocalService
  * @see it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java
index 194f2d87..dd842e1e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link SoggettoLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoService.java
index 2930b6f1..6f3d478f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.SoggettoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceClp.java
index 1090170a..53193e3c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SoggettoServiceClp implements SoggettoService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceUtil.java
index 4fce8ad1..b3107349 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoService
  * @see it.tref.liferay.portos.bo.service.base.SoggettoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceWrapper.java
index c1daa87b..4d259e21 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link SoggettoService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java
index 4776b552..5b0e07d7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.SorteggioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java
index d76319f9..a642d8cb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SorteggioLocalServiceClp implements SorteggioLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java
index 5f064551..8865d4ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioLocalService
  * @see it.tref.liferay.portos.bo.service.base.SorteggioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java
index 9af4c63e..9f3d9fec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link SorteggioLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioService.java
index ff9e8e85..ceeec9f2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceClp.java
index 71855f38..d8ce4c4c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SorteggioServiceClp implements SorteggioService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceUtil.java
index a89cbd2a..5dc3ac51 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioService
  * @see it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceWrapper.java
index 56180177..9417fd7d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link SorteggioService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java
index 561a07a6..e13cbb4f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java
index edb5f1ca..d51e8a50 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class StoricoSoggettoPraticaLocalServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java
index 37b697ea..2acb5180 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java
index 117e9690..404f5c0b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link StoricoSoggettoPraticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaService.java
index c055d5b2..171a85ec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceClp.java
index 1fda4100..fb44eb1d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class StoricoSoggettoPraticaServiceClp
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceUtil.java
index b42dd3b8..ac0e4ff6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaService
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceWrapper.java
index 298e6edb..19f6dc91 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link StoricoSoggettoPraticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java
index 44982c8f..aff3a010 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.TempisticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java
index 9d263804..9a0fe1e3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TempisticaLocalServiceClp implements TempisticaLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java
index 480ad344..c59c72d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaLocalService
  * @see it.tref.liferay.portos.bo.service.base.TempisticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java
index 070cdd54..e263896b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link TempisticaLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaService.java
index 46bb89e8..1f9b929a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaService.java
@@ -28,7 +28,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.TempisticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceClp.java
index b90d546a..2b301889 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TempisticaServiceClp implements TempisticaService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceUtil.java
index 6798233b..58da523e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaService
  * @see it.tref.liferay.portos.bo.service.base.TempisticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceWrapper.java
index c669e3dd..1d04da25 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link TempisticaService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalService.java
index db523f18..7aa55b2d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalService.java
@@ -30,7 +30,7 @@ import com.liferay.portal.service.PersistedModelLocalService;
  * credentials because this service can only be accessed from within the same
  * VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioLocalServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.TerritorioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceClp.java
index 8a6342ca..a41b0efc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableLocalService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TerritorioLocalServiceClp implements TerritorioLocalService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceUtil.java
index d56ace4e..e246467c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableLocalService;
  * based on the propagated JAAS credentials because this service can only be
  * accessed from within the same VM.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioLocalService
  * @see it.tref.liferay.portos.bo.service.base.TerritorioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioLocalServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceWrapper.java
index bed3d543..b81568a6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioLocalServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link TerritorioLocalService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioLocalService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioService.java
index d1c72438..b0b8b829 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioService.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioService.java
@@ -29,7 +29,7 @@ import com.liferay.portal.service.InvokableService;
  * service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioServiceUtil
  * @see it.tref.liferay.portos.bo.service.base.TerritorioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceClp.java
index 01c764af..0cfac32a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceClp.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceClp.java
@@ -17,7 +17,7 @@ package it.tref.liferay.portos.bo.service;
 import com.liferay.portal.service.InvokableService;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TerritorioServiceClp implements TerritorioService {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceUtil.java
index 17441ca9..5758a9b3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceUtil.java
@@ -26,7 +26,7 @@ import com.liferay.portal.service.InvokableService;
  * checks based on the propagated JAAS credentials because this service can be
  * accessed remotely.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioService
  * @see it.tref.liferay.portos.bo.service.base.TerritorioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioServiceImpl
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceWrapper.java
index d2a51aae..9248d90e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceWrapper.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TerritorioServiceWrapper.java
@@ -19,7 +19,7 @@ import com.liferay.portal.service.ServiceWrapper;
 /**
  * Provides a wrapper for {@link TerritorioService}.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioService
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/messaging/ClpMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/messaging/ClpMessageListener.java
index 65739de3..6e8c3056 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/messaging/ClpMessageListener.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/messaging/ClpMessageListener.java
@@ -66,7 +66,7 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class ClpMessageListener extends BaseMessageListener {
 	public static String getServletContextName() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeActionableDynamicQuery.java
index ac420f99..1848ad4c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.AllegatoManuale;
 import it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class AllegatoManualeActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeExportActionableDynamicQuery.java
index bba3f0e2..db3fe23f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AllegatoManualeExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistence.java
index 12458166..9dacf727 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.AllegatoManuale;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualePersistenceImpl
  * @see AllegatoManualeUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeUtil.java
index 4bab2be4..a7c5fc5a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AllegatoManualeUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualePersistence
  * @see AllegatoManualePersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneActionableDynamicQuery.java
index 86cb488e..4d95c8d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class AsseverazioneActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneExportActionableDynamicQuery.java
index c6cceebc..e23d6581 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AsseverazioneExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistence.java
index f314d8a3..44432a27 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Asseverazione;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazionePersistenceImpl
  * @see AsseverazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneUtil.java
index eb15a88d..10a89c53 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AsseverazioneUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazionePersistence
  * @see AsseverazionePersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoActionableDynamicQuery.java
index 2c2ce4ac..9b4e8f12 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class AvvisoActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoExportActionableDynamicQuery.java
index f2705ae2..d4fffc55 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Avviso;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AvvisoExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistence.java
index 4b7b9f54..718a8bd0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Avviso;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoPersistenceImpl
  * @see AvvisoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoUtil.java
index 995af733..a6062954 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/AvvisoUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoPersistence
  * @see AvvisoPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoActionableDynamicQuery.java
index 1695e820..e37bc086 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class CollaudoActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoExportActionableDynamicQuery.java
index e2ec2bd2..e85eb6f7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Collaudo;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class CollaudoExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java
index b38fdeff..2d739364 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Collaudo;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoPersistenceImpl
  * @see CollaudoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java
index 12303223..1f0d3d34 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoPersistence
  * @see CollaudoPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneActionableDynamicQuery.java
index 8c55f005..9f187033 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ComuneActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneExportActionableDynamicQuery.java
index b5d66341..f6c517ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Comune;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComuneExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunePersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunePersistence.java
index 8cd1c336..6900cb6e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunePersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunePersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Comune;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunePersistenceImpl
  * @see ComuneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneUtil.java
index e9c3e674..cce198f1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComuneUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunePersistence
  * @see ComunePersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneActionableDynamicQuery.java
index 4b4e42d6..18a3e598 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Comunicazione;
 import it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ComunicazioneActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneExportActionableDynamicQuery.java
index 9dc09b86..b3921a3a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Comunicazione;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComunicazioneExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistence.java
index 1293aa76..3a0e27ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Comunicazione;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazionePersistenceImpl
  * @see ComunicazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneUtil.java
index cff19f15..5f332aa9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ComunicazioneUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazionePersistence
  * @see ComunicazionePersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneActionableDynamicQuery.java
index 5e0e5b14..1efbc642 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Configurazione;
 import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ConfigurazioneActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneExportActionableDynamicQuery.java
index 0f23721d..a6134c20 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Configurazione;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ConfigurazioneExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistence.java
index dd5e4438..9f7d41fb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Configurazione;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazionePersistenceImpl
  * @see ConfigurazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneUtil.java
index d1a6c652..5e2df28c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ConfigurazioneUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazionePersistence
  * @see ConfigurazionePersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaActionableDynamicQuery.java
index 1a922de7..efb13381 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ControlloPraticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaExportActionableDynamicQuery.java
index 20ba8e1f..846b0caa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaExportActionableDynamicQuery.java
@@ -35,7 +35,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ControlloPraticaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistence.java
index dc15b9f3..27ebb1c4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.ControlloPratica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaPersistenceImpl
  * @see ControlloPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaUtil.java
index 17559645..467f874f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaPersistence
  * @see ControlloPraticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaActionableDynamicQuery.java
index d573a08f..ced9a7bd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Delega;
 import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class DelegaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaExportActionableDynamicQuery.java
index 5a7c26b9..fa86f4dd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Delega;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DelegaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaPersistence.java
index efe662aa..155fd713 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Delega;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaPersistenceImpl
  * @see DelegaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaUtil.java
index 75e858dd..41923fd7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DelegaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaPersistence
  * @see DelegaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaActionableDynamicQuery.java
index b6b53221..5fe2495b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class DettPraticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaExportActionableDynamicQuery.java
index 362f7fba..6d867a54 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaExportActionableDynamicQuery.java
@@ -35,7 +35,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.DettPratica;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DettPraticaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java
index e7c32a55..56816070 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.DettPratica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaPersistenceImpl
  * @see DettPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java
index 6fcc52c6..4a46fd04 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaPersistence
  * @see DettPraticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaActionableDynamicQuery.java
index 2f53bbd8..e279325b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.DocAggiuntiva;
 import it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class DocAggiuntivaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaExportActionableDynamicQuery.java
index ae78d8ae..e84a6e54 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.DocAggiuntiva;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocAggiuntivaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistence.java
index 3a0d6b34..3216b2d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.DocAggiuntiva;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaPersistenceImpl
  * @see DocAggiuntivaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaUtil.java
index 6773fd6d..2d18e081 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaPersistence
  * @see DocAggiuntivaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaActionableDynamicQuery.java
index afdbe1f9..9a7229ec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class DocPraticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaExportActionableDynamicQuery.java
index 6430b56c..9c1461f3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.DocPratica;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocPraticaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinder.java
deleted file mode 100644
index 08486eda..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinder.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package it.tref.liferay.portos.bo.service.persistence;
-
-/**
- * @author Davide Barbagallo, 3F Consulting
- */
-public interface DocPraticaFinder {
-}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinderUtil.java
deleted file mode 100644
index a5435e99..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaFinderUtil.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package it.tref.liferay.portos.bo.service.persistence;
-
-import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
-import com.liferay.portal.kernel.util.ReferenceRegistry;
-
-/**
- * @author Davide Barbagallo, 3F Consulting
- */
-public class DocPraticaFinderUtil {
-	public static DocPraticaFinder getFinder() {
-		if (_finder == null) {
-			_finder = (DocPraticaFinder)PortletBeanLocatorUtil.locate(it.tref.liferay.portos.bo.service.ClpSerializer.getServletContextName(),
-					DocPraticaFinder.class.getName());
-
-			ReferenceRegistry.registerReference(DocPraticaFinderUtil.class,
-				"_finder");
-		}
-
-		return _finder;
-	}
-
-	public void setFinder(DocPraticaFinder finder) {
-		_finder = finder;
-
-		ReferenceRegistry.registerReference(DocPraticaFinderUtil.class,
-			"_finder");
-	}
-
-	private static DocPraticaFinder _finder;
-}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java
index 46c7ddab..594b34d4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.DocPratica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaPersistenceImpl
  * @see DocPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java
index d33bd3b5..fa6989ab 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaPersistence
  * @see DocPraticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriActionableDynamicQuery.java
index 66fca428..61b53f3f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.FineLavori;
 import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class FineLavoriActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriExportActionableDynamicQuery.java
index 1c66b226..4510fa29 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.FineLavori;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class FineLavoriExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java
index 0a8cffd9..6301e647 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.FineLavori;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriPersistenceImpl
  * @see FineLavoriUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java
index 5d4dffb1..e8d928c6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriPersistence
  * @see FineLavoriPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionActionableDynamicQuery.java
index 160a21ff..4430ee45 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
 import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class HistoryWorkflowActionActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistence.java
index 388613a4..bd32f390 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionPersistenceImpl
  * @see HistoryWorkflowActionUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionUtil.java
index defb8252..52669c15 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionPersistence
  * @see HistoryWorkflowActionPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaActionableDynamicQuery.java
index e0e5968e..63b6680f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class IntPraticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaExportActionableDynamicQuery.java
index a81b774c..1ce8f516 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.IntPratica;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class IntPraticaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java
index fbe6737b..a0176553 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java
@@ -15,7 +15,7 @@
 package it.tref.liferay.portos.bo.service.persistence;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public interface IntPraticaFinder {
 	public int countAutorizzazione(java.util.Date dtMin, java.util.Date dtMax,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java
index 5ad265e7..7dfec71a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java
@@ -18,7 +18,7 @@ import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
 import com.liferay.portal.kernel.util.ReferenceRegistry;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class IntPraticaFinderUtil {
 	public static int countAutorizzazione(java.util.Date dtMin,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java
index f17aae3c..115423ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.IntPratica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaPersistenceImpl
  * @see IntPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java
index ec707959..58e7fd8c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaPersistence
  * @see IntPraticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoActionableDynamicQuery.java
index 10560eba..9532a4ab 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Pagamento;
 import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class PagamentoActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoExportActionableDynamicQuery.java
index e8b332da..3be02ba8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Pagamento;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class PagamentoExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistence.java
index e1428afa..842f2d43 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Pagamento;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoPersistenceImpl
  * @see PagamentoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoUtil.java
index f487d486..21b19cd1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/PagamentoUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoPersistence
  * @see PagamentoPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoActionableDynamicQuery.java
index aa12c68d..d0fda49b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.ParereGeologo;
 import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ParereGeologoActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoExportActionableDynamicQuery.java
index 2e836e24..c9daa652 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.ParereGeologo;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ParereGeologoExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistence.java
index 7f1758c8..1befad86 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.ParereGeologo;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoPersistenceImpl
  * @see ParereGeologoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoUtil.java
index bc0ee37e..db1c7322 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ParereGeologoUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoPersistence
  * @see ParereGeologoPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaActionableDynamicQuery.java
index 8e3d02eb..1768f41b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class ProvinciaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistence.java
index 95972ca8..f86c4b59 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Provincia;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaPersistenceImpl
  * @see ProvinciaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaUtil.java
index f0a30a69..f1a0afca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/ProvinciaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaPersistence
  * @see ProvinciaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoActionableDynamicQuery.java
index 7b6d71cd..ac6f7fca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class SoggettoActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoExportActionableDynamicQuery.java
index 67d402bd..354870dd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Soggetto;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SoggettoExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistence.java
index 993f2093..595c86ea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Soggetto;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoPersistenceImpl
  * @see SoggettoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoUtil.java
index 1a5d7613..4cd92b3c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SoggettoUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoPersistence
  * @see SoggettoPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioActionableDynamicQuery.java
index 0dc42bfb..434226df 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Sorteggio;
 import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class SorteggioActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioExportActionableDynamicQuery.java
index 3bd16335..30f62214 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioExportActionableDynamicQuery.java
@@ -35,7 +35,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Sorteggio;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SorteggioExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinder.java
index 5cd7d3fb..5bec54a1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinder.java
@@ -15,7 +15,7 @@
 package it.tref.liferay.portos.bo.service.persistence;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public interface SorteggioFinder {
 	public int countSorteggioMese(java.util.Date dtMin, java.util.Date dtMax,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinderUtil.java
index 93eb824f..532d949b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinderUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioFinderUtil.java
@@ -18,7 +18,7 @@ import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
 import com.liferay.portal.kernel.util.ReferenceRegistry;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class SorteggioFinderUtil {
 	public static int countSorteggioMese(java.util.Date dtMin,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java
index 622b24de..9189e217 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Sorteggio;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioPersistenceImpl
  * @see SorteggioUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java
index 5f78851f..3f855178 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioPersistence
  * @see SorteggioPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaActionableDynamicQuery.java
index 762b001e..67678c96 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
 import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class StoricoSoggettoPraticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java
index 98860d7a..ac19390a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaPersistenceImpl
  * @see StoricoSoggettoPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java
index a2aa7b02..3adb81d5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaPersistence
  * @see StoricoSoggettoPraticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaActionableDynamicQuery.java
index dde6d41d..cdec9d6b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Tempistica;
 import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class TempisticaActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaExportActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaExportActionableDynamicQuery.java
index 812bb336..634135c7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaExportActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaExportActionableDynamicQuery.java
@@ -27,7 +27,7 @@ import com.liferay.portal.util.PortalUtil;
 import it.tref.liferay.portos.bo.model.Tempistica;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TempisticaExportActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinder.java
index 23a3ea76..36115862 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinder.java
@@ -15,7 +15,7 @@
 package it.tref.liferay.portos.bo.service.persistence;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public interface TempisticaFinder {
 	public int countScadenzePraticheInScadenza(long companyId, long groupId);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderUtil.java
index a081cbd8..eb203598 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderUtil.java
@@ -18,7 +18,7 @@ import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
 import com.liferay.portal.kernel.util.ReferenceRegistry;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 public class TempisticaFinderUtil {
 	public static int countScadenzePraticheInScadenza(long companyId,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java
index 094932ee..eaf622ae 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Tempistica;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaPersistenceImpl
  * @see TempisticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java
index cb7c04ba..44966154 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaPersistence
  * @see TempisticaPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioActionableDynamicQuery.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioActionableDynamicQuery.java
index bd867af1..71bde51d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioActionableDynamicQuery.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioActionableDynamicQuery.java
@@ -21,7 +21,7 @@ import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public abstract class TerritorioActionableDynamicQuery
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistence.java
index 85a09179..c08aa151 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistence.java
@@ -25,7 +25,7 @@ import it.tref.liferay.portos.bo.model.Territorio;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioPersistenceImpl
  * @see TerritorioUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioUtil.java
index beaee0a5..3a8213e8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TerritorioUtil.java
@@ -32,7 +32,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioPersistence
  * @see TerritorioPersistenceImpl
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java
index a79e181e..4127022d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java
@@ -13,7 +13,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
-import it.tref.liferay.portos.bo.shared.util.GenericUtils;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
 
@@ -21,9 +20,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang.ArrayUtils;
 
@@ -110,7 +111,7 @@ public class AsseverazioniUtil {
 	public static final String ASSEVERAZIONI_INTEGRAZIONE = "asseverazioni_integrazione";
 
 	@SuppressWarnings("serial")
-	private static final Map<String, List<String>> required = new HashMap<String, List<String>>() {
+	private static final Map<String, List<String>> required = new HashMap<String, List<String>>(15) {
 		{
 			put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A02,
 					Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI));
@@ -148,7 +149,7 @@ public class AsseverazioniUtil {
 	};
 
 	@SuppressWarnings("serial")
-	private static final Map<String, List<String>> recommended = new HashMap<String, List<String>>() {
+	private static final Map<String, List<String>> recommended = new HashMap<String, List<String>>(3) {
 		{
 			put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A04, Arrays.asList(TipoSoggettoUtil.DITTA));
 			put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A10, Arrays.asList(TipoSoggettoUtil.DITTA));
@@ -156,16 +157,9 @@ public class AsseverazioniUtil {
 		}
 	};
 
-	@SuppressWarnings("serial")
-	private static final List<String> oneIsEnough = new ArrayList<String>() {
-		{
-			add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A11);
-			add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A12);
-			add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17);
-			add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ALTRI);
-			add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA);
-		}
-	};
+	private static final List<String> oneIsEnough = Arrays.asList(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A11,
+			DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A12, DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17,
+			DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ALTRI, DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA);
 
 	public static boolean isAsseverazioneDomandaRequiredByTipoSoggetto(long dettPraticaId, String tipoSoggetto)
 			throws PortalException, SystemException {
@@ -175,17 +169,16 @@ public class AsseverazioniUtil {
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 		if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
 				|| TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
-			List<Soggetto> nuoviSoggetti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(
-					dettPraticaId, tipoSoggetto);
+			Set<Soggetto> nuoviSoggetti = new HashSet<>(
+					SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, tipoSoggetto));
 			List<String> cfNuoviSoggetti = SoggettoLocalServiceUtil.getCfValidTmpByDettPratica_TipologiaSoggetto(
 					dettPraticaId, tipoSoggetto);
 			List<String> nuoviDelegati = DelegaLocalServiceUtil.findCfByDettPratica_Tipologia_InEsito(dettPraticaId,
 					new String[] { tipoSoggetto }, new String[] { AsseverazioniUtil.STATO_ESEGUITA });
 			nuoviDelegati.removeAll(cfNuoviSoggetti);
 			for (String cfDelegato : nuoviDelegati) {
-				List<Soggetto> delegato = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(
-						dettPratica.getIntPraticaId(), cfDelegato, 0L);
-				GenericUtils.addAllIfnotExist(nuoviSoggetti, delegato);
+				nuoviSoggetti.addAll(SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(
+						dettPratica.getIntPraticaId(), cfDelegato, 0L));
 			}
 			if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
 				if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) {
@@ -197,17 +190,16 @@ public class AsseverazioniUtil {
 								titolaredigitaleUser.getScreenName(), tipoSoggetto, 0L);
 				if (Validator.isNotNull(titolareDigitale)
 						&& tipoSoggetto.equalsIgnoreCase(titolareDigitale.getTipologiaSoggetto())) {
-					GenericUtils.addIfnotExist(nuoviSoggetti, titolareDigitale);
+					nuoviSoggetti.add(titolareDigitale);
 				}
 			} else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
 				if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) {
 					return !ValidazionePraticaUtil.isA98Required(dettPratica);
 				} else if (!TipoSoggettoUtil.GEOLOGO.equalsIgnoreCase(tipoSoggetto)
 						&& !TipoSoggettoUtil.COLLAUDATORE.equalsIgnoreCase(tipoSoggetto)) {
-					List<Soggetto> soggettiPrincipali = SoggettoLocalServiceUtil
+					nuoviSoggetti.addAll(SoggettoLocalServiceUtil
 							.getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId,
-									new String[] { tipoSoggetto });
-					GenericUtils.addAllIfnotExist(nuoviSoggetti, soggettiPrincipali);
+									new String[] { tipoSoggetto }));
 				}
 			}
 			return nuoviSoggetti.size() > 0;
@@ -253,6 +245,7 @@ public class AsseverazioniUtil {
 	}
 
 	public static boolean isAsseverazioneRequiredByCodiceDoc(String codiceDoc, String tipoSoggetto) {
+
 		if (required.containsKey(codiceDoc)) {
 			return required.get(codiceDoc).contains(tipoSoggetto);
 		}
@@ -296,9 +289,9 @@ public class AsseverazioniUtil {
 							TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO,
 							TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA },
 							new String[] { AsseverazioniUtil.STATO_ESEGUITA }));
-			List<String> cfAsseverazioni = new ArrayList<>();
+			Set<String> cfAsseverazioni = new HashSet<>();
 			for (Asseverazione asseverazione : asseverazioniEseguite) {
-				GenericUtils.addIfnotExist(cfAsseverazioni, asseverazione.getCodiceFiscale());
+				cfAsseverazioni.add(asseverazione.getCodiceFiscale());
 			}
 			if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
 				boolean titolareDigitale = false;
@@ -374,10 +367,6 @@ public class AsseverazioniUtil {
 							.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipoSoggetto,
 									new String[] { AsseverazioniUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS,
 									QueryUtil.ALL_POS, null);
-					List<String> cfAsseverazioni = new ArrayList<>();
-					for (Asseverazione asseverazione : asseverazioniEseguite) {
-						GenericUtils.addIfnotExist(cfAsseverazioni, asseverazione.getCodiceFiscale());
-					}
 					if (asseverazioniEseguite.size() == 0) {
 						return false;
 					}
@@ -413,7 +402,7 @@ public class AsseverazioniUtil {
 	}
 
 	@SuppressWarnings("serial")
-	public static final Map<String, String> iconMapper = new HashMap<String, String>() {
+	public static final Map<String, String> iconMapper = new HashMap<String, String>(6) {
 		{
 			put(COMMITTENTE, "fa-bullseye");
 			put(DIRETTORE_LAVORI, "fa-bullhorn");
@@ -438,59 +427,60 @@ public class AsseverazioniUtil {
 		Soggetto soggetto = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(
 				asseverazione.getIntPraticaId(), codiceFiscale, asseverazione.getTipologia(), 0L);
 		switch (tipoAsseverazione) {
-		case COLLAUDATORE:
-			params = new Object[] { soggetto.getDescrizioneCompleta(),
-					("albo-altro".equalsIgnoreCase(soggetto.getAlbo()) ? soggetto.getAlboDescr() : soggetto.getAlbo()),
-					soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo() };
-			break;
-		case COMMITTENTE:
-			params = new Object[] { soggetto.getDescrizioneCompleta() };
-			break;
-		case DIRETTORE_LAVORI:
-			params = new Object[] {
-					soggetto.getDescrizioneCompleta(),
-					(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) ? "Principale"
-							: StringPool.BLANK)
-							+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
-									.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
-									.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN,
-									"label-ambito-" + soggetto.getAmbitoProfessione()))), soggetto.getAlbo(),
-					soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo() };
-
-			break;
-		case DITTA:
-			params = new Object[] {
-					soggetto.getCodiceFiscale().toUpperCase() + " - " + soggetto.getLegaleRap(),
-					soggetto.getDenominazione()
-							+ StringPool.SPACE
-							+ (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
-									dettPratica.getDettPraticaId()) ? "Principale" : StringPool.BLANK)
-							+ StringPool.SPACE
-							+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
-									.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
-									.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN,
-									"label-ambito-" + soggetto.getAmbitoProfessione()))) };
-			break;
-		case GEOLOGO:
-			params = new String[] { soggetto.getDescrizioneCompleta() };
-			break;
-		case PROGETTISTA:
-			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-			params = new Object[] {
-					soggetto.getDescrizioneCompleta(),
-					(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) ? "Principale"
-							: StringPool.BLANK)
-							+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
-									.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
-									.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN,
-									"label-ambito-" + soggetto.getAmbitoProfessione()))), soggetto.getAlbo(),
-					soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo(),
-					dettPratica.getTcNuovaCostruzione() ? "X" : StringPool.SPACE,
-					dettPratica.getTcAdeguamentoSismico() ? "X" : StringPool.SPACE,
-					dettPratica.getTcMiglioramentoSismico() ? "X" : StringPool.SPACE,
-					dettPratica.getTcRiparazioneInterventoLocale() ? "X" : StringPool.SPACE, territorio.getZona(),
-					territorio.getFascia() };
-			break;
+			case COLLAUDATORE:
+				params = new Object[] {
+						soggetto.getDescrizioneCompleta(),
+						("albo-altro".equalsIgnoreCase(soggetto.getAlbo()) ? soggetto.getAlboDescr() : soggetto
+								.getAlbo()), soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo() };
+				break;
+			case COMMITTENTE:
+				params = new Object[] { soggetto.getDescrizioneCompleta() };
+				break;
+			case DIRETTORE_LAVORI:
+				params = new Object[] {
+						soggetto.getDescrizioneCompleta(),
+						(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) ? "Principale"
+								: StringPool.BLANK)
+								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
+										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
+										.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-"
+										+ soggetto.getAmbitoProfessione()))), soggetto.getAlbo(),
+						soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo() };
+
+				break;
+			case DITTA:
+				params = new Object[] {
+						soggetto.getCodiceFiscale().toUpperCase() + " - " + soggetto.getLegaleRap(),
+						soggetto.getDenominazione()
+								+ StringPool.SPACE
+								+ (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+										dettPratica.getDettPraticaId()) ? "Principale" : StringPool.BLANK)
+								+ StringPool.SPACE
+								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
+										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
+										.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-"
+										+ soggetto.getAmbitoProfessione()))) };
+				break;
+			case GEOLOGO:
+				params = new String[] { soggetto.getDescrizioneCompleta() };
+				break;
+			case PROGETTISTA:
+				Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+				params = new Object[] {
+						soggetto.getDescrizioneCompleta(),
+						(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) ? "Principale"
+								: StringPool.BLANK)
+								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
+										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
+										.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-"
+										+ soggetto.getAmbitoProfessione()))), soggetto.getAlbo(),
+						soggetto.getProvinciaAlbo(), soggetto.getNumIscrAlbo(),
+						dettPratica.getTcNuovaCostruzione() ? "X" : StringPool.SPACE,
+						dettPratica.getTcAdeguamentoSismico() ? "X" : StringPool.SPACE,
+						dettPratica.getTcMiglioramentoSismico() ? "X" : StringPool.SPACE,
+						dettPratica.getTcRiparazioneInterventoLocale() ? "X" : StringPool.SPACE, territorio.getZona(),
+						territorio.getFascia() };
+				break;
 		}
 		result = LanguageUtil.format(LocaleUtil.ITALIAN, "confirm-asseverazione-" + tipoAsseverazione, params)
 				+ LanguageUtil.get(LocaleUtil.ITALIAN, "confirm-asseverazione-bottom");
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java
index 53137a7a..a04801fb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java
@@ -27,7 +27,7 @@ public class AvvisoUtil {
 	public final static String TIPO_AVVISO_FIRMA = "S";
 
 	@SuppressWarnings("serial")
-	private final static Map<String, String> allTipoAvviso = new LinkedHashMap<String, String>() {
+	private final static Map<String, String> allTipoAvviso = new LinkedHashMap<String, String>(2) {
 		{
 			put(TIPO_AVVISO_DIRETTO, "label.admingeniocivile.avviso.tipoAvviso.diretto");
 			put(TIPO_AVVISO_FIRMA, "label.admingeniocivile.avviso.tipoAvviso.firma");
@@ -35,7 +35,7 @@ public class AvvisoUtil {
 	};
 
 	@SuppressWarnings("serial")
-	private final static Map<String, String> allTipoDocumento = new LinkedHashMap<String, String>() {
+	private final static Map<String, String> allTipoDocumento = new LinkedHashMap<String, String>(14) {
 		{
 			put(StatoPraticaConstants.CONFORME, "label.admingeniocivile.avviso.tipoDocumento.conforme");
 			put(StatoPraticaConstants.NON_CONFORME, "label.admingeniocivile.avviso.tipoDocumento.nonconforme");
@@ -57,7 +57,7 @@ public class AvvisoUtil {
 	};
 
 	@SuppressWarnings("serial")
-	private final static Map<String, String> allTipoDocumentoFolderTemplateProps = new LinkedHashMap<String, String>() {
+	private final static Map<String, String> allTipoDocumentoFolderTemplateProps = new LinkedHashMap<String, String>(17) {
 		{
 			put(StatoPraticaConstants.VIDIMATA, "conf.geniocivile.avviso.folder.id.vidimata");
 			put(StatoPraticaConstants.CONFORME, "conf.geniocivile.avviso.folder.id.conforme");
@@ -80,7 +80,7 @@ public class AvvisoUtil {
 	};
 
 	@SuppressWarnings("serial")
-	private final static Map<String, String> allTipoDocumentoFileTemplateProps = new LinkedHashMap<String, String>() {
+	private final static Map<String, String> allTipoDocumentoFileTemplateProps = new LinkedHashMap<String, String>(27) {
 		{
 			put(StatoPraticaConstants.VIDIMATA, "conf.geniocivile.avviso.template.id.vidimata");
 			put(StatoPraticaConstants.VARIAZIONE_SOGGETTI, "conf.geniocivile.avviso.template.id.variazionesoggetti");
@@ -162,7 +162,8 @@ public class AvvisoUtil {
 					tipoReport = TIPO_REPORT_CONTROLLO_OBBLIGATORIO;
 				}
 			}
-		} catch (SystemException | PortalException e) {
+		}
+		catch (SystemException | PortalException e) {
 			_log.warn(e, e);
 		}
 		return tipoReport;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java
index 916cce6a..62b9d32c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java
@@ -16,11 +16,8 @@ import java.util.Map;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.ListUtil;
 import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.UniqueList;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
 
 public class AzioniPraticheUtil {
@@ -48,26 +45,13 @@ public class AzioniPraticheUtil {
 	public static final String STATE_FINE_LAVORI_PARZIALE = "FINE_LAVORI_PARZIALE";
 	public static final String STATE_FINE_LAVORI_TOTALE = "FINE_LAVORI_TOTALE";
 	public static final String STATE_COLLAUDO_PARZIALE = "COLLAUDO_PARZIALE";
-	
-	private static final Log _log = LogFactoryUtil.getLog(AzioniPraticheUtil.class);
 
-	@SuppressWarnings("serial")
-	public static List<String> ALL_ACTIONS = new UniqueList<String>() {
-		{
-			add(ACTION_AGGIUNGI_SOGGETTO);
-			add(ACTION_RIMUOVI_SOGGETTO);
-			add(ACTION_VARIAZIONE_SOGGETTI);
-			add(ACTION_VARIANTE);
-			add(ACTION_FL_PARZIALE);
-			add(ACTION_FL_TOTALE);
-			add(ACTION_ANNULLA);
-			add(ACTION_CO_PARZIALE);
-			add(ACTION_CO_TOTALE);
-		}
-	};
+	private static final List<String> ALL_ACTIONS = Arrays.asList(ACTION_AGGIUNGI_SOGGETTO, ACTION_RIMUOVI_SOGGETTO,
+			ACTION_VARIAZIONE_SOGGETTI, ACTION_VARIANTE, ACTION_FL_PARZIALE, ACTION_FL_TOTALE, ACTION_ANNULLA,
+			ACTION_CO_PARZIALE, ACTION_CO_TOTALE);
 
 	@SuppressWarnings("serial")
-	public static Map<String, List<String>> STATE_ACTIONS_MAP = new HashMap<String, List<String>>() {
+	public static final Map<String, List<String>> STATE_ACTIONS_MAP = new HashMap<String, List<String>>(12) {
 		{
 			put(STATE_VIDIMATO, ALL_ACTIONS);
 			put(STATE_SOTTOPOSTO_A_PARERE_AUTORIZZAZIONE,
@@ -143,13 +127,12 @@ public class AzioniPraticheUtil {
 		} else if (StatoPraticaConstants.COLLAUDO_PARZIALE.equalsIgnoreCase(intPratica.getStatoPratica())) {
 			status = STATE_COLLAUDO_PARZIALE;
 		}
-		
 
 		List<String> actionList = STATE_ACTIONS_MAP.get(status);
 		if (actionList == null) {
 			actionList = new ArrayList<>();
 		}
-		
+
 		if (!actionList.contains(action)) {
 			return false;
 		}
@@ -183,6 +166,7 @@ public class AzioniPraticheUtil {
 	}
 
 	public static boolean canPrintFascicolo(long intPraticaId) throws PortalException, SystemException {
+
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 		return (!intPratica.getStatoPratica().isEmpty() || intPratica.isValidata())
 				&& !intPratica.getNumeroProgetto().isEmpty();
@@ -198,7 +182,7 @@ public class AzioniPraticheUtil {
 			SystemException {
 
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-				
+
 		if (!isAllowedAction(intPraticaId, ACTION_AGGIUNGI_SOGGETTO)) {
 			return false;
 		}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java
index ae13a988..be5c0a77 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java
@@ -378,7 +378,7 @@ public class DelegheUtil {
 	}
 
 	@SuppressWarnings("serial")
-	public static final Map<String, String> iconMapper = new HashMap<String, String>() {
+	public static final Map<String, String> iconMapper = new HashMap<String, String>(8) {
 		{
 			put(TIPO_TOTALE, "fa-bullseye");
 			put(TIPO_COMPILAZIONE, "fa-pencil");
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java
index 39cb78a8..201cfbc6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java
@@ -64,7 +64,7 @@ public class MailUtil {
 			for (Soggetto titolare : titolari) {
 				titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN,
 						"gc-soggetto-" + titolare.getTipologiaSoggetto())
-						+ " ";
+						+ StringPool.SPACE;
 			}
 		}
 		String committenteTitle = StringPool.BLANK;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java
index b921c2e7..934d5d56 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java
@@ -33,8 +33,8 @@ public abstract class PagamentiCommonUtil {
 
 	private static Log _log = LogFactoryUtil.getLog(PagamentiCommonUtil.class);
 
-	private static final Map<String, Integer> numeroBolliIntegrazioneMap = new HashMap<String, Integer>()
-	{
+	@SuppressWarnings("serial")
+	private static final Map<String, Integer> numeroBolliIntegrazioneMap = new HashMap<String, Integer>(7) {
 		{
 			put(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, 0);
 			put(TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE, 2);
@@ -94,8 +94,7 @@ public abstract class PagamentiCommonUtil {
 			if (normEsenteBollo) {
 				return new BigDecimal("0.00");
 			}
-		} catch (PortalException e) {
-		}
+		} catch (PortalException e) {}
 		int numeroBolli = getNumeroBolli(tipoIntegrazione);
 		BigDecimal importoBolliBigDecimal = new BigDecimal(ConfigurazioneLocalServiceUtil.findByC_ChiaveString(
 				companyId, ConfigurazioneConstants.IMPORTO_BOLLO));
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java
index 3305c955..49e8e929 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java
@@ -1,134 +1,72 @@
 /*
- * Manifattura Web Group per Regione Siciliana
- *
- * Spostato all'interno del servizio per essere accessibile alle classi *AdvancedSearch
+ * Manifattura Web Group per Regione Siciliana Spostato all'interno del servizio per essere accessibile alle classi
+ * *AdvancedSearch
  */
 package it.tref.liferay.portos.bo.util;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class PortosIndexField implements Serializable {
 
-	private static final long serialVersionUID = -6998611490305217348L;
-
 	public static final String INT_PRATICA_ID = "intPraticaId";
-
 	public static final String CONTROLLO_PRATICA_ID = "controlloPraticaId";
-
 	public static final String DETT_PRATICA_ID = "dettPraticaId";
-
 	public static final String NUMERO_PROGETTO = "numeroProgetto";
-
 	public static final String PROTOCOLLO = "protocollo";
-
 	public static final String TIPO_PRATICA = "tipoPratica";
-
 	public static final String DETT_PRATICA = "dettPratica";
-
 	public static final String STATO_PRATICA = "statoPratica";
-
 	public static final String DESC_INTERVENTO = "descIntervento";
-
 	public static final String COMMITTENTE = "committente";
-
 	public static final String COMMITTENTI = "committenti";
-
 	public static final String DIRETTORE_LAVORI = "direttoreLavori";
-
 	public static final String COLLAUDATORI = "collaudatori";
-
 	public static final String DATA_RICHIESTA = "dataRichiesta";
-
 	public static final String DT_PRATICA = "dtPratica";
-
 	public static final String DATA_RICHIESTA_DA = "dataRichiestaDa";
-
 	public static final String DATA_RICHIESTA_AL = "dataRichiestaAl";
-
 	public static final String STATUS = "status";
-
 	public static final String STATUS_SOSPESA = "sospesa";
-
 	public static final String PRATICA_APERTA = "praticaAperta";
-
 	public static final String STATUS_BY_USERID = "statusByUserId";
-
 	public static final String STATUS_BY_USERNAME = "statusByUsername";
-
 	public static final String STATUS_DATE = "statusDate";
-
 	public static final String SOGGETTI_INTERCONNESSI = "soggettiInterconnessi";
-
 	public static final String SOGGETTI_INTERESSATI = "soggettiInteressati";
-
 	public static final String SOTTOPOSTO_A_PARERE = "sottopostoAParere";
-
 	public static final String LAVORAZIONE_SORTEGGIATA = "lavorazioneSorteggiata";
-
 	public static final String FINE_LAVORI_COMPLETATI = "fineLavoriCompletati";
-
 	public static final String COLLAUDO_COMPLETATO = "collaudoCompletato";
-
 	public static final String FINE_LAVORI_PARZIALI = "fineLavoriParziali";
-
 	public static final String VARIATA = "variata";
-
 	public static final String VIDIMATA = "vidimata";
-
 	public static final String COLLAUDO_PARZIALE = "collaudoParziale";
-
 	public static final String ISTRUTTORE_USER_ID = "istruttoreUserId";
-
 	public static final String ISTRUTTORE_FULL_NAME = "istruttoreFullName";
-
 	public static final String PROPRIETARIO_DIGITALE_FULL_NAME = "proprietarioDigitaleFullName";
-
 	public static final String ISTRUTTORE_USERNAME = "istruttoreUsername";
-
 	public static final String PARERE_GEOLOGO = "parereGeologo";
-
 	public static final String COMUNE_ID = "comuneId";
-
 	public static final String COMUNE_DENOMINAZIONE = "comuneDenominazione";
-
 	public static final String PROVINCIA_ID = "provinciaId";
-
 	public static final String PROVINCIA_CODICE = "codiceProvincia";
-
 	public static final String PROVINCIA_NAME = "nomeProvincia";
-
 	public static final String DATA_INIZIO_PROCEDIMENTO = "dataInizioProcedimento";
-
 	public static final String TASK_ASSIGNEE_USER_ID = "taskAssigneeUserId";
-
 	public static final String TASK_ASSIGNEE_ROLE_IDS = "taskAssigneeRoleIds";
-
 	public static final String WORKFLOW_DEFINITION_NAME = "workflowDefinitionName";
-
 	public static final String WORKFLOW_DEFINITION_VERSION = "workflowDefinitionVersion";
-
 	public static final String TASK_NAME = "taskName";
-
 	public static final String WORKFLOW_STATE = "workflowState";
-
 	public static final String NUOVA_COSTRUZIONE = "nuovaCostruzione";
-
 	public static final String ADEGUAMENTO_SISMICO = "adeguamentoSismico";
-
 	public static final String MIGLIORAMENTO_SISMICO = "miglioramentoSismico";
-
 	public static final String RIPARAZIONE_INTERVENTO_LOCALE = "riparazioneInterventoLocale";
-
 	public static final String INDIRIZZO = "indirizzo";
-
 	public static final String LOCALITA = "localita";
-
 	public static final String PROVINCIA = "provincia";
-
 	public static final String COMUNE = "comune";
-
 	public static final String TIPO_PROCEDURA = "tipoProcedura";
-	
 	public static final String IN_LAVORAZIONE_SUE = "inLavorazioneSue";
-	
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java
index da8c57f8..068990d5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java
@@ -3,7 +3,7 @@ package it.tref.liferay.portos.bo.util;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,7 +28,7 @@ public class PraticaUtil {
 	}
 
 	@SuppressWarnings("serial")
-	private static final Map<String, String[]> statusChangeMap = new LinkedHashMap<String, String[]>() {
+	private static final Map<String, String[]> statusChangeMap = new LinkedHashMap<String, String[]>(4) {
 		{
 			put(StatoPraticaConstants.CONFORME, new String[] { StatoPraticaConstants.NON_CONFORME });
 			put(StatoPraticaConstants.NON_CONFORME, new String[] { StatoPraticaConstants.CONFORME });
@@ -44,92 +44,24 @@ public class PraticaUtil {
 		return statusChangeMap;
 	}
 
-	@SuppressWarnings("serial")
-	private static final List<String> dettPraticaHiddenFields = new ArrayList<String>() {
-		{
-			add("uuid");
-			add("uuid_");
-			add("dettPraticaId");
-			add("companyId");
-			add("userId");
-			add("userName");
-			add("createDate");
-			add("modifiedDate");
-			add("groupId");
-			add("intPraticaId");
-			add("dataEffettuazione");
-			add("integrazione");
-			add("validata");
-			add("dtProtocollo");
-			add("protocollo");
-			add("completa");
-			add("gestita");
-			add("version");
-			add("versionata");
-			add("status");
-			add("statusByUserId");
-			add("statusByUserName");
-			add("statusDate");
-			add("statusTask");
-			add("workflowForzato");
-			add("soggettoSostituitoId");
-			add("dtInvioSignal");
-			add("tipoIntegrazione");
-			add("varianteSostanziale");
-			add("varianteNumero");
-			add("variataDa");
-			add("codiceFiscaleDelegato");
-			add("codiceRuoloDelegato");
-			add("codiceFiscaleDelegatoCommittente");
-			add("codiceFiscalePrincipaleCommittente");
-			add("codiceFiscalePrincipaleCollaudatore");
-			add("codiceFiscalePrincipaleProgettista");
-			add("codiceFiscalePrincipaleDirettoreLavori");
-			add("codiceFiscalePrincipaleDitta");
-			add("codiceFiscalePrincipaleGeologo");
-			add("localizzazioneGeografica");
-			add("inizioLavoriContestualeOpera");
-			add("dataInizioLavoriOpera");
-			add("dataInizioEsecuzioneOpera");
-			add("dataFineEsecuzioneOpera");
-			add("metratura");
-			add("lavoriPubblici");
-			add("lavoriPubbliciPercentuale");
-			add("numeroCivico");
-			add("normDpr03");
-			add("normDpr04");
-			add("normDpr05");
-			add("normDm04");
-			add("normDm05");
-			add("normOrd01");
-			add("normCI01");
-			add("normLTC01");
-			add("dpdc");
-			add("deInfAltro");
-			add("dccOpereDiRinforzoAltro");
-			add("dccElemNonStrutAltro");
-			add("dccCoperturaAltro");
-			add("dccOrizzontamentiAltro");
-			add("lavoriInEconomiaCommittente");
-			add("importoSpeseIstruttoria");
-			add("codicePagamentoOneri");
-			add("causalePagamentoOneri");
-			add("mezzoPagamentoOneri");
-			add("importoBolli");
-			add("codicePagamentoBolli");
-			add("causalePagamentoBolli");
-			add("mezzoPagamentoBolli");
-			add("pagamentoIdOneri");
-			add("pagamentoIdBolli");
-			add("pagNuoveCostruzioni");
-			add("pagAdeguamentoSismico");
-			add("pagMiglioramentoSismico");
-			add("pagRiparazioneInterventoLocale");
-			add("pagNuovaCostruzione");
-			add("pagVarianti");
-			add("pagAltro");
-		}
-	};
+	private static final List<String> dettPraticaHiddenFields = Arrays.asList("uuid", "uuid_", "dettPraticaId",
+			"companyId", "userId", "userName", "createDate", "modifiedDate", "groupId", "intPraticaId",
+			"dataEffettuazione", "integrazione", "validata", "dtProtocollo", "protocollo", "completa", "gestita",
+			"version", "versionata", "status", "statusByUserId", "statusByUserName", "statusDate", "statusTask",
+			"workflowForzato", "soggettoSostituitoId", "dtInvioSignal", "tipoIntegrazione", "varianteSostanziale",
+			"varianteNumero", "variataDa", "codiceFiscaleDelegato", "codiceRuoloDelegato",
+			"codiceFiscaleDelegatoCommittente", "codiceFiscalePrincipaleCommittente",
+			"codiceFiscalePrincipaleCollaudatore", "codiceFiscalePrincipaleProgettista",
+			"codiceFiscalePrincipaleDirettoreLavori", "codiceFiscalePrincipaleDitta", "codiceFiscalePrincipaleGeologo",
+			"localizzazioneGeografica", "inizioLavoriContestualeOpera", "dataInizioLavoriOpera",
+			"dataInizioEsecuzioneOpera", "dataFineEsecuzioneOpera", "metratura", "lavoriPubblici",
+			"lavoriPubbliciPercentuale", "numeroCivico", "normDpr03", "normDpr04", "normDpr05", "normDm04", "normDm05",
+			"normOrd01", "normCI01", "normLTC01", "dpdc", "deInfAltro", "dccOpereDiRinforzoAltro",
+			"dccElemNonStrutAltro", "dccCoperturaAltro", "dccOrizzontamentiAltro", "lavoriInEconomiaCommittente",
+			"importoSpeseIstruttoria", "codicePagamentoOneri", "causalePagamentoOneri", "mezzoPagamentoOneri",
+			"importoBolli", "codicePagamentoBolli", "causalePagamentoBolli", "mezzoPagamentoBolli", "pagamentoIdOneri",
+			"pagamentoIdBolli", "pagNuoveCostruzioni", "pagAdeguamentoSismico", "pagMiglioramentoSismico",
+			"pagRiparazioneInterventoLocale", "pagNuovaCostruzione", "pagVarianti", "pagAltro");
 
 	public static List<String> getDettPraticaHiddenFields() {
 
@@ -141,27 +73,27 @@ public class PraticaUtil {
 
 		String statoPraticaLabel = StringPool.BLANK;
 		switch (statoPratica) {
-		case StatoPraticaConstants.CONFORME:
-			if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-				statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.CONFORME);
-			} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-				statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.AUTORIZZATA);
-			}
-			break;
-		case StatoPraticaConstants.NON_CONFORME:
-			if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-				statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_CONFORME);
-			} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-				statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_AUTORIZZATA);
-			}
-			break;
-
-		default:
-			statoPraticaLabel = StatoPraticaConstants.getStatusLabel(statoPratica);
-			if (Validator.isNull(statoPraticaLabel)) {
-				statoPraticaLabel = "In compilazione";
-			}
-			break;
+			case StatoPraticaConstants.CONFORME:
+				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
+					statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.CONFORME);
+				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
+					statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.AUTORIZZATA);
+				}
+				break;
+			case StatoPraticaConstants.NON_CONFORME:
+				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
+					statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_CONFORME);
+				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
+					statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_AUTORIZZATA);
+				}
+				break;
+
+			default:
+				statoPraticaLabel = StatoPraticaConstants.getStatusLabel(statoPratica);
+				if (Validator.isNull(statoPraticaLabel)) {
+					statoPraticaLabel = "In compilazione";
+				}
+				break;
 		}
 		return statoPraticaLabel;
 	}
@@ -171,23 +103,23 @@ public class PraticaUtil {
 
 		String statoPraticaCode = StringPool.BLANK;
 		switch (statoPratica) {
-		case StatoPraticaConstants.CONFORME:
-			if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-				statoPraticaCode = StatoPraticaConstants.CONFORME;
-			} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-				statoPraticaCode = StatoPraticaConstants.AUTORIZZATA;
-			}
-			break;
-		case StatoPraticaConstants.NON_CONFORME:
-			if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-				statoPraticaCode = StatoPraticaConstants.NON_CONFORME;
-			} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-				statoPraticaCode = StatoPraticaConstants.NON_AUTORIZZATA;
-			}
-			break;
-		default:
-			statoPraticaCode = statoPratica;
-			break;
+			case StatoPraticaConstants.CONFORME:
+				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
+					statoPraticaCode = StatoPraticaConstants.CONFORME;
+				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
+					statoPraticaCode = StatoPraticaConstants.AUTORIZZATA;
+				}
+				break;
+			case StatoPraticaConstants.NON_CONFORME:
+				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
+					statoPraticaCode = StatoPraticaConstants.NON_CONFORME;
+				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
+					statoPraticaCode = StatoPraticaConstants.NON_AUTORIZZATA;
+				}
+				break;
+			default:
+				statoPraticaCode = statoPratica;
+				break;
 		}
 		return statoPraticaCode;
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java
index f4723b40..9b611161 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java
@@ -82,20 +82,20 @@ public class SoggettiUtil {
 
 		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
 		switch (tipologiaSoggetto) {
-		case TipoSoggettoUtil.COMMITTENTE:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCommittente());
-		case TipoSoggettoUtil.COLLAUDATORE:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
-		case TipoSoggettoUtil.DIRETTORE_LAVORI:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
-		case TipoSoggettoUtil.PROGETTISTA:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleProgettista());
-		case TipoSoggettoUtil.GEOLOGO:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleGeologo());
-		case TipoSoggettoUtil.DITTA:
-			return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDitta());
-		default:
-			return false;
+			case TipoSoggettoUtil.COMMITTENTE:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCommittente());
+			case TipoSoggettoUtil.COLLAUDATORE:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
+			case TipoSoggettoUtil.PROGETTISTA:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleProgettista());
+			case TipoSoggettoUtil.GEOLOGO:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleGeologo());
+			case TipoSoggettoUtil.DITTA:
+				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDitta());
+			default:
+				return false;
 		}
 	}
 
@@ -104,24 +104,25 @@ public class SoggettiUtil {
 
 		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
 		switch (tipologiaSoggetto) {
-		case TipoSoggettoUtil.COMMITTENTE:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCommittente());
-		case TipoSoggettoUtil.COLLAUDATORE:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
-		case TipoSoggettoUtil.DIRETTORE_LAVORI:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
-		case TipoSoggettoUtil.PROGETTISTA:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleProgettista());
-		case TipoSoggettoUtil.GEOLOGO:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleGeologo());
-		case TipoSoggettoUtil.DITTA:
-			return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDitta());
-		default:
-			return false;
+			case TipoSoggettoUtil.COMMITTENTE:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCommittente());
+			case TipoSoggettoUtil.COLLAUDATORE:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
+			case TipoSoggettoUtil.PROGETTISTA:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleProgettista());
+			case TipoSoggettoUtil.GEOLOGO:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleGeologo());
+			case TipoSoggettoUtil.DITTA:
+				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDitta());
+			default:
+				return false;
 		}
 	}
 
 	public static boolean isCollaudatorePresent(long dettPraticaId) throws SystemException {
+
 		List<Soggetto> soggettiInseriti = SoggettoLocalServiceUtil.findByDettPratica(dettPraticaId);
 		boolean collaudatorePresente = false;
 		for (Soggetto soggetto : soggettiInseriti) {
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 2a963fc2..e47d26df 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
@@ -24,7 +24,6 @@ import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
 import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
-import it.tref.liferay.portos.bo.shared.util.GenericUtils;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
@@ -33,7 +32,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -63,24 +65,9 @@ import com.liferay.portal.model.Company;
 import com.liferay.portal.service.CompanyLocalServiceUtil;
 
 public class ValidazionePraticaUtil {
-	@SuppressWarnings("serial")
-	private static final List<String> infrastrutture = new ArrayList<String>() {
-		{
-			add("1A");
-			add("2A");
-			add("A4A");
-			add("A4B");
-			add("A4C");
-			add("A4D");
-			add("A4E");
-			add("A4F");
-			add("A5A");
-			add("B4A");
-			add("B4B");
-			add("B4C");
-			add("B5A");
-		}
-	};
+
+	private static final List<String> infrastrutture = Arrays.asList("1A", "2A", "A4A", "A4B", "A4C", "A4D", "A4E",
+			"A4F", "A5A", "B4A", "B4B", "B4C", "B5A");
 
 	private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class);
 
@@ -107,7 +94,8 @@ public class ValidazionePraticaUtil {
 	public static boolean canEditPratica(long intPraticaId) throws PortalException, SystemException {
 
 		IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
-		return (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE);
+		return intPratica.getStatus() == WorkflowConstants.STATUS_ANY
+				|| intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE;
 	}
 
 	public static boolean canDeletePratica(long intPraticaId, long userId) throws PortalException, SystemException {
@@ -406,18 +394,18 @@ public class ValidazionePraticaUtil {
 			SystemException {
 
 		switch (section) {
-		case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI:
-			return isDettagliPrincipaliCompleta(dettPraticaId);
-		case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI:
-			return isAnagrafeSoggettiCompleta(dettPraticaId);
-		case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO:
-			return isDescrizioneEdificioCompleta(dettPraticaId);
-		case SezioniUtil.SEZIONE_GEOLOGICA:
-			return isSezioneGeologicaCompleta(dettPraticaId);
-		case SezioniUtil.SEZIONE_ALLEGATI:
-			return isSezioneAllegatiCompleta(dettPraticaId);
-		default:
-			return false;
+			case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI:
+				return isDettagliPrincipaliCompleta(dettPraticaId);
+			case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI:
+				return isAnagrafeSoggettiCompleta(dettPraticaId);
+			case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO:
+				return isDescrizioneEdificioCompleta(dettPraticaId);
+			case SezioniUtil.SEZIONE_GEOLOGICA:
+				return isSezioneGeologicaCompleta(dettPraticaId);
+			case SezioniUtil.SEZIONE_ALLEGATI:
+				return isSezioneAllegatiCompleta(dettPraticaId);
+			default:
+				return false;
 		}
 	}
 
@@ -425,31 +413,24 @@ public class ValidazionePraticaUtil {
 			SystemException {
 
 		switch (section) {
-		case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI:
-			return notCompletedDettagliPrincipali(dettPraticaId);
-		case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI:
-			return notCompletedAnagrafeSoggetti(dettPraticaId);
-		case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO:
-			return notCompletedDescrizioneEdificio(dettPraticaId);
-		case SezioniUtil.SEZIONE_GEOLOGICA:
-			return notCompletedSezioneGeologica(dettPraticaId);
-		case SezioniUtil.SEZIONE_ALLEGATI:
-			return notCompletedSezioniAllegati(dettPraticaId);
-		default:
-			return new ArrayList<String>();
+			case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI:
+				return notCompletedDettagliPrincipali(dettPraticaId);
+			case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI:
+				return notCompletedAnagrafeSoggetti(dettPraticaId);
+			case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO:
+				return notCompletedDescrizioneEdificio(dettPraticaId);
+			case SezioniUtil.SEZIONE_GEOLOGICA:
+				return notCompletedSezioneGeologica(dettPraticaId);
+			case SezioniUtil.SEZIONE_ALLEGATI:
+				return notCompletedSezioniAllegati(dettPraticaId);
+			default:
+				return new ArrayList<>();
 		}
 	}
 
 	public static boolean isDelegaGeologoCompleted(long dettPraticaId) throws PortalException, SystemException {
 
-		return hasDelegaGeologoCompleted(dettPraticaId).isEmpty();
-	}
-
-	public static List<String> hasDelegaGeologoCompleted(long dettPraticaId) throws PortalException, SystemException {
-
-		List<String> notCompleted = notCompletedDatiSezionGeologica(dettPraticaId);
-		notCompleted.addAll(notCompletedAllegatiSezionGeologicaDelega(dettPraticaId));
-		return notCompleted;
+		return notCompletedSezioneGeologica(dettPraticaId).isEmpty();
 	}
 
 	private static boolean isDettagliPrincipaliCompleta(long dettPraticaId) throws PortalException, SystemException {
@@ -582,27 +563,27 @@ public class ValidazionePraticaUtil {
 				return false;
 			}
 			switch (soggetto.getTipologiaSoggetto()) {
-			case TipoSoggettoUtil.COLLAUDATORE:
-				numeroCollaudatori++;
-				collaudatore = true;
-				break;
-			case TipoSoggettoUtil.COMMITTENTE:
-				committente = true;
-				break;
-			case TipoSoggettoUtil.DIRETTORE_LAVORI:
-				direttore = true;
-				break;
-			case TipoSoggettoUtil.DITTA:
-				ditta = true;
-				break;
-			case TipoSoggettoUtil.GEOLOGO:
-				geologo = true;
-				break;
-			case TipoSoggettoUtil.PROGETTISTA:
-				progettista = true;
-				break;
-			default:
-				break;
+				case TipoSoggettoUtil.COLLAUDATORE:
+					numeroCollaudatori++;
+					collaudatore = true;
+					break;
+				case TipoSoggettoUtil.COMMITTENTE:
+					committente = true;
+					break;
+				case TipoSoggettoUtil.DIRETTORE_LAVORI:
+					direttore = true;
+					break;
+				case TipoSoggettoUtil.DITTA:
+					ditta = true;
+					break;
+				case TipoSoggettoUtil.GEOLOGO:
+					geologo = true;
+					break;
+				case TipoSoggettoUtil.PROGETTISTA:
+					progettista = true;
+					break;
+				default:
+					break;
 			}
 		}
 		boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId)
@@ -688,27 +669,27 @@ public class ValidazionePraticaUtil {
 						tipoSoggetto));
 			}
 			switch (soggetto.getTipologiaSoggetto()) {
-			case TipoSoggettoUtil.COLLAUDATORE:
-				collaudatore = true;
-				numeroCollaudatori++;
-				break;
-			case TipoSoggettoUtil.COMMITTENTE:
-				committente = true;
-				break;
-			case TipoSoggettoUtil.DIRETTORE_LAVORI:
-				direttore = true;
-				break;
-			case TipoSoggettoUtil.DITTA:
-				ditta = true;
-				break;
-			case TipoSoggettoUtil.GEOLOGO:
-				geologo = true;
-				break;
-			case TipoSoggettoUtil.PROGETTISTA:
-				progettista = true;
-				break;
-			default:
-				break;
+				case TipoSoggettoUtil.COLLAUDATORE:
+					collaudatore = true;
+					numeroCollaudatori++;
+					break;
+				case TipoSoggettoUtil.COMMITTENTE:
+					committente = true;
+					break;
+				case TipoSoggettoUtil.DIRETTORE_LAVORI:
+					direttore = true;
+					break;
+				case TipoSoggettoUtil.DITTA:
+					ditta = true;
+					break;
+				case TipoSoggettoUtil.GEOLOGO:
+					geologo = true;
+					break;
+				case TipoSoggettoUtil.PROGETTISTA:
+					progettista = true;
+					break;
+				default:
+					break;
 			}
 		}
 		boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId)
@@ -1105,114 +1086,112 @@ public class ValidazionePraticaUtil {
 		return formGeologo && allegatiGeologo;
 	}
 
-	private static List<String> notCompletedSezioneGeologica(long dettPraticaId) throws PortalException,
-			SystemException {
+	public static List<String> notCompletedSezioneGeologica(long dettPraticaId) throws PortalException, SystemException {
 
 		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
-		List<String> notCompleted = new ArrayList<>();
 		// Se check NormArt3com3 sez. geologica non obbligatoria
 		if (dettPratica.getNormArt3com3()) {
 			return Collections.emptyList();
 		}
-		notCompleted.addAll(notCompletedDatiSezionGeologica(dettPraticaId));
-		if (!dettPratica.getNormArt3com3()) {
-			long intPraticaId = dettPratica.getIntPraticaId();
-			List<DocPratica> a14 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
-					dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS);
-			List<DocPratica> a05 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
-					dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS);
-			List<DocPratica> a06 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
-					dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS);
-			List<DocPratica> a15 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
-					dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS);
-			List<DocPratica> a16 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(intPraticaId,
-					DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0]), QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS);
-			List<Delega> delegheGeologo = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId,
-					DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS, null);
-			if (a14.isEmpty() && delegheGeologo.isEmpty()) {
-				notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-"
-						+ DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14)
-						+ " non presente");
-			} else {
-				for (DocPratica doc : a14) {
-					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
-					List<String> signatures = firme.allSignatures();
-					if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures,
-							AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()), doc)) {
-						GenericUtils.addIfnotExist(notCompleted, doc.getTipologia() + " firme obbligatorie mancanti");
-					}
+		Set<String> notCompleted = new LinkedHashSet<>(notCompletedDatiSezionGeologica(dettPraticaId));
+		long intPraticaId = dettPratica.getIntPraticaId();
+		List<DocPratica> a14 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
+				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
+		List<DocPratica> a05 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
+				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
+		List<DocPratica> a06 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
+				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
+		List<DocPratica> a15 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(
+				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
+		List<DocPratica> a16 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(intPraticaId,
+				DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0]), QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
+		List<Delega> delegheGeologo = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId,
+				DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS, null);
+		if (a14.isEmpty() && delegheGeologo.isEmpty()) {
+			notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14
+					+ " - "
+					+ LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-"
+							+ DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) + " non presente");
+		} else {
+			for (DocPratica doc : a14) {
+				FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
+				List<String> signatures = firme.allSignatures();
+				if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures,
+						AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()), doc)) {
+					notCompleted.add(doc.getTipologia() + " firme obbligatorie mancanti");
 				}
 			}
-			if (a05.isEmpty()) {
-				notCompleted.add("A05 non presente");
-			} else {
-				for (DocPratica doc : a05) {
-					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
-					List<String> signatures = firme.allSignatures();
-					List<String> firmeRichieste = AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia());
-					List<Soggetto> soggettiInseriti = SoggettoLocalServiceUtil.findByIntPratica(dettPratica
-							.getIntPraticaId());
-					List<String> firmeFiltrate = new ArrayList<String>();
-					for (String string : firmeRichieste) {
-						firmeFiltrate.add(string);
-					}
-					boolean DLPresente = false;
-					for (Soggetto soggetto : soggettiInseriti) {
-						if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) {
-							DLPresente = true;
-						}
-					}
-					if (!DLPresente || !dettPratica.isLavoriPubblici()) {
-						firmeFiltrate.remove(TipoSoggettoUtil.DIRETTORE_LAVORI);
-					}
-					if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures,
-							firmeFiltrate, doc)) {
-						GenericUtils.addIfnotExist(notCompleted, doc.getTipologia() + " firme obbligatorie mancanti");
-					}
+		}
+		if (a05.isEmpty()) {
+			notCompleted.add("A05 non presente");
+		} else {
+			for (DocPratica doc : a05) {
+				FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
+				List<String> signatures = firme.allSignatures();
+				List<String> firmeRichieste = AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia());
+				List<Soggetto> soggettiInseriti = SoggettoLocalServiceUtil.findByIntPratica(dettPratica
+						.getIntPraticaId());
+				List<String> firmeFiltrate = new ArrayList<String>();
+				for (String string : firmeRichieste) {
+					firmeFiltrate.add(string);
 				}
-			}
-			if (a06.isEmpty()) {
-				notCompleted.add("A06 non presente");
-			} else {
-				for (DocPratica doc : a06) {
-					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
-					List<String> signatures = firme.allSignatures();
-					if (!isA06Valid(dettPratica, dettPratica.getIntPraticaId(), signatures, doc)) {
-						notCompleted.add("A06 firme obbligatorie mancanti ");
+				boolean DLPresente = false;
+				for (Soggetto soggetto : soggettiInseriti) {
+					if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) {
+						DLPresente = true;
 					}
 				}
+				if (!DLPresente || !dettPratica.isLavoriPubblici()) {
+					firmeFiltrate.remove(TipoSoggettoUtil.DIRETTORE_LAVORI);
+				}
+				if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, firmeFiltrate,
+						doc)) {
+					notCompleted.add(doc.getTipologia() + " firme obbligatorie mancanti");
+				}
 			}
-			for (DocPratica doc : a15) {
+		}
+		if (a06.isEmpty()) {
+			notCompleted.add("A06 non presente");
+		} else {
+			for (DocPratica doc : a06) {
 				FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
 				List<String> signatures = firme.allSignatures();
-				if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) {
-					notCompleted.add("A15 firme obbligatorie mancanti");
+				if (!isA06Valid(dettPratica, dettPratica.getIntPraticaId(), signatures, doc)) {
+					notCompleted.add("A06 firme obbligatorie mancanti ");
 				}
 			}
-			if (a16.isEmpty()) {
-				notCompleted.add("Indagini geologiche non presenti");
-			} else {
-				for (DocPratica doc : a16) {
-					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
-					List<String> signatures = firme.allSignatures();
+		}
+		for (DocPratica doc : a15) {
+			FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
+			List<String> signatures = firme.allSignatures();
+			if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) {
+				notCompleted.add("A15 firme obbligatorie mancanti");
+			}
+		}
+		if (a16.isEmpty()) {
+			notCompleted.add("Indagini geologiche non presenti");
+		} else {
+			for (DocPratica doc : a16) {
+				FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
+				List<String> signatures = firme.allSignatures();
 
-					List<String> signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures,
-							TipoSoggettoUtil.GEOLOGO, doc.getClassPk());
-					if (signaturesPerSubject.isEmpty()) {
-						notCompleted.add(doc.getTipologia() + " - " + LanguageUtil.get(LocaleUtil.getDefault(),
-								"label-documenti-tipologia-" + doc.getTipologia())
-								+ " non firmato dal Geologo");
-					}
+				List<String> signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures,
+						TipoSoggettoUtil.GEOLOGO, doc.getClassPk());
+				if (signaturesPerSubject.isEmpty()) {
+					notCompleted.add(doc.getTipologia()
+							+ " - "
+							+ LanguageUtil.get(LocaleUtil.getDefault(),
+									"label-documenti-tipologia-" + doc.getTipologia()) + " non firmato dal Geologo");
 				}
 			}
 		}
-		return notCompleted;
+		return new ArrayList<>(notCompleted);
 	}
 
 	private static List<String> notCompletedDatiSezionGeologica(long dettPraticaId) throws PortalException,
@@ -1286,54 +1265,6 @@ public class ValidazionePraticaUtil {
 		return notCompleted;
 	}
 
-	private static List<String> notCompletedAllegatiSezionGeologicaDelega(long dettPraticaId) throws PortalException,
-			SystemException {
-
-		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
-		List<String> notCompleted = new ArrayList<>();
-		// Allegati obbligatori devono essere presenti
-		int a05 = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(),
-				DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05);
-		if (a05 == 0) {
-			notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-"
-					+ DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05)
-					+ " non presente");
-		}
-		if (!dettPratica.getNormArt3com3()) {
-			int a14 = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(),
-					DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14);
-			if (a14 == 0) {
-				notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-"
-						+ DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14)
-						+ " non presente");
-			}
-		}
-		int indaginiGeologiche = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie(
-				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0]));
-		if (indaginiGeologiche == 0) {
-			notCompleted.add("Indagini Geologoche non presenti");
-		}
-		List<DocPratica> allegatiGeologici = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(
-				dettPratica.getIntPraticaId(), DocumentiPraticaUtil.getDocGeologo().toArray(new String[0]),
-				QueryUtil.ALL_POS, QueryUtil.ALL_POS);
-		long intPraticaId = dettPratica.getIntPraticaId();
-		for (DocPratica doc : allegatiGeologici) {
-			// ADT : BUG FE ID=14 : CONTROLLO firma geologo A6 disabilitato
-			boolean checkA06 = doc.getTipologia().equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06);
-			FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
-			List<String> signatures = firme.allSignatures();
-			List<String> signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures,
-					TipoSoggettoUtil.GEOLOGO, doc.getClassPk());
-			// ADT : BUG FE ID=14 : CONTROLLO firma geologo A6 disabilitato
-			if (signaturesPerSubject.isEmpty() && (!checkA06)) {
-				notCompleted.add(doc.getTipologia() + " - " + LanguageUtil.get(LocaleUtil.getDefault(),
-						"label-documenti-tipologia-" + doc.getTipologia())
-						+ " non firmato dal Geologo");
-			}
-		}
-		return notCompleted;
-	}
-
 	private static boolean isSezioneAllegatiCompleta(long dettPraticaId) throws PortalException, SystemException {
 
 		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
@@ -1357,7 +1288,7 @@ public class ValidazionePraticaUtil {
 			tipologiaSoggetti.add(tipSoggetto);
 		}
 
-		List<String> firmeTotali = new ArrayList<>();
+		Set<String> firmeTotali = new HashSet<>();
 		boolean contieneDocumenti = false;
 		for (String codiceDoc : tipologiaAllegati) {
 			if (isDocPraticaRequired(dettPratica, codiceDoc)) {
@@ -1377,7 +1308,7 @@ public class ValidazionePraticaUtil {
 					contieneDocumenti = true;
 					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
 					List<String> signatures = firme.allSignatures();
-					GenericUtils.addAllIfnotExist(firmeTotali, signatures);
+					firmeTotali.addAll(signatures);
 					boolean isEnoughOne = AsseverazioniUtil.isEnoughOne(codiceDoc);
 					if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00)) {
 						if (!isA00Valid(dettPratica, signatures)) {
@@ -1452,16 +1383,16 @@ public class ValidazionePraticaUtil {
 		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
 		long intPraticaId = dettPratica.getIntPraticaId();
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-		List<String> notCompleted = new ArrayList<>();
+		Set<String> notCompleted = new LinkedHashSet<>();
 		List<String> tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica.getTipoProcedura());
-		List<String> firmeTotali = new ArrayList<>();
+		Set<String> firmeTotali = new HashSet<>();
 		for (String codiceDoc : tipologiaAllegati) {
 			if (isDocPraticaRequired(dettPratica, codiceDoc)) {
 				List<DocPratica> docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId,
 						codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 				if (docs.isEmpty()) {
 					// Ci dev'essere almeno un allegato per ogni tipologia obbligatoria
-					notCompleted.add("Nessun Allegato per " + codiceDoc + " - " 
+					notCompleted.add("Nessun Allegato per " + codiceDoc + " - "
 							+ LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + codiceDoc));
 				}
 				for (DocPratica doc : docs) {
@@ -1473,7 +1404,7 @@ public class ValidazionePraticaUtil {
 					}
 					FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari());
 					List<String> signatures = firme.allSignatures();
-					GenericUtils.addAllIfnotExist(firmeTotali, signatures);
+					firmeTotali.addAll(signatures);
 					boolean isEnoughOne = AsseverazioniUtil.isEnoughOne(codiceDoc);
 					if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00)) {
 						if (!isA00Valid(dettPratica, signatures)) {
@@ -1511,7 +1442,7 @@ public class ValidazionePraticaUtil {
 						if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, TipoSoggettoUtil.getAllSubjects(),
 								doc)) {
 							// Return false if is required per this subjectType but it is not present
-							GenericUtils.addIfnotExist(notCompleted, codiceDoc + " firme obbligatorie mancanti");
+							notCompleted.add(codiceDoc + " firme obbligatorie mancanti");
 						}
 					}
 				}
@@ -1538,7 +1469,7 @@ public class ValidazionePraticaUtil {
 				}
 			}
 		}
-		return notCompleted;
+		return new ArrayList<>(notCompleted);
 	}
 
 	private static List<String> getSignaturePerSubject(long intPraticaId, List<String> signatures, String tipoSoggetto,
@@ -1562,27 +1493,28 @@ public class ValidazionePraticaUtil {
 
 		boolean required = true;
 		switch (codiceDoc) {
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00:
-			if (isRiparazioneLocale(dettPratica)) {
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00:
+				if (isRiparazioneLocale(dettPratica)) {
+					return false;
+				}
+				return !dettPratica.getNormEsenteSpese();
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05:
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06:
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07:
+				return !dettPratica.getNormArt3com3();
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15:
+				// nell'ultima version A15 non è più obbligatorio, ma se c'è deve essere firmato da GEOLOGO E DIRETTORE
+				// dei
+				// LAVORI
 				return false;
-			}
-			return !dettPratica.getNormEsenteSpese();
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05:
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06:
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07:
-			return !dettPratica.getNormArt3com3();
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15:
-			// nell'ultima version A15 non è più obbligatorio, ma se c'è deve essere firmato da GEOLOGO E DIRETTORE dei
-			// LAVORI
-			return false;
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09:
-			return !dettPratica.getNormArt3com4();
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17:
-			return isA17Required(dettPratica);
-		case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA:
-			return isA98Required(dettPratica);
-		default:
-			return required;
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09:
+				return !dettPratica.getNormArt3com4();
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17:
+				return isA17Required(dettPratica);
+			case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA:
+				return isA98Required(dettPratica);
+			default:
+				return required;
 		}
 	}
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java
index b3bb0806..8ef049f7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java
@@ -60,8 +60,7 @@ public class WorkflowUtil {
 					companyId, groupId, ControlloPratica.class.getName(), bean.getPrimaryKey());
 			long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();
 			workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(companyId, workflowInstanceId);
-		} catch (NoSuchWorkflowInstanceLinkException e) {
-		}
+		} catch (NoSuchWorkflowInstanceLinkException e) {}
 		if (workflowInstance != null) {
 			List<WorkflowTask> listaTmp = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(companyId, userId,
 					workflowInstance.getWorkflowInstanceId(), completed, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
@@ -115,8 +114,7 @@ public class WorkflowUtil {
 			if (workflowInstancelink != null) {
 				workflowInstanceId = workflowInstancelink.getWorkflowInstanceId();
 			}
-		} catch (PortalException e) {
-		}
+		} catch (PortalException e) {}
 		return workflowInstanceId;
 	}
 
@@ -130,8 +128,7 @@ public class WorkflowUtil {
 			if (workflowInstancelink != null) {
 				userId = workflowInstancelink.getUserId();
 			}
-		} catch (PortalException e) {
-		}
+		} catch (PortalException e) {}
 		return userId;
 	}
 
@@ -229,7 +226,7 @@ public class WorkflowUtil {
 	}
 
 	@SuppressWarnings("serial")
-	private final static Map<String, String> tipoDocumentoToSignal = new HashMap<String, String>() {
+	private final static Map<String, String> tipoDocumentoToSignal = new HashMap<String, String>(7) {
 		{
 			// Verificare corretta corrispondenza con AvvisoUtil.getAllTipoDocumento()
 			put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, WorkflowConstants.WORKFLOW_SIGNAL_ASSEGNAZIONE);
@@ -272,39 +269,39 @@ public class WorkflowUtil {
 			throws NumberFormatException, PortalException, SystemException {
 
 		switch (key) {
-		case "istruttore":
-			if (Validator.isNotNull(value) && !"0".equals(value)) {
-				User istruttore = UserLocalServiceUtil.getUser(Long.valueOf(value));
-				value = istruttore.getFullName();
-			} else {
-				return "nessuno";
-			}
-			break;
-		case WorkflowConstants.WORKFLOW_TASKNAME_ESITO:
-			if (Validator.isNotNull(value) && !"0".equals(value)) {
-				IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-				if (value.equalsIgnoreCase(StatoPraticaConstants.CONFORME)) {
-					value = PraticaUtil.getStatoPraticaLabel(StatoPraticaConstants.CONFORME, intPratica);
-				} else if (value.equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) {
-					value = PraticaUtil.getStatoPraticaLabel(StatoPraticaConstants.NON_CONFORME, intPratica);
-				} else if (value.equalsIgnoreCase(StatoPraticaConstants.AUTORIZZATA)) {
-					value = "Autorizzata";
-				} else if (value.equalsIgnoreCase(StatoPraticaConstants.NON_AUTORIZZATA)) {
-					value = "Non Autorizzata";
-				} else if (value.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE)) {
-					value = "Richiedi Integrazione";
-				} else if (value.equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)) {
-					value = "Annulla";
+			case "istruttore":
+				if (Validator.isNotNull(value) && !"0".equals(value)) {
+					User istruttore = UserLocalServiceUtil.getUser(Long.valueOf(value));
+					value = istruttore.getFullName();
+				} else {
+					return "nessuno";
 				}
-			} else {
-				return "nessuno";
-			}
-			break;
-		default:
-			if (Validator.isNull(value)) {
-				return StringPool.DASH;
-			}
-			break;
+				break;
+			case WorkflowConstants.WORKFLOW_TASKNAME_ESITO:
+				if (Validator.isNotNull(value) && !"0".equals(value)) {
+					IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+					if (value.equalsIgnoreCase(StatoPraticaConstants.CONFORME)) {
+						value = PraticaUtil.getStatoPraticaLabel(StatoPraticaConstants.CONFORME, intPratica);
+					} else if (value.equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) {
+						value = PraticaUtil.getStatoPraticaLabel(StatoPraticaConstants.NON_CONFORME, intPratica);
+					} else if (value.equalsIgnoreCase(StatoPraticaConstants.AUTORIZZATA)) {
+						value = "Autorizzata";
+					} else if (value.equalsIgnoreCase(StatoPraticaConstants.NON_AUTORIZZATA)) {
+						value = "Non Autorizzata";
+					} else if (value.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE)) {
+						value = "Richiedi Integrazione";
+					} else if (value.equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)) {
+						value = "Annulla";
+					}
+				} else {
+					return "nessuno";
+				}
+				break;
+			default:
+				if (Validator.isNull(value)) {
+					return StringPool.DASH;
+				}
+				break;
 		}
 		return value;
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRendererFactory.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRendererFactory.java
index 8987fa4e..e44d474f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRendererFactory.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRendererFactory.java
@@ -11,22 +11,24 @@ import com.liferay.portlet.asset.model.BaseAssetRendererFactory;
 public class ControlloPraticaAssetRendererFactory extends BaseAssetRendererFactory {
 
 	public static final String CLASS_NAME = ControlloPratica.class.getName();
-
 	public static final String TYPE = "issue";
 
+	@Override
 	public AssetRenderer getAssetRenderer(long classPK, int type) throws PortalException, SystemException {
 
 		ControlloPratica entry = ControlloPraticaLocalServiceUtil.getControlloPratica(classPK);
-
 		return new ControlloPraticaAssetRenderer(entry);
 	}
 
+	@Override
 	public String getClassName() {
+
 		return CLASS_NAME;
 	}
 
+	@Override
 	public String getType() {
+
 		return TYPE;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/geosisma/servlet/GeosismaRequestServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/geosisma/servlet/GeosismaRequestServlet.java
deleted file mode 100644
index b1148aa4..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/geosisma/servlet/GeosismaRequestServlet.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package it.tref.liferay.portos.bo.geosisma.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.liferay.portal.kernel.json.JSONArray;
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
-import com.liferay.portal.kernel.json.JSONObject;
-import com.liferay.portal.kernel.util.ParamUtil;
-
-/**
- * Servlet implementation class GeosismaRequestServlet
- */
-@WebServlet("/GeosismaRequest")
-public class GeosismaRequestServlet extends HttpServlet {
-	private static final long serialVersionUID = 1L;
-       
-    /**
-     * @see HttpServlet#HttpServlet()
-     */
-    public GeosismaRequestServlet() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-
-	/**
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-	 */
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
-		response.setContentType("application/json");
-		PrintWriter out = response.getWriter(); 
-		
-		boolean isTipoPratica = ParamUtil.getBoolean(request, "isTipoPratica", false);
-		boolean isStatoPratica = ParamUtil.getBoolean(request, "isStatoPratica", false);
-		
-		JSONObject json = JSONFactoryUtil.createJSONObject();
-		
-		if(isTipoPratica){
-			
-			JSONArray array = JSONFactoryUtil.createJSONArray();
-			
-			JSONObject jsonDeposito = JSONFactoryUtil.createJSONObject();
-			jsonDeposito.put("chiave", "deposito");
-			jsonDeposito.put("valore", "Deposito");
-			array.put(jsonDeposito);
-			
-			JSONObject jsonAutorizzazione = JSONFactoryUtil.createJSONObject();
-			jsonAutorizzazione.put("chiave", "autorizzazione");
-			jsonAutorizzazione.put("valore", "Autorizzazione");
-			array.put(jsonAutorizzazione);
-			
-			JSONObject jsonControlloObbligatorio = JSONFactoryUtil.createJSONObject();
-			jsonControlloObbligatorio.put("chiave", "controlloObbligatorio");
-			jsonControlloObbligatorio.put("valore", "Controllo Obbligatorio");
-			array.put(jsonControlloObbligatorio);
-			
-			
-			JSONObject jsonSorteggiate = JSONFactoryUtil.createJSONObject();
-			jsonSorteggiate.put("chiave", "sorteggiata");
-			jsonSorteggiate.put("valore", "Sorteggiata");
-			array.put(jsonSorteggiate);
-			
-			json.put("tipoPratica" , array);
-			
-		} else if(isStatoPratica){
-			
-			JSONArray array = JSONFactoryUtil.createJSONArray();
-			
-			JSONObject vidimata = JSONFactoryUtil.createJSONObject();
-			vidimata.put("chiave", "VI");
-			vidimata.put("valore", "Vidimata");
-			array.put(vidimata);
-			
-			JSONObject conforme = JSONFactoryUtil.createJSONObject();
-			conforme.put("chiave", "CO");
-			conforme.put("valore", "Conforme");
-			array.put(conforme);
-			
-			JSONObject autorizzata = JSONFactoryUtil.createJSONObject();
-			autorizzata.put("chiave", "AU");
-			autorizzata.put("valore", "Autorizzata");
-			array.put(autorizzata);
-			
-			
-			JSONObject fineLavori = JSONFactoryUtil.createJSONObject();
-			fineLavori.put("chiave", "FL");
-			fineLavori.put("valore", "Fine Lavori");
-			array.put(fineLavori);
-			
-			JSONObject collaudo = JSONFactoryUtil.createJSONObject();
-			collaudo.put("chiave", "CL");
-			collaudo.put("valore", "Collaudo");
-			array.put(collaudo);
-			
-			json.put("statoPratica" , array);
-			
-		}
-		
-		out.print(json.toString());
-		
-		out.flush();
-		
-	}
-
-	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-	 */
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
-		response.setContentType("application/json");
-		PrintWriter out = response.getWriter(); 
-		
-		boolean isTipoPratica = ParamUtil.getBoolean(request, "isTipoPratica", false);
-		boolean isStatoPratica = ParamUtil.getBoolean(request, "isStatoPratica", false);
-		
-		JSONObject json = JSONFactoryUtil.createJSONObject();
-		
-		if(isTipoPratica){
-			
-			JSONArray array = JSONFactoryUtil.createJSONArray();
-			
-			JSONObject jsonDeposito = JSONFactoryUtil.createJSONObject();
-			jsonDeposito.put("chiave", "deposito");
-			jsonDeposito.put("valore", "Deposito");
-			array.put(jsonDeposito);
-			
-			JSONObject jsonAutorizzazione = JSONFactoryUtil.createJSONObject();
-			jsonAutorizzazione.put("chiave", "autorizzazione");
-			jsonAutorizzazione.put("valore", "Autorizzazione");
-			array.put(jsonAutorizzazione);
-			
-			JSONObject jsonControlloObbligatorio = JSONFactoryUtil.createJSONObject();
-			jsonControlloObbligatorio.put("chiave", "controlloObbligatorio");
-			jsonControlloObbligatorio.put("valore", "Controllo Obbligatorio");
-			array.put(jsonControlloObbligatorio);
-			
-			
-			JSONObject jsonSorteggiate = JSONFactoryUtil.createJSONObject();
-			jsonSorteggiate.put("chiave", "sorteggiata");
-			jsonSorteggiate.put("valore", "Sorteggiata");
-			array.put(jsonSorteggiate);
-			
-			json.put("tipoPratica" , array);
-			
-		} else if(isStatoPratica){
-			
-			JSONArray array = JSONFactoryUtil.createJSONArray();
-			
-			JSONObject vidimata = JSONFactoryUtil.createJSONObject();
-			vidimata.put("chiave", "VI");
-			vidimata.put("valore", "Vidimata");
-			array.put(vidimata);
-			
-			JSONObject conforme = JSONFactoryUtil.createJSONObject();
-			conforme.put("chiave", "CO");
-			conforme.put("valore", "Conforme");
-			array.put(conforme);
-			
-			JSONObject autorizzata = JSONFactoryUtil.createJSONObject();
-			autorizzata.put("chiave", "AU");
-			autorizzata.put("valore", "Autorizzata");
-			array.put(autorizzata);
-			
-			
-			JSONObject fineLavori = JSONFactoryUtil.createJSONObject();
-			fineLavori.put("chiave", "FL");
-			fineLavori.put("valore", "Fine Lavori");
-			array.put(fineLavori);
-			
-			JSONObject collaudo = JSONFactoryUtil.createJSONObject();
-			collaudo.put("chiave", "CL");
-			collaudo.put("valore", "Collaudo");
-			array.put(collaudo);
-			
-			json.put("statoPratica" , array);
-			
-		}
-
-		out.print(json.toString());
-		
-		out.flush();
-				
-	}
-
-}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java
index e41a5a40..8a0ce843 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java
@@ -57,11 +57,8 @@ import com.liferay.portal.util.PortalUtil;
 public class IntPraticaIndexer extends BaseIndexer {
 
 	public static final String[] CLASS_NAMES = { IntPratica.class.getName() };
-
 	public static final String PORTLET_ID = "1_WAR_portosfeportlet";
-
 	public static final Format DATE_FORMAT = FastDateFormatFactoryUtil.getSimpleDateFormat("yyyyMMdd");
-
 	private static final Log _log = LogFactoryUtil.getLog(IntPraticaIndexer.class);
 
 	public IntPraticaIndexer() {
@@ -85,19 +82,16 @@ public class IntPraticaIndexer extends BaseIndexer {
 	protected void doDelete(Object obj) throws Exception {
 
 		if (Validator.isNotNull(obj)) {
-
 			IntPratica intPratica = (IntPratica) obj;
 			deleteDocument(intPratica.getCompanyId(), intPratica.getIntPraticaId());
-
 		} else {
 			_log.warn("Received a null IntPratica to delete in input.");
 		}
 	}
 
 	/*
-	 * Manifattura Web Group per Regione Siciliana
-	 *
-	 * Modifiche per rendere i campi di testo ricercabili per parole contenute e non per corrispondenza esatta.
+	 * Manifattura Web Group per Regione Siciliana Modifiche per rendere i campi di testo ricercabili per parole
+	 * contenute e non per corrispondenza esatta.
 	 */
 	@Override
 	protected Document doGetDocument(Object obj) throws Exception {
@@ -439,7 +433,6 @@ public class IntPraticaIndexer extends BaseIndexer {
 
 			@Override
 			protected void performAction(Object object) throws PortalException {
-
 				if (object != null) {
 					IntPratica intPratica = (IntPratica) object;
 					if (intPratica != null) {
@@ -464,7 +457,6 @@ public class IntPraticaIndexer extends BaseIndexer {
 					}
 				}
 			}
-
 		};
 		actionableDynamicQuery.setCompanyId(companyId);
 		actionableDynamicQuery.setSearchEngineId(getSearchEngineId());
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeBaseImpl.java
index 22bc9f7a..bbdd77c3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AllegatoManualeImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeImpl
  * @see it.tref.liferay.portos.bo.model.AllegatoManuale
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeCacheModel.java
index b6fdd87d..ac5ee367 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing AllegatoManuale in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManuale
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeImpl.java
index 150a5047..adb69638 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,19 +11,18 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the AllegatoManuale service. Represents a row in the
  * &quot;portos_bo_AllegatoManuale&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.AllegatoManuale} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class AllegatoManualeImpl extends AllegatoManualeBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a allegato manuale model
 	 * instance should use the {@link it.tref.liferay.portos.bo.model.AllegatoManuale} interface instead.
 	 */
-	public AllegatoManualeImpl() {
-	}
-}
\ No newline at end of file
+	public AllegatoManualeImpl() {}
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeModelImpl.java
index afb755ad..1bffb6a0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AllegatoManualeModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.AllegatoManualeModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AllegatoManualeImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeImpl
  * @see it.tref.liferay.portos.bo.model.AllegatoManuale
  * @see it.tref.liferay.portos.bo.model.AllegatoManualeModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneBaseImpl.java
index 01d4d773..c932ad6b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AsseverazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneImpl
  * @see it.tref.liferay.portos.bo.model.Asseverazione
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneCacheModel.java
index 0d25a2d8..9d857c34 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Asseverazione in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Asseverazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java
index cf128f1b..3aae9389 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -29,13 +25,12 @@ import com.liferay.portal.kernel.util.Validator;
 /**
  * The extended model implementation for the Asseverazione service. Represents a row in the
  * &quot;portos_bo_Asseverazione&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Asseverazione} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class AsseverazioneImpl extends AsseverazioneBaseImpl {
@@ -43,8 +38,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a asseverazione model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Asseverazione} interface instead.
 	 */
-	public AsseverazioneImpl() {
-	}
+	public AsseverazioneImpl() {}
 
 	@Override
 	public Map<String, Serializable> getDichiarazioniMap() {
@@ -62,30 +56,30 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 
 		String modello = StringPool.BLANK;
 		switch (this.getTipologia()) {
-		case TipoSoggettoUtil.COLLAUDATORE:
-			modello = "AS-COL";
-			break;
-		case TipoSoggettoUtil.COMMITTENTE:
-			modello = "AS-COM";
-			break;
-		case TipoSoggettoUtil.DIRETTORE_LAVORI:
-			modello = "AS-DIR";
-			break;
-		case TipoSoggettoUtil.DITTA:
-			modello = "AS-COS";
-			break;
-		case TipoSoggettoUtil.GEOLOGO:
-			modello = "AS-GEO";
-			break;
-		case TipoSoggettoUtil.PROGETTISTA:
-			Soggetto soggetto = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(
-					this.getIntPraticaId(), this.getCodiceFiscale(), this.getTipologia());
-			if (soggetto.getAmbitoProfessione().equals("architettonico")) {
-				modello = "AS-PRA";
-			} else {
-				modello = "AS-PRC";
-			}
-			break;
+			case TipoSoggettoUtil.COLLAUDATORE:
+				modello = "AS-COL";
+				break;
+			case TipoSoggettoUtil.COMMITTENTE:
+				modello = "AS-COM";
+				break;
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				modello = "AS-DIR";
+				break;
+			case TipoSoggettoUtil.DITTA:
+				modello = "AS-COS";
+				break;
+			case TipoSoggettoUtil.GEOLOGO:
+				modello = "AS-GEO";
+				break;
+			case TipoSoggettoUtil.PROGETTISTA:
+				Soggetto soggetto = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(
+						this.getIntPraticaId(), this.getCodiceFiscale(), this.getTipologia());
+				if (soggetto.getAmbitoProfessione().equals("architettonico")) {
+					modello = "AS-PRA";
+				} else {
+					modello = "AS-PRC";
+				}
+				break;
 		}
 		return modello;
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneModelImpl.java
index c376f6b3..46dd387c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.AsseverazioneModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AsseverazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneImpl
  * @see it.tref.liferay.portos.bo.model.Asseverazione
  * @see it.tref.liferay.portos.bo.model.AsseverazioneModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoBaseImpl.java
index ef9d5475..f5681113 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AvvisoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoImpl
  * @see it.tref.liferay.portos.bo.model.Avviso
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoCacheModel.java
index 045ab446..2b17e863 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Avviso in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Avviso
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java
index 28caf7c2..382931ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -39,27 +35,21 @@ import com.liferay.portlet.documentlibrary.util.DLUtil;
 /**
  * The extended model implementation for the Avviso service. Represents a row in the &quot;portos_bo_Avviso&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Avviso} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class AvvisoImpl extends AvvisoBaseImpl {
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -2350602144741897095L;
-
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a avviso model instance should
 	 * use the {@link it.tref.liferay.portos.bo.model.Avviso} interface instead.
 	 */
-	public AvvisoImpl() {
 
-	}
+	public AvvisoImpl() {}
 
 	@Override
 	public String getFullDescription() throws PortalException, SystemException {
@@ -69,7 +59,6 @@ public class AvvisoImpl extends AvvisoBaseImpl {
 				: "label.admingeniocivile.avviso.tipoDocumento.avvisomanuale";
 		String fullDescription = LanguageUtil.get(LocaleUtil.ITALIAN, tipoDocumento);
 		if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.VIDIMATA)) {
-
 			if (this.getClassName().equals(DettPratica.class.getName())) {
 				DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(this.getClassPk());
 				if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoModelImpl.java
index 6a3b098c..251f4ba2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoModelImpl.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.AvvisoModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link AvvisoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoImpl
  * @see it.tref.liferay.portos.bo.model.Avviso
  * @see it.tref.liferay.portos.bo.model.AvvisoModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoBaseImpl.java
index cae2ecba..180df728 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link CollaudoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoImpl
  * @see it.tref.liferay.portos.bo.model.Collaudo
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java
index abad7ca5..b219e0b0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Collaudo in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Collaudo
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
index 47562fe8..e1fb7bb4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -24,31 +20,28 @@ import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
-import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 
 /**
  * The extended model implementation for the Collaudo service. Represents a row in the &quot;portos_bo_Collaudo&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Collaudo} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class CollaudoImpl extends CollaudoBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a collaudo model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Collaudo} interface instead.
 	 */
 
-	private static final long serialVersionUID = -6015747485641141721L;
 	private static final Log _log = LogFactoryUtil.getLog(CollaudoImpl.class);
 
-	public CollaudoImpl() {
-	}
+	public CollaudoImpl() {}
 
 	@Override
 	public String getTitle(Locale locale) {
@@ -67,15 +60,12 @@ public class CollaudoImpl extends CollaudoBaseImpl {
 				// dovrebbe essere il primo
 				sb.append(intPratica.getNumeroProgetto()).append(" del ")
 						.append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica()))
-						.append(StringPool.SPACE).append(StringPool.DASH).append(StringPool.SPACE).append(" id ")
-						.append(intPratica.getIntPraticaId());
+						.append(" - id ").append(intPratica.getIntPraticaId());
 			} else {
 				if (Validator.isNotNull(intPratica.getNumeroProgetto())) {
-					sb.append(intPratica.getNumeroProgetto()).append(StringPool.SPACE).append(StringPool.DASH)
-							.append(StringPool.SPACE);
+					sb.append(intPratica.getNumeroProgetto()).append(" - ");
 				}
-				sb.append(getCollaudoId()).append(" (Temporaneo) ").append(StringPool.SPACE).append(StringPool.DASH)
-						.append(StringPool.SPACE).append(" id ").append(intPratica.getIntPraticaId());
+				sb.append(getCollaudoId()).append(" (Temporaneo) -  id ").append(intPratica.getIntPraticaId());
 			}
 		} catch (PortalException | SystemException e) {
 			_log.error(e, e);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java
index db45f3a9..7aee9538 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.CollaudoModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link CollaudoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoImpl
  * @see it.tref.liferay.portos.bo.model.Collaudo
  * @see it.tref.liferay.portos.bo.model.CollaudoModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneBaseImpl.java
index 7a97d907..8fdbd832 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ComuneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneImpl
  * @see it.tref.liferay.portos.bo.model.Comune
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneCacheModel.java
index e91eb85a..23c25713 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Comune in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comune
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java
index bf6bc9b4..2889c174 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java
@@ -1,41 +1,28 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
 
 /**
- * The extended model implementation for the Comune service. Represents a row in
- * the &quot;portos_amm_Comune&quot; database table, with each column mapped to
- * a property of this class.
- *
+ * The extended model implementation for the Comune service. Represents a row in the &quot;portos_amm_Comune&quot;
+ * database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class.
- * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * into the {@link it.tref.liferay.portos.bo.model.Comune} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Comune} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class ComuneImpl extends ComuneBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a comune
-	 * model instance should use the {@link
-	 * it.tref.liferay.portos.bo.model.Comune} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a comune model instance should
+	 * use the {@link it.tref.liferay.portos.bo.model.Comune} interface instead.
 	 */
-	public ComuneImpl() {
-	}
+	public ComuneImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneModelImpl.java
index 60ac2061..c534a868 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ComuneModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ComuneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneImpl
  * @see it.tref.liferay.portos.bo.model.Comune
  * @see it.tref.liferay.portos.bo.model.ComuneModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneBaseImpl.java
index 590c2fe3..5b08b416 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ComunicazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneImpl
  * @see it.tref.liferay.portos.bo.model.Comunicazione
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneCacheModel.java
index 1231fb85..4bc1a829 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Comunicazione in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Comunicazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneImpl.java
index 54ff6e2e..a7e0b4ae 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneImpl.java
@@ -1,34 +1,28 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
 
 /**
- * The extended model implementation for the Comunicazione service. Represents a row in the &quot;portos_bo_Comunicazione&quot; database table, with each column mapped to a property of this class.
- *
+ * The extended model implementation for the Comunicazione service. Represents a row in the
+ * &quot;portos_bo_Comunicazione&quot; database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Comunicazione} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Comunicazione} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class ComunicazioneImpl extends ComunicazioneBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a comunicazione model instance should use the {@link it.tref.liferay.portos.bo.model.Comunicazione} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a comunicazione model instance
+	 * should use the {@link it.tref.liferay.portos.bo.model.Comunicazione} interface instead.
 	 */
-	public ComunicazioneImpl() {
-	}
+	public ComunicazioneImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneModelImpl.java
index a800549a..2cb0e035 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComunicazioneModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ComunicazioneModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ComunicazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneImpl
  * @see it.tref.liferay.portos.bo.model.Comunicazione
  * @see it.tref.liferay.portos.bo.model.ComunicazioneModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneBaseImpl.java
index 7e692ac9..20dae124 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ConfigurazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneImpl
  * @see it.tref.liferay.portos.bo.model.Configurazione
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneCacheModel.java
index 281e9401..fa838b09 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Configurazione in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Configurazione
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneImpl.java
index ccc4653c..ea56c9fa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneImpl.java
@@ -1,34 +1,28 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
 
 /**
- * The extended model implementation for the Configurazione service. Represents a row in the &quot;portos_bo_Configurazione&quot; database table, with each column mapped to a property of this class.
- *
+ * The extended model implementation for the Configurazione service. Represents a row in the
+ * &quot;portos_bo_Configurazione&quot; database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Configurazione} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Configurazione} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
+@SuppressWarnings("serial")
 public class ConfigurazioneImpl extends ConfigurazioneBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a configurazione model instance should use the {@link it.tref.liferay.portos.bo.model.Configurazione} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a configurazione model instance
+	 * should use the {@link it.tref.liferay.portos.bo.model.Configurazione} interface instead.
 	 */
-	public ConfigurazioneImpl() {
-	}
+	public ConfigurazioneImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneModelImpl.java
index 630fe23d..750d5a0d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ConfigurazioneModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ConfigurazioneModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ConfigurazioneImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneImpl
  * @see it.tref.liferay.portos.bo.model.Configurazione
  * @see it.tref.liferay.portos.bo.model.ConfigurazioneModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaBaseImpl.java
index 6af82b1c..7867f3c2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ControlloPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaImpl
  * @see it.tref.liferay.portos.bo.model.ControlloPratica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaCacheModel.java
index 38703722..ee0c2165 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing ControlloPratica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java
index d4bcfcd5..8d7cc43b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java
@@ -1,41 +1,28 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
 
 /**
- * The extended model implementation for the ControlloPratica service.
- * Represents a row in the &quot;portos_bo_ControlloPratica&quot; database
- * table, with each column mapped to a property of this class.
- *
+ * The extended model implementation for the ControlloPratica service. Represents a row in the
+ * &quot;portos_bo_ControlloPratica&quot; database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class.
- * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * into the {@link it.tref.liferay.portos.bo.model.ControlloPratica} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.ControlloPratica} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class ControlloPraticaImpl extends ControlloPraticaBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a controllo
-	 * pratica model instance should use the {@link
-	 * it.tref.liferay.portos.bo.model.ControlloPratica} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a controllo pratica model
+	 * instance should use the {@link it.tref.liferay.portos.bo.model.ControlloPratica} interface instead.
 	 */
-	public ControlloPraticaImpl() {
-	}
+	public ControlloPraticaImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaModelImpl.java
index df616d4d..b1024b0e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaModelImpl.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ControlloPraticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ControlloPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaImpl
  * @see it.tref.liferay.portos.bo.model.ControlloPratica
  * @see it.tref.liferay.portos.bo.model.ControlloPraticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaBaseImpl.java
index 4edc777d..819b0fdc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DelegaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaImpl
  * @see it.tref.liferay.portos.bo.model.Delega
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaCacheModel.java
index 5c375520..8d1bc5cc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Delega in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Delega
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java
index 71c8968a..3c60937c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -22,29 +16,22 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.util.Validator;
 
 /**
- * The extended model implementation for the Delega service. Represents a row in
- * the &quot;portos_bo_Delega&quot; database table, with each column mapped to a
- * property of this class.
- *
+ * The extended model implementation for the Delega service. Represents a row in the &quot;portos_bo_Delega&quot;
+ * database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class.
- * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * into the {@link it.tref.liferay.portos.bo.model.Delega} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Delega} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class DelegaImpl extends DelegaBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a delega
-	 * model instance should use the {@link
-	 * it.tref.liferay.portos.bo.model.Delega} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a delega model instance should
+	 * use the {@link it.tref.liferay.portos.bo.model.Delega} interface instead.
 	 */
-	public DelegaImpl() {
-	}
+	public DelegaImpl() {}
 
 	@Override
 	public Map<String, Serializable> getDichiarazioniMap() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaModelImpl.java
index 34ed7005..31d5dd31 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.DelegaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DelegaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaImpl
  * @see it.tref.liferay.portos.bo.model.Delega
  * @see it.tref.liferay.portos.bo.model.DelegaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaBaseImpl.java
index b0f072c2..db5f2cb3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DettPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaImpl
  * @see it.tref.liferay.portos.bo.model.DettPratica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java
index 1b1c4e29..6a652ddd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing DettPratica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java
index 84d0eec3..e199eac2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -42,13 +38,12 @@ import com.liferay.portal.kernel.util.Validator;
 /**
  * The extended model implementation for the DettPratica service. Represents a row in the
  * &quot;portos_bo_DettPratica&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.DettPratica} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class DettPraticaImpl extends DettPraticaBaseImpl {
@@ -61,9 +56,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 
 	private static final Log _log = LogFactoryUtil.getLog(DettPraticaImpl.class);
 
-	public DettPraticaImpl() {
-
-	}
+	public DettPraticaImpl() {}
 
 	@Override
 	public String getTitle(Locale locale) {
@@ -163,17 +156,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 			int type = (int) column_x[1];
 			String className = StringPool.BLANK;
 			switch (type) {
-			case Types.BIGINT:
-				className = Long.class.getCanonicalName();
-				break;
-			case Types.BOOLEAN:
-			case Types.TIMESTAMP:
-			case Types.VARCHAR:
-				className = String.class.getCanonicalName();
-				break;
-			case Types.INTEGER:
-				className = Integer.class.getCanonicalName();
-				break;
+				case Types.BIGINT:
+					className = Long.class.getCanonicalName();
+					break;
+				case Types.BOOLEAN:
+				case Types.TIMESTAMP:
+				case Types.VARCHAR:
+					className = String.class.getCanonicalName();
+					break;
+				case Types.INTEGER:
+					className = Integer.class.getCanonicalName();
+					break;
 			}
 			Object value = modelAttributes.get(property);
 			sb.append("{\"name\":\"").append(property).append("\",\"class\":\"").append(className)
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java
index 746bb39c..c8599c10 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.DettPraticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DettPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaImpl
  * @see it.tref.liferay.portos.bo.model.DettPratica
  * @see it.tref.liferay.portos.bo.model.DettPraticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaBaseImpl.java
index c3978daa..1ee6bb2e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DocAggiuntivaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaImpl
  * @see it.tref.liferay.portos.bo.model.DocAggiuntiva
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaCacheModel.java
index ae77012f..5f450a9b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing DocAggiuntiva in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntiva
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java
index 58e5f879..20c2a0ca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -20,13 +16,12 @@ import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil;
 /**
  * The extended model implementation for the DocAggiuntiva service. Represents a row in the
  * &quot;portos_bo_DocAggiuntiva&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.DocAggiuntiva} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class DocAggiuntivaImpl extends DocAggiuntivaBaseImpl {
@@ -34,8 +29,7 @@ public class DocAggiuntivaImpl extends DocAggiuntivaBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a doc aggiuntiva model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.DocAggiuntiva} interface instead.
 	 */
-	public DocAggiuntivaImpl() {
-	}
+	public DocAggiuntivaImpl() {}
 
 	@Override
 	public String getFileName() throws PortalException, SystemException {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaModelImpl.java
index 5a49950c..8559def2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.DocAggiuntivaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DocAggiuntivaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaImpl
  * @see it.tref.liferay.portos.bo.model.DocAggiuntiva
  * @see it.tref.liferay.portos.bo.model.DocAggiuntivaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaBaseImpl.java
index f224cd58..2c7c91bb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DocPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaImpl
  * @see it.tref.liferay.portos.bo.model.DocPratica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java
index 6a7265da..079e3265 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing DocPratica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java
index c0a9e58c..c9d4cda6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -23,29 +19,22 @@ import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil;
 import com.liferay.portlet.documentlibrary.util.DLUtil;
 
 /**
- * The extended model implementation for the DocPratica service. Represents a
- * row in the &quot;portos_bo_DocPratica&quot; database table, with each column
- * mapped to a property of this class.
- *
+ * The extended model implementation for the DocPratica service. Represents a row in the
+ * &quot;portos_bo_DocPratica&quot; database table, with each column mapped to a property of this class.
  * <p>
- * Helper methods and all application logic should be put in this class.
- * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * into the {@link it.tref.liferay.portos.bo.model.DocPratica} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.DocPratica} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class DocPraticaImpl extends DocPraticaBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a doc
-	 * pratica model instance should use the {@link
-	 * it.tref.liferay.portos.bo.model.DocPratica} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a doc pratica model instance
+	 * should use the {@link it.tref.liferay.portos.bo.model.DocPratica} interface instead.
 	 */
-	public DocPraticaImpl() {
-	}
+	public DocPraticaImpl() {}
 
 	@Override
 	public String getFileName() throws PortalException, SystemException {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java
index 8ba381cf..9855776c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.DocPraticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link DocPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaImpl
  * @see it.tref.liferay.portos.bo.model.DocPratica
  * @see it.tref.liferay.portos.bo.model.DocPraticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriBaseImpl.java
index 5115f012..957bc280 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link FineLavoriImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriImpl
  * @see it.tref.liferay.portos.bo.model.FineLavori
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java
index ff18c98d..f18fc1a0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing FineLavori in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavori
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
index 835a6118..085a63c8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -30,13 +26,12 @@ import com.liferay.portal.kernel.util.Validator;
 /**
  * The extended model implementation for the FineLavori service. Represents a row in the
  * &quot;portos_bo_FineLavori&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.FineLavori} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class FineLavoriImpl extends FineLavoriBaseImpl {
@@ -47,8 +42,7 @@ public class FineLavoriImpl extends FineLavoriBaseImpl {
 
 	private static final Log _log = LogFactoryUtil.getLog(FineLavoriImpl.class);
 
-	public FineLavoriImpl() {
-	}
+	public FineLavoriImpl() {}
 
 	@Override
 	public String getTitle(Locale locale) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java
index ad5d3d95..1ac3879e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.FineLavoriModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link FineLavoriImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriImpl
  * @see it.tref.liferay.portos.bo.model.FineLavori
  * @see it.tref.liferay.portos.bo.model.FineLavoriModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionBaseImpl.java
index 9da86f74..2ae8f28a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link HistoryWorkflowActionImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionImpl
  * @see it.tref.liferay.portos.bo.model.HistoryWorkflowAction
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionCacheModel.java
index 87323f3b..d838fc08 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing HistoryWorkflowAction in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowAction
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionImpl.java
index 1b03145a..59132ffe 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,14 +11,13 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the HistoryWorkflowAction service. Represents a row in the
  * &quot;portos_bo_HistoryWorkflowAction&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.HistoryWorkflowAction}
  * interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class HistoryWorkflowActionImpl extends HistoryWorkflowActionBaseImpl {
@@ -30,6 +25,5 @@ public class HistoryWorkflowActionImpl extends HistoryWorkflowActionBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a history workflow action model
 	 * instance should use the {@link it.tref.liferay.portos.bo.model.HistoryWorkflowAction} interface instead.
 	 */
-	public HistoryWorkflowActionImpl() {
-	}
+	public HistoryWorkflowActionImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionModelImpl.java
index f5b88ef7..5a69465f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/HistoryWorkflowActionModelImpl.java
@@ -50,7 +50,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.HistoryWorkflowActionModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link HistoryWorkflowActionImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionImpl
  * @see it.tref.liferay.portos.bo.model.HistoryWorkflowAction
  * @see it.tref.liferay.portos.bo.model.HistoryWorkflowActionModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaBaseImpl.java
index f41f918e..6ad73bef 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link IntPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaImpl
  * @see it.tref.liferay.portos.bo.model.IntPratica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java
index dc399fa9..ab88b92c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing IntPratica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java
index 25c0617b..1338e62a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -27,13 +23,12 @@ import com.liferay.portal.kernel.util.Validator;
 /**
  * The extended model implementation for the IntPratica service. Represents a row in the
  * &quot;portos_bo_IntPratica&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.IntPratica} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class IntPraticaImpl extends IntPraticaBaseImpl {
@@ -44,8 +39,7 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 
 	private static final Log _log = LogFactoryUtil.getLog(IntPraticaImpl.class);
 
-	public IntPraticaImpl() {
-	}
+	public IntPraticaImpl() {}
 
 	@Override
 	public String getTitle(Locale locale, boolean completed) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java
index c7e77bf8..5748cb26 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.IntPraticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link IntPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaImpl
  * @see it.tref.liferay.portos.bo.model.IntPratica
  * @see it.tref.liferay.portos.bo.model.IntPraticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoBaseImpl.java
index 1c4e8dd4..d8c5f68f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link PagamentoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoImpl
  * @see it.tref.liferay.portos.bo.model.Pagamento
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java
index 30c7a9f5..e2ed4bdf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Pagamento in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Pagamento
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java
index 38419998..d3bd7dbb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -27,13 +23,12 @@ import com.liferay.portlet.documentlibrary.util.DLUtil;
 /**
  * The extended model implementation for the Pagamento service. Represents a row in the &quot;portos_bo_Pagamento&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Pagamento} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class PagamentoImpl extends PagamentoBaseImpl {
@@ -41,8 +36,7 @@ public class PagamentoImpl extends PagamentoBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a pagamento model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Pagamento} interface instead.
 	 */
-	public PagamentoImpl() {
-	}
+	public PagamentoImpl() {}
 
 	@Override
 	public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java
index dac674ab..2c385422 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.PagamentoModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link PagamentoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoImpl
  * @see it.tref.liferay.portos.bo.model.Pagamento
  * @see it.tref.liferay.portos.bo.model.PagamentoModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoBaseImpl.java
index 201fe33b..3a0b7eda 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ParereGeologoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoImpl
  * @see it.tref.liferay.portos.bo.model.ParereGeologo
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java
index e1816618..bce5ec4a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing ParereGeologo in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologo
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java
index af84d1e6..c972966e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,13 +11,12 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the ParereGeologo service. Represents a row in the
  * &quot;portos_bo_ParereGeologo&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.ParereGeologo} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class ParereGeologoImpl extends ParereGeologoBaseImpl {
@@ -29,6 +24,5 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a parere geologo model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.ParereGeologo} interface instead.
 	 */
-	public ParereGeologoImpl() {
-	}
+	public ParereGeologoImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java
index af4ffe72..6f3ca73f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ParereGeologoModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ParereGeologoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoImpl
  * @see it.tref.liferay.portos.bo.model.ParereGeologo
  * @see it.tref.liferay.portos.bo.model.ParereGeologoModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaBaseImpl.java
index 475c1e83..adcc55e1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ProvinciaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaImpl
  * @see it.tref.liferay.portos.bo.model.Provincia
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaCacheModel.java
index 856d5b2b..223a0b56 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Provincia in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Provincia
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaImpl.java
index eebbcf50..dc14857e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,13 +11,12 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the Provincia service. Represents a row in the &quot;portos_provincia&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Provincia} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class ProvinciaImpl extends ProvinciaBaseImpl {
@@ -29,6 +24,5 @@ public class ProvinciaImpl extends ProvinciaBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a provincia model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Provincia} interface instead.
 	 */
-	public ProvinciaImpl() {
-	}
+	public ProvinciaImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaModelImpl.java
index f26b4a9c..e97130bf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ProvinciaModelImpl.java
@@ -50,7 +50,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.ProvinciaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ProvinciaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaImpl
  * @see it.tref.liferay.portos.bo.model.Provincia
  * @see it.tref.liferay.portos.bo.model.ProvinciaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoBaseImpl.java
index 4ea51598..d8f906f6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link SoggettoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoImpl
  * @see it.tref.liferay.portos.bo.model.Soggetto
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoCacheModel.java
index 5dbb20c0..29729a4b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Soggetto in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Soggetto
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java
index 93a3bdf6..799d0b94 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -20,13 +16,12 @@ import com.liferay.portal.kernel.util.Validator;
 /**
  * The extended model implementation for the Soggetto service. Represents a row in the &quot;portos_bo_Soggetto&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Soggetto} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class SoggettoImpl extends SoggettoBaseImpl {
@@ -34,23 +29,22 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a soggetto model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Soggetto} interface instead.
 	 */
-	public SoggettoImpl() {
-	}
+	public SoggettoImpl() {}
 
 	@Override
 	public String getFullTipologiaSoggetto() {
 
-		String tipologia = LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + getTipologiaSoggetto());
-		String ambito = StringPool.BLANK;
+		StringBuilder sb = new StringBuilder(LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-"
+				+ getTipologiaSoggetto()));
 		if (Validator.isNotNull(getAmbitoProfessione())) {
-			ambito = StringPool.SPACE + StringPool.DASH + StringPool.SPACE;
+			sb.append(StringPool.SPACE).append(StringPool.DASH).append(StringPool.SPACE);
 			if (getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro")) {
-				ambito += getAmbitoAttivita();
+				sb.append(getAmbitoAttivita());
 			} else {
-				ambito += LanguageUtil.get(LocaleUtil.ITALIAN, "label-ambito-" + getAmbitoProfessione());
+				sb.append(LanguageUtil.get(LocaleUtil.ITALIAN, "label-ambito-" + getAmbitoProfessione()));
 			}
 		}
-		return tipologia + ambito;
+		return sb.toString();
 	}
 
 	@Override
@@ -89,9 +83,8 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 	@Override
 	public String getDescrizioneRuolo() {
 
-		String descrizione = getDescrizioneCompleta();
-		String ruolo = LanguageUtil.get(LocaleUtil.getSiteDefault(), "gc-soggetto-" + getTipologiaSoggetto());
-		return descrizione + " - " + ruolo;
+		return getDescrizioneCompleta() + StringPool.SPACE + StringPool.DASH + StringPool.SPACE
+				+ LanguageUtil.get(LocaleUtil.getSiteDefault(), "gc-soggetto-" + getTipologiaSoggetto());
 	}
 
 	@Override
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoModelImpl.java
index 42390b19..2de5bf80 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.SoggettoModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link SoggettoImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoImpl
  * @see it.tref.liferay.portos.bo.model.Soggetto
  * @see it.tref.liferay.portos.bo.model.SoggettoModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioBaseImpl.java
index 72328369..e2dc3bf8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link SorteggioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioImpl
  * @see it.tref.liferay.portos.bo.model.Sorteggio
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java
index 3640b9de..dd18bdda 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Sorteggio in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Sorteggio
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java
index 6e27b130..b2f12ba5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java
@@ -1,28 +1,22 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
 
-
 /**
  * The extended model implementation for the Sorteggio service. Represents a row in the &quot;portos_bo_Sorteggio&quot;
  * database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class SorteggioImpl extends SorteggioBaseImpl {
@@ -30,6 +24,5 @@ public class SorteggioImpl extends SorteggioBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a sorteggio model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface instead.
 	 */
-	public SorteggioImpl() {
-	}
+	public SorteggioImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java
index 06b0a7de..d0277f11 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.SorteggioModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link SorteggioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioImpl
  * @see it.tref.liferay.portos.bo.model.Sorteggio
  * @see it.tref.liferay.portos.bo.model.SorteggioModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaBaseImpl.java
index ce10a2a7..936d6658 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link StoricoSoggettoPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaImpl
  * @see it.tref.liferay.portos.bo.model.StoricoSoggettoPratica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java
index db245843..bfdf3852 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing StoricoSoggettoPratica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPratica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaImpl.java
index 4334f9bb..a86fec00 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,14 +11,13 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the StoricoSoggettoPratica service. Represents a row in the
  * &quot;portos_bo_StoricoSoggettoPratica&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.StoricoSoggettoPratica}
  * interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class StoricoSoggettoPraticaImpl extends StoricoSoggettoPraticaBaseImpl {
@@ -30,6 +25,5 @@ public class StoricoSoggettoPraticaImpl extends StoricoSoggettoPraticaBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a storico soggetto pratica
 	 * model instance should use the {@link it.tref.liferay.portos.bo.model.StoricoSoggettoPratica} interface instead.
 	 */
-	public StoricoSoggettoPraticaImpl() {
-	}
+	public StoricoSoggettoPraticaImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaModelImpl.java
index 308f11ea..246a89c3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.StoricoSoggettoPraticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link StoricoSoggettoPraticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaImpl
  * @see it.tref.liferay.portos.bo.model.StoricoSoggettoPratica
  * @see it.tref.liferay.portos.bo.model.StoricoSoggettoPraticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaBaseImpl.java
index 3c82cbec..89097fce 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link TempisticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaImpl
  * @see it.tref.liferay.portos.bo.model.Tempistica
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaCacheModel.java
index 14fa9fea..d7081dd0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Tempistica in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Tempistica
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaImpl.java
index b4ecc628..52e533f8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,13 +11,12 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the Tempistica service. Represents a row in the
  * &quot;portos_bo_Tempistica&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Tempistica} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class TempisticaImpl extends TempisticaBaseImpl {
@@ -29,6 +24,5 @@ public class TempisticaImpl extends TempisticaBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a tempistica model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Tempistica} interface instead.
 	 */
-	public TempisticaImpl() {
-	}
+	public TempisticaImpl() {}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java
index 8a2bed1d..05ffd869 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java
@@ -51,7 +51,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.TempisticaModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link TempisticaImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaImpl
  * @see it.tref.liferay.portos.bo.model.Tempistica
  * @see it.tref.liferay.portos.bo.model.TempisticaModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioBaseImpl.java
index a59fd3a5..46b63fd8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioBaseImpl.java
@@ -26,7 +26,7 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
  * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link TerritorioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioImpl
  * @see it.tref.liferay.portos.bo.model.Territorio
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioCacheModel.java
index e2beaaa2..e9f77ed9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioCacheModel.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioCacheModel.java
@@ -30,7 +30,7 @@ import java.util.Date;
 /**
  * The cache model class for representing Territorio in entity cache.
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see Territorio
  * @generated
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioImpl.java
index e616da6d..2bd4ec6e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.model.impl;
@@ -15,13 +11,12 @@ package it.tref.liferay.portos.bo.model.impl;
 /**
  * The extended model implementation for the Territorio service. Represents a row in the
  * &quot;portos_bo_Territorio&quot; database table, with each column mapped to a property of this class.
- *
  * <p>
  * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
  * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Territorio} interface.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  */
 @SuppressWarnings("serial")
 public class TerritorioImpl extends TerritorioBaseImpl {
@@ -29,14 +24,15 @@ public class TerritorioImpl extends TerritorioBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a territorio model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.Territorio} interface instead.
 	 */
-	public TerritorioImpl() {
-	}
+	public TerritorioImpl() {}
 
 	@Override
 	public String getZonaFasciaDesc() {
-		String ret = "Zona " + getZona();
+
+		StringBuilder sb = new StringBuilder("Zona ");
+		sb.append(getZona());
 		if (getArticolo61())
-			ret += " - abitato da consolidare";
-		return ret;
+			sb.append(" - abitato da consolidare");
+		return sb.toString();
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioModelImpl.java
index 7c8a2969..51c55ec0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioModelImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TerritorioModelImpl.java
@@ -50,7 +50,7 @@ import java.util.Map;
  * This implementation and its corresponding interface {@link it.tref.liferay.portos.bo.model.TerritorioModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link TerritorioImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioImpl
  * @see it.tref.liferay.portos.bo.model.Territorio
  * @see it.tref.liferay.portos.bo.model.TerritorioModel
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/IntPraticaModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/IntPraticaModelListener.java
index df6dbdfd..c90e80de 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/IntPraticaModelListener.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/IntPraticaModelListener.java
@@ -33,13 +33,14 @@ public class IntPraticaModelListener extends BaseModelListener<IntPratica> {
 			intIndexer.reindex(IntPratica.class.getName(), model.getIntPraticaId());
 			DynamicQuery queryCP = DynamicQueryFactoryUtil.forClass(ControlloPratica.class);
 			queryCP.add(RestrictionsFactoryUtil.eq("intPraticaId", model.getIntPraticaId()));
-			List<ControlloPratica> appList = ControlloPraticaLocalServiceUtil.dynamicQuery(queryCP,
-					QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+			@SuppressWarnings("unchecked")
+			List<ControlloPratica> appList = ControlloPraticaLocalServiceUtil.dynamicQuery(queryCP, QueryUtil.ALL_POS,
+					QueryUtil.ALL_POS);
 			if (appList != null && !appList.isEmpty()) {
 				for (ControlloPratica controlloPratica : appList) {
 					controlloIndexer.delete(model.getCompanyId(), controlloPratica.getUuid());
-					controlloIndexer.reindex(ControlloPratica.class.getName(),
-							controlloPratica.getControlloPraticaId());
+					controlloIndexer
+							.reindex(ControlloPratica.class.getName(), controlloPratica.getControlloPraticaId());
 				}
 			}
 		} catch (SearchException | SystemException e) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoLogModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoLogModelListener.java
index 02bb3788..37e84e02 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoLogModelListener.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoLogModelListener.java
@@ -74,8 +74,8 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	}
 
 	@Override
-	public void onAfterRemoveAssociation(Object classPK, String associationClassName,
-			Object associationClassPK) throws ModelListenerException {
+	public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
+			throws ModelListenerException {
 
 		// TODO Auto-generated method stub
 		super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK);
@@ -111,8 +111,8 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	}
 
 	@Override
-	public void onBeforeRemoveAssociation(Object classPK, String associationClassName,
-			Object associationClassPK) throws ModelListenerException {
+	public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
+			throws ModelListenerException {
 
 		// TODO Auto-generated method stub
 		super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
index 15699fa2..d25a79ea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
@@ -238,7 +238,7 @@ public class FascicoloPortlet extends MVCPortlet {
 	public void searchURL(ActionRequest actionRequest, ActionResponse actionResponse) {
 		String numeroProgetto = actionRequest.getParameter("numeroProgetto");
 		String protocollo = actionRequest.getParameter("protocollo");
-		//String tipoPratica = actionRequest.getParameter("tipoPratica");
+		// String tipoPratica = actionRequest.getParameter("tipoPratica");
 		String tipoProcedura = actionRequest.getParameter("tipoProcedura");
 		String statoPratica = actionRequest.getParameter("statoPratica");
 		String committente = actionRequest.getParameter("committente");
@@ -277,7 +277,7 @@ public class FascicoloPortlet extends MVCPortlet {
 		actionResponse.setRenderParameter("praticaAperta", praticaAperta);
 		actionResponse.setRenderParameter("descIntervento", descInterventoSearch);
 		actionResponse.setRenderParameter("protocollo", protocollo);
-		//actionResponse.setRenderParameter("tipoPratica", tipoPratica);
+		// actionResponse.setRenderParameter("tipoPratica", tipoPratica);
 		actionResponse.setRenderParameter("tipoProcedura", tipoProcedura);
 		actionResponse.setRenderParameter("statoPratica", statoPratica);
 		actionResponse.setRenderParameter("committente", committente);
@@ -342,7 +342,7 @@ public class FascicoloPortlet extends MVCPortlet {
 
 						FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(doc.getDlFileEntryId());
 						inputStream = DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(),
-						        fileEntry.getVersion(), false);
+								fileEntry.getVersion(), false);
 						String s = new String(fileEntry.getTitle().getBytes(StandardCharsets.UTF_8));
 						byte[] b = s.getBytes(StandardCharsets.ISO_8859_1);
 						String name = new String(b, StandardCharsets.ISO_8859_1);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java
index 9f8abd81..420f8e3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java
@@ -176,20 +176,18 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				Role role = null;
 				// TODO listare meglio
 				switch (lastWorkflowTask.getName().toLowerCase()) {
-				case WorkflowConstants.WORKFLOW_TASKNAME_ASSEGNAZIONE:
-					role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), "portos_assegnatore");
-					break;
-				case WorkflowConstants.WORKFLOW_TASKNAME_ESITO:
-					// role =
-					// RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(),
-					// "portos_istruttore");
-					// break;
-					return;
-				case WorkflowConstants.WORKFLOW_TASKNAME_APPROVAZIONE:
-					role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), "portos_approvatore");
-					break;
-				default:
-					break;
+					case WorkflowConstants.WORKFLOW_TASKNAME_ASSEGNAZIONE:
+						role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(),
+								Constants.ROLE_NAME_ASSEGNATORE);
+						break;
+					case WorkflowConstants.WORKFLOW_TASKNAME_ESITO:
+						return;
+					case WorkflowConstants.WORKFLOW_TASKNAME_APPROVAZIONE:
+						role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(),
+								Constants.ROLE_NAME_APPROVATORE);
+						break;
+					default:
+						break;
 				}
 				WorkflowTaskManagerUtil.assignWorkflowTaskToRole(controlloPratica.getCompanyId(),
 						serviceContext.getUserId(), workflowTaskId, role.getRoleId(), StringPool.BLANK, null,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java
index 6b32420a..ea60df04 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java
@@ -65,6 +65,7 @@ public class HomeBOPortlet extends MVCPortlet {
 			for (Long intPraticaId : praticheAttiveAutorizzazioni) {
 				DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class);
 				query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
+				@SuppressWarnings("unchecked")
 				List<ControlloPratica> lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query);
 				if (lista != null && !lista.isEmpty()) {
 					ControlloPratica controlloPratica = lista.get(0);
@@ -74,6 +75,7 @@ public class HomeBOPortlet extends MVCPortlet {
 						queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPratica.getControlloPraticaId()));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione"));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false));
+						@SuppressWarnings("unchecked")
 						List<KaleoTaskInstanceToken> listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil
 								.dynamicQuery(queryKaleo);
 						if (listaKaleo != null && !listaKaleo.isEmpty()) {
@@ -93,6 +95,7 @@ public class HomeBOPortlet extends MVCPortlet {
 			for (Long intPraticaId : praticheAttiveSorteggiate) {
 				DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class);
 				query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
+				@SuppressWarnings("unchecked")
 				List<ControlloPratica> lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query);
 				if (lista != null && !lista.isEmpty()) {
 					ControlloPratica controlloPratica = lista.get(0);
@@ -102,6 +105,7 @@ public class HomeBOPortlet extends MVCPortlet {
 						queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPratica.getControlloPraticaId()));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione"));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false));
+						@SuppressWarnings("unchecked")
 						List<KaleoTaskInstanceToken> listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil
 								.dynamicQuery(queryKaleo);
 						if (listaKaleo != null && !listaKaleo.isEmpty()) {
@@ -121,6 +125,7 @@ public class HomeBOPortlet extends MVCPortlet {
 			for (Long intPraticaId : praticheAttiveControlloObbligatorio) {
 				DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class);
 				query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
+				@SuppressWarnings("unchecked")
 				List<ControlloPratica> lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query);
 				if (lista != null && !lista.isEmpty()) {
 					ControlloPratica controlloPratica = lista.get(0);
@@ -131,6 +136,7 @@ public class HomeBOPortlet extends MVCPortlet {
 						queryKaleo.add(RestrictionsFactoryUtil.eq("className", ControlloPratica.class.getName()));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione"));
 						queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false));
+						@SuppressWarnings("unchecked")
 						List<KaleoTaskInstanceToken> listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil
 								.dynamicQuery(queryKaleo);
 						if (listaKaleo != null && !listaKaleo.isEmpty()) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoAllegatoBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoAllegatoBean.java
index a6f36f44..015099d8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoAllegatoBean.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoAllegatoBean.java
@@ -2,90 +2,84 @@ package it.tref.liferay.portos.bo.report.builder.bean;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class ReportAvvisoAllegatoBean implements Serializable {
 
-  private static final long serialVersionUID = 8560064517183743967L;
+	private String codiceAllegato;
+	private String titoloAllegato;
+	private String sha256Allegato;
+	private String codiceTipoIntegrazione;
+	private String tipoIntegrazione;
+	private long numeroIntegrazione;
+	private boolean aggiornato;
 
-  private String codiceAllegato;
+	public String getCodiceAllegato() {
 
-  private String titoloAllegato;
+		return codiceAllegato;
+	}
 
-  private String sha256Allegato;
+	public void setCodiceAllegato(String codiceAllegato) {
 
-  private String codiceTipoIntegrazione;
-  private String tipoIntegrazione;
-  private long numeroIntegrazione;
-  private boolean aggiornato;
+		this.codiceAllegato = codiceAllegato;
+	}
 
-  public String getCodiceAllegato() {
+	public String getTitoloAllegato() {
 
-    return codiceAllegato;
-  }
+		return titoloAllegato;
+	}
 
-  public void setCodiceAllegato(String codiceAllegato) {
+	public void setTitoloAllegato(String titoloAllegato) {
 
-    this.codiceAllegato = codiceAllegato;
-  }
+		this.titoloAllegato = titoloAllegato;
+	}
 
-  public String getTitoloAllegato() {
+	public String getSha256Allegato() {
 
-    return titoloAllegato;
-  }
+		return sha256Allegato;
+	}
 
-  public void setTitoloAllegato(String titoloAllegato) {
+	public void setSha256Allegato(String sha256Allegato) {
 
-    this.titoloAllegato = titoloAllegato;
-  }
+		this.sha256Allegato = sha256Allegato;
+	}
 
+	public String getCodiceTipoIntegrazione() {
 
-  public String getSha256Allegato() {
+		return codiceTipoIntegrazione;
+	}
 
-    return sha256Allegato;
-  }
+	public void setCodiceTipoIntegrazione(String codiceTipoIntegrazione) {
 
-  public void setSha256Allegato(String sha256Allegato) {
+		this.codiceTipoIntegrazione = codiceTipoIntegrazione;
+	}
 
-    this.sha256Allegato = sha256Allegato;
-  }
+	public String getTipoIntegrazione() {
 
-  public String getCodiceTipoIntegrazione() {
+		return tipoIntegrazione;
+	}
 
-    return codiceTipoIntegrazione;
-  }
+	public void setTipoIntegrazione(String tipoIntegrazione) {
 
-  public void setCodiceTipoIntegrazione(String codiceTipoIntegrazione) {
+		this.tipoIntegrazione = tipoIntegrazione;
+	}
 
-    this.codiceTipoIntegrazione = codiceTipoIntegrazione;
-  }
+	public long getNumeroIntegrazione() {
 
-  public String getTipoIntegrazione() {
+		return numeroIntegrazione;
+	}
 
-    return tipoIntegrazione;
-  }
+	public void setNumeroIntegrazione(long numeroIntegrazione) {
 
-  public void setTipoIntegrazione(String tipoIntegrazione) {
+		this.numeroIntegrazione = numeroIntegrazione;
+	}
 
-    this.tipoIntegrazione = tipoIntegrazione;
-  }
+	public boolean isAggiornato() {
 
-  public long getNumeroIntegrazione() {
+		return aggiornato;
+	}
 
-    return numeroIntegrazione;
-  }
-
-  public void setNumeroIntegrazione(long numeroIntegrazione) {
-
-    this.numeroIntegrazione = numeroIntegrazione;
-  }
-
-  public boolean isAggiornato() {
-
-    return aggiornato;
-  }
-
-  public void setAggiornato(boolean aggiornato) {
-
-    this.aggiornato = aggiornato;
-  }
+	public void setAggiornato(boolean aggiornato) {
 
+		this.aggiornato = aggiornato;
+	}
 }
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 dc489dc7..a7ff08bb 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
@@ -4,10 +4,9 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings("serial")
 public class ReportAvvisoBean implements Serializable {
 
-	private static final long serialVersionUID = -1229588050032694212L;
-
 	private String tipo;
 	private String codiceUnivoco;
 	private String lavoriDi;
@@ -34,9 +33,7 @@ public class ReportAvvisoBean implements Serializable {
 	private long numeroIntegrazione;
 	private String codiceTipoIntegrazione;
 	private String tipoIntegrazione;
-	private long varianteNumero; // numero progressivo
-									// variante in
-									// intPratica
+	private long varianteNumero; // numero progressivo variante in intPratica
 	private Date dataAvviso;
 	private Date dataSorteggio;
 	private String meseSorteggio;
@@ -46,12 +43,9 @@ public class ReportAvvisoBean implements Serializable {
 	private String tipoProcedura;
 	private String po;
 	private String presidio;
-	private String numeroVariante; // numero totali
-									// varianti
-
+	private String numeroVariante; // numero totali varianti
 	private String numeroProtocolloIntegrazione;
 	private String elencoNumeriProtocolloIntegrazione;
-
 	private Boolean parziale;
 	private String parzialeNumero;
 
@@ -107,91 +101,113 @@ public class ReportAvvisoBean implements Serializable {
 
 	@Deprecated
 	public String getAlDirettoreLavori() {
+
 		return direttoreLavori;
 	}
 
 	public String getDirettoreLavori() {
+
 		return direttoreLavori;
 	}
-	
+
 	public void setDirettoreLavori(String direttoreLavori) {
+
 		this.direttoreLavori = direttoreLavori;
 	}
 
 	@Deprecated
 	public String getAlCommittente() {
+
 		return committente;
 	}
-	
+
 	public String getCommittente() {
+
 		return committente;
 	}
 
 	public void setCommittente(String committente) {
+
 		this.committente = committente;
 	}
 
 	public String getCodiceUnivoco() {
+
 		return codiceUnivoco;
 	}
 
 	public void setCodiceUnivoco(String codiceUnivoco) {
+
 		this.codiceUnivoco = codiceUnivoco;
 	}
 
 	public String getNumeroProtocollo() {
+
 		return numeroProtocollo;
 	}
 
 	public void setNumeroProtocollo(String numeroProtocollo) {
+
 		this.numeroProtocollo = numeroProtocollo;
 	}
 
 	public Date getDataProtocolloValido() {
+
 		return dataProtocolloValido;
 	}
 
 	public void setDataProtocolloValido(Date dataProtocolloValido) {
+
 		this.dataProtocolloValido = dataProtocolloValido;
 	}
 
 	public Date getDataProtocolloAnnullato() {
+
 		return dataProtocolloAnnullato;
 	}
 
 	public void setDataProtocolloAnnullato(Date dataProtocolloAnnullato) {
+
 		this.dataProtocolloAnnullato = dataProtocolloAnnullato;
 	}
 
 	public String getNumeroProtocolloAnnullato() {
+
 		return numeroProtocolloAnnullato;
 	}
 
 	public void setNumeroProtocolloAnnullato(String numeroProtocolloAnnullato) {
+
 		this.numeroProtocolloAnnullato = numeroProtocolloAnnullato;
 	}
 
 	public String getNumeroProtocolloValido() {
+
 		return numeroProtocolloValido;
 	}
 
 	public void setNumeroProtocolloValido(String numeroProtocolloValido) {
+
 		this.numeroProtocolloValido = numeroProtocolloValido;
 	}
-	
+
 	public String getTipoAnnullato() {
+
 		return tipoAnnullato;
 	}
-	
+
 	public void setTipoAnnullato(String tipoAnnullato) {
+
 		this.tipoAnnullato = tipoAnnullato;
 	}
-	
+
 	public String getTipoValido() {
+
 		return tipoValido;
 	}
-	
+
 	public void setTipoValido(String tipoValido) {
+
 		this.tipoValido = tipoValido;
 	}
 
@@ -266,10 +282,12 @@ public class ReportAvvisoBean implements Serializable {
 	}
 
 	public List<ReportAvvisoSoggettoBean> getSoggetti() {
+
 		return soggetti;
 	}
 
 	public void setSoggetti(List<ReportAvvisoSoggettoBean> soggetti) {
+
 		this.soggetti = soggetti;
 	}
 
@@ -344,10 +362,12 @@ public class ReportAvvisoBean implements Serializable {
 	}
 
 	public String getDirigente() {
+
 		return dirigente;
 	}
 
 	public void setDirigente(String dirigente) {
+
 		this.dirigente = dirigente;
 	}
 
@@ -371,7 +391,6 @@ public class ReportAvvisoBean implements Serializable {
 		this.po = po;
 	}
 
-
 	public String getNumeroProtocolloIntegrazione() {
 
 		return numeroProtocolloIntegrazione;
@@ -394,27 +413,33 @@ public class ReportAvvisoBean implements Serializable {
 
 	@Deprecated
 	public String getAlCollaudatore() {
+
 		return collaudatore;
 	}
 
 	public String getCollaudatore() {
+
 		return collaudatore;
 	}
 
 	public void setCollaudatore(String collaudatore) {
+
 		this.collaudatore = collaudatore;
 	}
 
 	@Deprecated
 	public String getAlTitolareDigitale() {
+
 		return titolareDigitale;
 	}
 
 	public String getTitolareDigitale() {
+
 		return titolareDigitale;
 	}
-	
+
 	public void setTitolareDigitale(String titolareDigitale) {
+
 		this.titolareDigitale = titolareDigitale;
 	}
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoSoggettoBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoSoggettoBean.java
index 8994ec8d..5adcf5d8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoSoggettoBean.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoSoggettoBean.java
@@ -2,36 +2,40 @@ package it.tref.liferay.portos.bo.report.builder.bean;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class ReportAvvisoSoggettoBean implements Serializable {
 
-  private static final long serialVersionUID = -7450078764022507488L;
+	private String denominazione;
+	private String tipoSoggetto;
+	private String tipoOperazione;
 
-  private String denominazione;
-  private String tipoSoggetto;
-  private String tipoOperazione;
+	public String getDenominazione() {
 
-  public String getDenominazione() {
-    return denominazione;
-  }
+		return denominazione;
+	}
 
-  public void setDenominazione(String denominazione) {
-    this.denominazione = denominazione;
-  }
+	public void setDenominazione(String denominazione) {
 
-  public String getTipoSoggetto() {
-    return tipoSoggetto;
-  }
+		this.denominazione = denominazione;
+	}
 
-  public void setTipoSoggetto(String tipoSoggetto) {
-    this.tipoSoggetto = tipoSoggetto;
-  }
+	public String getTipoSoggetto() {
 
-  public String getTipoOperazione() {
-    return tipoOperazione;
-  }
+		return tipoSoggetto;
+	}
 
-  public void setTipoOperazione(String tipoOperazione) {
-    this.tipoOperazione = tipoOperazione;
-  }
+	public void setTipoSoggetto(String tipoSoggetto) {
 
+		this.tipoSoggetto = tipoSoggetto;
+	}
+
+	public String getTipoOperazione() {
+
+		return tipoOperazione;
+	}
+
+	public void setTipoOperazione(String tipoOperazione) {
+
+		this.tipoOperazione = tipoOperazione;
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportSorteggioBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportSorteggioBean.java
index ea6be59e..e56e6af7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportSorteggioBean.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportSorteggioBean.java
@@ -2,107 +2,106 @@ package it.tref.liferay.portos.bo.report.builder.bean;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class ReportSorteggioBean implements Serializable {
 
-  private static final long serialVersionUID = 3390271948683989472L;
+	private String numeroEstrazione;
+	private String fase;
+	private String fascia;
+	private String pratica;
+	private String citta;
+	private String committente;
+	private String tecnico;
+	private String provincia;
+	private String zona;
 
-  private String numeroEstrazione;
-  private String fase;
-  private String fascia;
-  private String pratica;
-  private String citta;
-  private String committente;
-  private String tecnico;
-  private String provincia;
-  
-  //Task 32561
-  private String zona;
+	public String getProvincia() {
 
-  public String getProvincia() {
+		return provincia;
+	}
 
-    return provincia;
-  }
+	public void setProvincia(String provincia) {
 
-  public void setProvincia(String provincia) {
+		this.provincia = provincia;
+	}
 
-    this.provincia = provincia;
-  }
+	public String getNumeroEstrazione() {
 
-  public String getNumeroEstrazione() {
+		return numeroEstrazione;
+	}
 
-    return numeroEstrazione;
-  }
+	public void setNumeroEstrazione(String numeroEstrazione) {
 
-  public void setNumeroEstrazione(String numeroEstrazione) {
+		this.numeroEstrazione = numeroEstrazione;
+	}
 
-    this.numeroEstrazione = numeroEstrazione;
-  }
+	public String getFase() {
 
-  public String getFase() {
+		return fase;
+	}
 
-    return fase;
-  }
+	public void setFase(String fase) {
 
-  public void setFase(String fase) {
+		this.fase = fase;
+	}
 
-    this.fase = fase;
-  }
+	public String getFascia() {
 
-  public String getFascia() {
+		return fascia;
+	}
 
-    return fascia;
-  }
+	public void setFascia(String fascia) {
 
-  public void setFascia(String fascia) {
+		this.fascia = fascia;
+	}
 
-    this.fascia = fascia;
-  }
+	public String getPratica() {
 
-  public String getPratica() {
+		return pratica;
+	}
 
-    return pratica;
-  }
+	public void setPratica(String pratica) {
 
-  public void setPratica(String pratica) {
+		this.pratica = pratica;
+	}
 
-    this.pratica = pratica;
-  }
+	public String getCitta() {
 
-  public String getCitta() {
+		return citta;
+	}
 
-    return citta;
-  }
+	public void setCitta(String citta) {
 
-  public void setCitta(String citta) {
+		this.citta = citta;
+	}
 
-    this.citta = citta;
-  }
+	public String getCommittente() {
 
-  public String getCommittente() {
+		return committente;
+	}
 
-    return committente;
-  }
+	public void setCommittente(String committente) {
 
-  public void setCommittente(String committente) {
+		this.committente = committente;
+	}
 
-    this.committente = committente;
-  }
+	public String getTecnico() {
 
-  public String getTecnico() {
+		return tecnico;
+	}
 
-    return tecnico;
-  }
+	public void setTecnico(String tecnico) {
 
-  public void setTecnico(String tecnico) {
+		this.tecnico = tecnico;
+	}
 
-    this.tecnico = tecnico;
-  }
+	public String getZona() {
 
-  public String getZona() {
-	  return zona;
-  }
+		return zona;
+	}
 
-  public void setZona(String zona) {
-	  this.zona = zona;
-  }
+	public void setZona(String zona) {
+
+		this.zona = zona;
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java
index 2a3a3f39..e098fbdc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java
@@ -12,8 +12,7 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
 
 public class ReportAvvisoAllegatoBeanBuilder {
 
-	private ReportAvvisoAllegatoBeanBuilder() {
-	}
+	private ReportAvvisoAllegatoBeanBuilder() {}
 
 	public static ReportAvvisoAllegatoBean build(DocPratica docPratica) throws SystemException {
 
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 9463c412..2835da7b 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
@@ -60,8 +60,7 @@ public class ReportAvvisoBeanBuilder {
 
 	private static final SimpleDateFormat dfmt = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
 
-	private ReportAvvisoBeanBuilder() {
-	}
+	private ReportAvvisoBeanBuilder() {}
 
 	public static ReportAvvisoBean build(Avviso avviso, Map<String, Object> parameters) throws SystemException,
 			PortalException {
@@ -249,8 +248,7 @@ public class ReportAvvisoBeanBuilder {
 		if (parameters.containsKey("dataProtocolloAnnullato"))
 			try {
 				bean.setDataProtocolloAnnullato(dfmt.parse((String) parameters.get("dataProtocolloAnnullato")));
-			} catch (ParseException e) {
-			}
+			} catch (ParseException e) {}
 		if (parameters.containsKey("numeroProtocolloAnnullato"))
 			bean.setNumeroProtocolloAnnullato((String) parameters.get("numeroProtocolloAnnullato"));
 		if (parameters.containsKey("tipoAnnullato"))
@@ -258,8 +256,7 @@ public class ReportAvvisoBeanBuilder {
 		if (parameters.containsKey("dataProtocolloValido"))
 			try {
 				bean.setDataProtocolloValido(dfmt.parse((String) parameters.get("dataProtocolloValido")));
-			} catch (ParseException e) {
-			}
+			} catch (ParseException e) {}
 		if (parameters.containsKey("numeroProtocolloValido"))
 			bean.setNumeroProtocolloValido((String) parameters.get("numeroProtocolloValido"));
 		if (parameters.containsKey("tipoValido"))
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java
index 3238bed9..d98b09b6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java
@@ -9,8 +9,7 @@ import com.liferay.portal.kernel.util.Validator;
 
 public class ReportAvvisoSoggettoBeanBuilder {
 
-	private ReportAvvisoSoggettoBeanBuilder() {
-	}
+	private ReportAvvisoSoggettoBeanBuilder() {}
 
 	public static ReportAvvisoSoggettoBean build(Soggetto soggetto, long dettPraticaId) {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java
index fb63cfa4..e19dfceb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java
@@ -14,8 +14,7 @@ import com.liferay.portal.kernel.exception.SystemException;
 
 public class ReportSorteggioBeanBuilder {
 
-	private ReportSorteggioBeanBuilder() {
-	}
+	private ReportSorteggioBeanBuilder() {}
 
 	public static ReportSorteggioBean build(Sorteggio sorteggio) throws SystemException {
 
@@ -27,8 +26,7 @@ public class ReportSorteggioBeanBuilder {
 			reportSorteggioBOBean.setFascia(territorio.getFascia());
 			reportSorteggioBOBean.setZona(territorio.getZona());
 			reportSorteggioBOBean.setProvincia(sorteggio.getProvincia());
-		} catch (PortalException e) {
-		}
+		} catch (PortalException e) {}
 		reportSorteggioBOBean.setNumeroEstrazione(String.valueOf(sorteggio.getNumeroEstrazione()));
 		reportSorteggioBOBean.setTecnico(sorteggio.getTecnico());
 		reportSorteggioBOBean.setCommittente(sorteggio.getCommittente());
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceBaseImpl.java
index 201cbbbe..ed3a354e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AllegatoManualeLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceClpInvoker.java
index ac475578..29008a40 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AllegatoManualeLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceBaseImpl.java
index 26442e91..9c536a99 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AllegatoManualeServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AllegatoManualeServiceImpl
  * @see it.tref.liferay.portos.bo.service.AllegatoManualeServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceClpInvoker.java
index 98303387..d609a2b7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AllegatoManualeServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AllegatoManualeServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AllegatoManualeServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceBaseImpl.java
index ca261a7b..bc022f6f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AsseverazioneLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java
index 5887f5b7..16702744 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AsseverazioneLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceBaseImpl.java
index a7f9db05..081e513b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AsseverazioneServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AsseverazioneServiceImpl
  * @see it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceClpInvoker.java
index 5c53d9b3..7b7edb6f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AsseverazioneServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceBaseImpl.java
index 9244f75f..c73d9aef 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AvvisoLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java
index 1a60e1d8..a620e992 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AvvisoLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceBaseImpl.java
index b7a0edd0..2fcffd0c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.AvvisoServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.AvvisoServiceImpl
  * @see it.tref.liferay.portos.bo.service.AvvisoServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceClpInvoker.java
index 448d73c0..66dda734 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.AvvisoServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class AvvisoServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceBaseImpl.java
index 9ce76240..35cd6450 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.CollaudoLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java
index a75acbb9..2c605d45 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class CollaudoLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceBaseImpl.java
index 3ae9b9f8..9e4a8b12 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.CollaudoServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.CollaudoServiceImpl
  * @see it.tref.liferay.portos.bo.service.CollaudoServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceClpInvoker.java
index cf6b0231..b9adb3d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.CollaudoServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class CollaudoServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceBaseImpl.java
index 127228a0..a4f85630 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ComuneLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ComuneLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceClpInvoker.java
index 6d4d19c9..bc69c3ea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComuneLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceBaseImpl.java
index 750b7161..67bdb02d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ComuneServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ComuneServiceImpl
  * @see it.tref.liferay.portos.bo.service.ComuneServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceClpInvoker.java
index f9a14b7d..1a5a01fa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComuneServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ComuneServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComuneServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceBaseImpl.java
index 20203a58..61935649 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ComunicazioneLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceClpInvoker.java
index 69d796df..e5aeb26c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComunicazioneLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceBaseImpl.java
index 4269de9d..5c0289ec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ComunicazioneServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ComunicazioneServiceImpl
  * @see it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceClpInvoker.java
index b4d66b24..6c83797d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ComunicazioneServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ComunicazioneServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceBaseImpl.java
index 71a90b47..f9ccfabb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ConfigurazioneLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java
index 1713218d..656491d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ConfigurazioneLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceBaseImpl.java
index c9b841e0..88f7b796 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ConfigurazioneServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ConfigurazioneServiceImpl
  * @see it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceClpInvoker.java
index 3bb4f087..17898265 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ConfigurazioneServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceBaseImpl.java
index 95f95abd..097dee4b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceBaseImpl.java
@@ -79,7 +79,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ControlloPraticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java
index ed253a99..8cd07fd8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ControlloPraticaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceBaseImpl.java
index 9f7837aa..2056149d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceBaseImpl.java
@@ -66,7 +66,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ControlloPraticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ControlloPraticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceClpInvoker.java
index 9006d0b7..4666fa42 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ControlloPraticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceBaseImpl.java
index 72ca3750..efad90f5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DelegaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DelegaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceClpInvoker.java
index 52a0fe22..2b138097 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DelegaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceBaseImpl.java
index 2abcc1a4..6588e459 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DelegaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DelegaServiceImpl
  * @see it.tref.liferay.portos.bo.service.DelegaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceClpInvoker.java
index bd48fa15..51f1350a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DelegaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DelegaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DelegaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceBaseImpl.java
index 2081eb1e..964e62a1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceBaseImpl.java
@@ -79,7 +79,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java
index c8031fe5..81a95fed 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DettPraticaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceBaseImpl.java
index 7b86807b..a3c68217 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceBaseImpl.java
@@ -66,7 +66,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DettPraticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DettPraticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.DettPraticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java
index afcc858d..2255dbc7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DettPraticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceBaseImpl.java
index 79ad4ffe..76648ace 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DocAggiuntivaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceClpInvoker.java
index 81270a0d..aa541205 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocAggiuntivaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceBaseImpl.java
index 73c77b7a..7f2e01b4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DocAggiuntivaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DocAggiuntivaServiceImpl
  * @see it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceClpInvoker.java
index c94f2d5b..405d223b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocAggiuntivaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocAggiuntivaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceBaseImpl.java
index 1fb45c7f..eca15d0a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DocPraticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java
index ee209c8f..652a542d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocPraticaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceBaseImpl.java
index 8de4993b..6bb36cf8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.DocPraticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.DocPraticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.DocPraticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceClpInvoker.java
index df0e0372..cf46b262 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class DocPraticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceBaseImpl.java
index da0e9fa1..7e678b33 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.FineLavoriLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java
index 3ffbd0c1..c686b091 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class FineLavoriLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceBaseImpl.java
index 7312dad4..12dff425 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.FineLavoriServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.FineLavoriServiceImpl
  * @see it.tref.liferay.portos.bo.service.FineLavoriServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceClpInvoker.java
index 5549bd6d..389f179f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class FineLavoriServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceBaseImpl.java
index 658922a6..e18a53d7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceClpInvoker.java
index 7eb77f98..ab84a9c2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class HistoryWorkflowActionLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceBaseImpl.java
index 892d18aa..b571eb13 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.HistoryWorkflowActionServiceImpl
  * @see it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceClpInvoker.java
index b6a0a91e..84348290 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/HistoryWorkflowActionServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class HistoryWorkflowActionServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceBaseImpl.java
index c9e824aa..ac03e7a6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.IntPraticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java
index 1a21cc2c..115b7b45 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class IntPraticaLocalServiceClpInvoker {
@@ -198,263 +198,263 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		_methodParameterTypes201 = new String[] { "long" };
 
-		_methodName203 = "sospendiPratica";
+		_methodName202 = "sospendiPratica";
 
-		_methodParameterTypes203 = new String[] { "long", "boolean" };
+		_methodParameterTypes202 = new String[] { "long", "boolean" };
 
-		_methodName204 = "cambiaTitolare";
+		_methodName203 = "cambiaTitolare";
 
-		_methodParameterTypes204 = new String[] {
+		_methodParameterTypes203 = new String[] {
 				"long", "long", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName205 = "updateStatoPratica";
+		_methodName204 = "updateStatoPratica";
 
-		_methodParameterTypes205 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes204 = new String[] { "long", "java.lang.String" };
 
-		_methodName206 = "updateIntPraticaSorteggio";
+		_methodName205 = "updateIntPraticaSorteggio";
 
-		_methodParameterTypes206 = new String[] { "long", "java.util.Date" };
+		_methodParameterTypes205 = new String[] { "long", "java.util.Date" };
 
-		_methodName207 = "updateIntPraticaSorteggio";
+		_methodName206 = "updateIntPraticaSorteggio";
 
-		_methodParameterTypes207 = new String[] {
+		_methodParameterTypes206 = new String[] {
 				"long", "java.util.Date", "java.lang.String"
 			};
 
-		_methodName208 = "findByC_UserId";
+		_methodName207 = "findByC_UserId";
 
-		_methodParameterTypes208 = new String[] { "long", "long", "int", "int" };
+		_methodParameterTypes207 = new String[] { "long", "long", "int", "int" };
 
-		_methodName209 = "countByC_UserId";
+		_methodName208 = "countByC_UserId";
 
-		_methodParameterTypes209 = new String[] { "long", "long" };
+		_methodParameterTypes208 = new String[] { "long", "long" };
 
-		_methodName210 = "updateStatus";
+		_methodName209 = "updateStatus";
 
-		_methodParameterTypes210 = new String[] { "long", "int" };
+		_methodParameterTypes209 = new String[] { "long", "int" };
 
-		_methodName211 = "findByCompanyIdSoggettoProgetti";
+		_methodName210 = "findByCompanyIdSoggettoProgetti";
 
-		_methodParameterTypes211 = new String[] { "long", "long" };
+		_methodParameterTypes210 = new String[] { "long", "long" };
 
-		_methodName212 = "countByCompanyIdSoggettoProgetti";
+		_methodName211 = "countByCompanyIdSoggettoProgetti";
 
-		_methodParameterTypes212 = new String[] { "long", "long" };
+		_methodParameterTypes211 = new String[] { "long", "long" };
 
-		_methodName214 = "findByCompanyIdSoggettoArchivio";
+		_methodName213 = "findByCompanyIdSoggettoArchivio";
 
-		_methodParameterTypes214 = new String[] { "long", "long" };
+		_methodParameterTypes213 = new String[] { "long", "long" };
 
-		_methodName215 = "countByCompanyIdSoggettoArchivio";
+		_methodName214 = "countByCompanyIdSoggettoArchivio";
 
-		_methodParameterTypes215 = new String[] { "long", "long" };
+		_methodParameterTypes214 = new String[] { "long", "long" };
 
-		_methodName217 = "findByCompanyIdSoggettoAltriProgetti";
+		_methodName216 = "findByCompanyIdSoggettoAltriProgetti";
 
-		_methodParameterTypes217 = new String[] { "long", "long", "int", "int" };
+		_methodParameterTypes216 = new String[] { "long", "long", "int", "int" };
 
-		_methodName218 = "countByCompanyIdSoggettoAltriProgetti";
+		_methodName217 = "countByCompanyIdSoggettoAltriProgetti";
 
-		_methodParameterTypes218 = new String[] { "long", "long" };
+		_methodParameterTypes217 = new String[] { "long", "long" };
 
-		_methodName220 = "findByCanAddFineLavori";
+		_methodName219 = "findByCanAddFineLavori";
 
-		_methodParameterTypes220 = new String[] {
+		_methodParameterTypes219 = new String[] {
 				"long", "java.lang.String", "int", "int"
 			};
 
-		_methodName221 = "countByCanAddFineLavori";
+		_methodName220 = "countByCanAddFineLavori";
 
-		_methodParameterTypes221 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes220 = new String[] { "long", "java.lang.String" };
 
-		_methodName223 = "findByCanAddCollaudo";
+		_methodName222 = "findByCanAddCollaudo";
 
-		_methodParameterTypes223 = new String[] {
+		_methodParameterTypes222 = new String[] {
 				"long", "java.lang.String", "int", "int"
 			};
 
-		_methodName224 = "countByCanAddCollaudo";
+		_methodName223 = "countByCanAddCollaudo";
 
-		_methodParameterTypes224 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes223 = new String[] { "long", "java.lang.String" };
 
-		_methodName225 = "search";
+		_methodName224 = "search";
 
-		_methodParameterTypes225 = new String[] { "java.util.List", "int", "int" };
+		_methodParameterTypes224 = new String[] { "java.util.List", "int", "int" };
 
-		_methodName226 = "countSearch";
+		_methodName225 = "countSearch";
 
-		_methodParameterTypes226 = new String[] { "java.util.List" };
+		_methodParameterTypes225 = new String[] { "java.util.List" };
 
-		_methodName227 = "searchWithIntPraticaId";
+		_methodName226 = "searchWithIntPraticaId";
 
-		_methodParameterTypes227 = new String[] {
+		_methodParameterTypes226 = new String[] {
 				"java.util.List", "long", "int", "int"
 			};
 
-		_methodName228 = "countSearchWithIntPraticaId";
+		_methodName227 = "countSearchWithIntPraticaId";
 
-		_methodParameterTypes228 = new String[] { "java.util.List", "long" };
+		_methodParameterTypes227 = new String[] { "java.util.List", "long" };
 
-		_methodName229 = "allegaFileAnnullamento";
+		_methodName228 = "allegaFileAnnullamento";
 
-		_methodParameterTypes229 = new String[] {
+		_methodParameterTypes228 = new String[] {
 				"long", "byte[][]", "java.lang.String", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName230 = "generateFileAnnullamento";
+		_methodName229 = "generateFileAnnullamento";
 
-		_methodParameterTypes230 = new String[] {
+		_methodParameterTypes229 = new String[] {
 				"long", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName231 = "deleteFileAnnullamento";
+		_methodName230 = "deleteFileAnnullamento";
 
-		_methodParameterTypes231 = new String[] { "long" };
+		_methodParameterTypes230 = new String[] { "long" };
 
-		_methodName232 = "completeAnnullamento";
+		_methodName231 = "completeAnnullamento";
 
-		_methodParameterTypes232 = new String[] { "long" };
+		_methodParameterTypes231 = new String[] { "long" };
 
-		_methodName233 = "cambiaIstruttore";
+		_methodName232 = "cambiaIstruttore";
 
-		_methodParameterTypes233 = new String[] { "long", "long", "long" };
+		_methodParameterTypes232 = new String[] { "long", "long", "long" };
 
-		_methodName234 = "countCaricoLavoroCF";
+		_methodName233 = "countCaricoLavoroCF";
 
-		_methodParameterTypes234 = new String[] {
+		_methodParameterTypes233 = new String[] {
 				"long", "java.lang.String", "java.lang.Boolean",
 				"java.lang.Long[][]"
 			};
 
-		_methodName235 = "countCaricoLavoroIstruttore";
+		_methodName234 = "countCaricoLavoroIstruttore";
 
-		_methodParameterTypes235 = new String[] {
+		_methodParameterTypes234 = new String[] {
 				"long", "java.lang.String", "java.lang.Boolean"
 			};
 
-		_methodName236 = "generateReportPratica";
+		_methodName235 = "generateReportPratica";
 
-		_methodParameterTypes236 = new String[] {
+		_methodParameterTypes235 = new String[] {
 				"it.tref.liferay.portos.bo.model.IntPratica", "long"
 			};
 
-		_methodName237 = "updateModifiedDate";
+		_methodName236 = "updateModifiedDate";
 
-		_methodParameterTypes237 = new String[] { "long", "java.util.Date" };
+		_methodParameterTypes236 = new String[] { "long", "java.util.Date" };
 
-		_methodName238 = "countAutorizzazione";
+		_methodName237 = "countAutorizzazione";
 
-		_methodParameterTypes238 = new String[] {
+		_methodParameterTypes237 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName239 = "countSanatorie";
+		_methodName238 = "countSanatorie";
 
-		_methodParameterTypes239 = new String[] {
+		_methodParameterTypes238 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName240 = "countOpereMinoreImportanza";
+		_methodName239 = "countOpereMinoreImportanza";
 
-		_methodParameterTypes240 = new String[] {
+		_methodParameterTypes239 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName241 = "countDeposito";
+		_methodName240 = "countDeposito";
 
-		_methodParameterTypes241 = new String[] {
+		_methodParameterTypes240 = new String[] {
 				"java.util.Date", "java.util.Date", "long", "boolean"
 			};
 
-		_methodName242 = "countVidimate";
+		_methodName241 = "countVidimate";
 
-		_methodParameterTypes242 = new String[] {
+		_methodParameterTypes241 = new String[] {
 				"java.util.Date", "java.util.Date", "long", "java.lang.String",
 				"boolean"
 			};
 
-		_methodName243 = "countControllo";
+		_methodName242 = "countControllo";
 
-		_methodParameterTypes243 = new String[] {
+		_methodParameterTypes242 = new String[] {
 				"java.util.Date", "java.util.Date", "long", "java.lang.String",
 				"boolean"
 			};
 
-		_methodName244 = "findIntPraticaNotExist";
+		_methodName243 = "findIntPraticaNotExist";
 
-		_methodParameterTypes244 = new String[] {  };
+		_methodParameterTypes243 = new String[] {  };
 
-		_methodName245 = "riparaWorkflow";
+		_methodName244 = "riparaWorkflow";
 
-		_methodParameterTypes245 = new String[] {  };
+		_methodParameterTypes244 = new String[] {  };
 
-		_methodName246 = "reIndexFascicolo";
+		_methodName245 = "reIndexFascicolo";
 
-		_methodParameterTypes246 = new String[] {
+		_methodParameterTypes245 = new String[] {
 				"it.tref.liferay.portos.bo.model.IntPratica", "long"
 			};
 
-		_methodName247 = "reIndexFasciolo";
+		_methodName246 = "reIndexFasciolo";
 
-		_methodParameterTypes247 = new String[] { "java.lang.String", "long" };
+		_methodParameterTypes246 = new String[] { "java.lang.String", "long" };
 
-		_methodName248 = "reIndexFasciolo";
+		_methodName247 = "reIndexFasciolo";
 
-		_methodParameterTypes248 = new String[] { "long", "long" };
+		_methodParameterTypes247 = new String[] { "long", "long" };
 
-		_methodName249 = "trovaDoppioni";
+		_methodName248 = "trovaDoppioni";
 
-		_methodParameterTypes249 = new String[] {  };
+		_methodParameterTypes248 = new String[] {  };
 
-		_methodName250 = "findByNumeroProgetto";
+		_methodName249 = "findByNumeroProgetto";
 
-		_methodParameterTypes250 = new String[] { "java.lang.String" };
+		_methodParameterTypes249 = new String[] { "java.lang.String" };
 
-		_methodName251 = "findByTerritorioId";
+		_methodName250 = "findByTerritorioId";
 
-		_methodParameterTypes251 = new String[] { "long" };
+		_methodParameterTypes250 = new String[] { "long" };
 
-		_methodName252 = "reportTempisticheIstruttorieAvvisiAutorizzazioni";
+		_methodName251 = "reportTempisticheIstruttorieAvvisiAutorizzazioni";
 
-		_methodParameterTypes252 = new String[] {
+		_methodParameterTypes251 = new String[] {
 				"java.util.Date", "java.util.Date", "long", "java.lang.String"
 			};
 
-		_methodName253 = "reportTempisticheIstruttorieCalcolaDataSorteggio";
+		_methodName252 = "reportTempisticheIstruttorieCalcolaDataSorteggio";
 
-		_methodParameterTypes253 = new String[] {
+		_methodParameterTypes252 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName254 = "reportPraticheVidimate";
+		_methodName253 = "reportPraticheVidimate";
 
-		_methodParameterTypes254 = new String[] {
+		_methodParameterTypes253 = new String[] {
 				"java.util.Date", "java.util.Date", "long", "java.lang.String"
 			};
 
-		_methodName255 = "reportPraticheVidimateCalcolaDataSorteggio";
+		_methodName254 = "reportPraticheVidimateCalcolaDataSorteggio";
 
-		_methodParameterTypes255 = new String[] {
+		_methodParameterTypes254 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName256 = "countIngressiAutorizzazioni";
+		_methodName255 = "countIngressiAutorizzazioni";
 
-		_methodParameterTypes256 = new String[] {
+		_methodParameterTypes255 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName257 = "countIngressiDepositi";
+		_methodName256 = "countIngressiDepositi";
 
-		_methodParameterTypes257 = new String[] {
+		_methodParameterTypes256 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 
-		_methodName258 = "countIngressiCO";
+		_methodName257 = "countIngressiCO";
 
-		_methodParameterTypes258 = new String[] {
+		_methodParameterTypes257 = new String[] {
 				"java.util.Date", "java.util.Date", "long"
 			};
 	}
@@ -666,181 +666,181 @@ public class IntPraticaLocalServiceClpInvoker {
 			return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName203.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
+		if (_methodName202.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.sospendiPratica(((Long)arguments[0]).longValue(),
 				((Boolean)arguments[1]).booleanValue());
 		}
 
-		if (_methodName204.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
+		if (_methodName203.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.cambiaTitolare(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				(com.liferay.portal.service.ServiceContext)arguments[2]);
 		}
 
-		if (_methodName205.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) {
+		if (_methodName204.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.updateStatoPratica(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName206.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) {
+		if (_methodName205.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(),
 				(java.util.Date)arguments[1]);
 		}
 
-		if (_methodName207.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) {
+		if (_methodName206.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(),
 				(java.util.Date)arguments[1], (java.lang.String)arguments[2]);
 		}
 
-		if (_methodName208.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) {
+		if (_methodName207.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByC_UserId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName209.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) {
+		if (_methodName208.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByC_UserId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName210.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) {
+		if (_methodName209.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) {
 			IntPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue());
 
 			return null;
 		}
 
-		if (_methodName211.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) {
+		if (_methodName210.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName212.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) {
+		if (_methodName211.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName214.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) {
+		if (_methodName213.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName215.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) {
+		if (_methodName214.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName217.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) {
+		if (_methodName216.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName218.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) {
+		if (_methodName217.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName220.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) {
+		if (_methodName219.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName221.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) {
+		if (_methodName220.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName223.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) {
+		if (_methodName222.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName224.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) {
+		if (_methodName223.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName225.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) {
+		if (_methodName224.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.search((java.util.List<java.lang.Long>)arguments[0],
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName226.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) {
+		if (_methodName225.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countSearch((java.util.List<java.lang.Long>)arguments[0]);
 		}
 
-		if (_methodName227.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) {
+		if (_methodName226.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List<java.lang.Long>)arguments[0],
 				((Long)arguments[1]).longValue(),
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName228.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) {
+		if (_methodName227.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countSearchWithIntPraticaId((java.util.List<java.lang.Long>)arguments[0],
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName229.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) {
+		if (_methodName228.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.allegaFileAnnullamento(((Long)arguments[0]).longValue(),
 				(byte[])arguments[1], (java.lang.String)arguments[2],
 				(java.lang.String)arguments[3],
 				(com.liferay.portal.service.ServiceContext)arguments[4]);
 		}
 
-		if (_methodName230.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) {
+		if (_methodName229.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(),
 				(com.liferay.portal.service.ServiceContext)arguments[1]);
 		}
 
-		if (_methodName231.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) {
+		if (_methodName230.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) {
 			IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue());
 
 			return null;
 		}
 
-		if (_methodName232.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) {
+		if (_methodName231.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) {
 			IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue());
 
 			return null;
 		}
 
-		if (_methodName233.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) {
+		if (_methodName232.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) {
 			IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue());
@@ -848,59 +848,67 @@ public class IntPraticaLocalServiceClpInvoker {
 			return null;
 		}
 
-		if (_methodName234.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
+		if (_methodName233.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				(java.lang.Boolean)arguments[2], (java.lang.Long[])arguments[3]);
 		}
 
-		if (_methodName235.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) {
+		if (_methodName234.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.Boolean)arguments[2]);
 		}
 
-		if (_methodName236.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) {
+		if (_methodName235.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0],
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName237.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) {
+		if (_methodName236.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(),
 				(java.util.Date)arguments[1]);
 		}
 
+		if (_methodName237.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) {
+			return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0],
+				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
+		}
+
 		if (_methodName238.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0],
+			return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
 		if (_methodName239.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0],
+			return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
 		if (_methodName240.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0],
-				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
+			return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0],
+				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
+				((Boolean)arguments[3]).booleanValue());
 		}
 
 		if (_methodName241.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0],
+			return IntPraticaLocalServiceUtil.countVidimate((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
-				((Boolean)arguments[3]).booleanValue());
+				(java.lang.String)arguments[3],
+				((Boolean)arguments[4]).booleanValue());
 		}
 
 		if (_methodName242.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countVidimate((java.util.Date)arguments[0],
+			return IntPraticaLocalServiceUtil.countControllo((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
 				(java.lang.String)arguments[3],
 				((Boolean)arguments[4]).booleanValue());
@@ -908,25 +916,25 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		if (_methodName243.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.countControllo((java.util.Date)arguments[0],
-				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
-				(java.lang.String)arguments[3],
-				((Boolean)arguments[4]).booleanValue());
+			return IntPraticaLocalServiceUtil.findIntPraticaNotExist();
 		}
 
 		if (_methodName244.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.findIntPraticaNotExist();
+			return IntPraticaLocalServiceUtil.riparaWorkflow();
 		}
 
 		if (_methodName245.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.riparaWorkflow();
+			IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0],
+				((Long)arguments[1]).longValue());
+
+			return null;
 		}
 
 		if (_methodName246.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) {
-			IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0],
+			IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0],
 				((Long)arguments[1]).longValue());
 
 			return null;
@@ -934,7 +942,7 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		if (_methodName247.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) {
-			IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0],
+			IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 
 			return null;
@@ -942,67 +950,59 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		if (_methodName248.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) {
-			IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(),
-				((Long)arguments[1]).longValue());
-
-			return null;
+			return IntPraticaLocalServiceUtil.trovaDoppioni();
 		}
 
 		if (_methodName249.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.trovaDoppioni();
+			return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]);
 		}
 
 		if (_methodName250.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]);
+			return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName251.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) {
-			return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue());
-		}
-
-		if (_methodName252.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
 				(java.lang.String)arguments[3]);
 		}
 
-		if (_methodName253.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) {
+		if (_methodName252.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieCalcolaDataSorteggio((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName254.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) {
+		if (_methodName253.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.reportPraticheVidimate((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue(),
 				(java.lang.String)arguments[3]);
 		}
 
-		if (_methodName255.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) {
+		if (_methodName254.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.reportPraticheVidimateCalcolaDataSorteggio((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName256.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) {
+		if (_methodName255.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countIngressiAutorizzazioni((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName257.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) {
+		if (_methodName256.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countIngressiDepositi((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName258.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) {
+		if (_methodName257.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.countIngressiCO((java.util.Date)arguments[0],
 				(java.util.Date)arguments[1], ((Long)arguments[2]).longValue());
 		}
@@ -1080,6 +1080,8 @@ public class IntPraticaLocalServiceClpInvoker {
 	private String[] _methodParameterTypes199;
 	private String _methodName201;
 	private String[] _methodParameterTypes201;
+	private String _methodName202;
+	private String[] _methodParameterTypes202;
 	private String _methodName203;
 	private String[] _methodParameterTypes203;
 	private String _methodName204;
@@ -1098,20 +1100,20 @@ public class IntPraticaLocalServiceClpInvoker {
 	private String[] _methodParameterTypes210;
 	private String _methodName211;
 	private String[] _methodParameterTypes211;
-	private String _methodName212;
-	private String[] _methodParameterTypes212;
+	private String _methodName213;
+	private String[] _methodParameterTypes213;
 	private String _methodName214;
 	private String[] _methodParameterTypes214;
-	private String _methodName215;
-	private String[] _methodParameterTypes215;
+	private String _methodName216;
+	private String[] _methodParameterTypes216;
 	private String _methodName217;
 	private String[] _methodParameterTypes217;
-	private String _methodName218;
-	private String[] _methodParameterTypes218;
+	private String _methodName219;
+	private String[] _methodParameterTypes219;
 	private String _methodName220;
 	private String[] _methodParameterTypes220;
-	private String _methodName221;
-	private String[] _methodParameterTypes221;
+	private String _methodName222;
+	private String[] _methodParameterTypes222;
 	private String _methodName223;
 	private String[] _methodParameterTypes223;
 	private String _methodName224;
@@ -1182,6 +1184,4 @@ public class IntPraticaLocalServiceClpInvoker {
 	private String[] _methodParameterTypes256;
 	private String _methodName257;
 	private String[] _methodParameterTypes257;
-	private String _methodName258;
-	private String[] _methodParameterTypes258;
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceBaseImpl.java
index 5273411b..02ceb8ce 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.IntPraticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.IntPraticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.IntPraticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java
index 962d8446..fc94e5a7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class IntPraticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceBaseImpl.java
index 704f1797..0a669f18 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.PagamentoLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java
index ff5874b7..16d42f8a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class PagamentoLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceBaseImpl.java
index 4c7915b2..8d746b3a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.PagamentoServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.PagamentoServiceImpl
  * @see it.tref.liferay.portos.bo.service.PagamentoServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java
index 06facbba..ca4b5efa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.PagamentoServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class PagamentoServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceBaseImpl.java
index 3a6f0660..b02a298a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ParereGeologoLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java
index 8d65597f..0f1e923e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ParereGeologoLocalServiceClpInvoker {
@@ -137,86 +137,86 @@ public class ParereGeologoLocalServiceClpInvoker {
 				"com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName188 = "updateParereGeologo";
+		_methodName187 = "updateParereGeologo";
 
-		_methodParameterTypes188 = new String[] {
+		_methodParameterTypes187 = new String[] {
 				"long", "java.lang.String", "byte[][]", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
+		_methodName188 = "deleteParereGeologo";
+
+		_methodParameterTypes188 = new String[] { "long" };
+
 		_methodName189 = "deleteParereGeologo";
 
-		_methodParameterTypes189 = new String[] { "long" };
+		_methodParameterTypes189 = new String[] {
+				"it.tref.liferay.portos.bo.model.ParereGeologo"
+			};
 
-		_methodName190 = "deleteParereGeologo";
+		_methodName190 = "updateParereGeologo";
 
 		_methodParameterTypes190 = new String[] {
 				"it.tref.liferay.portos.bo.model.ParereGeologo"
 			};
 
-		_methodName191 = "updateParereGeologo";
+		_methodName191 = "remove";
 
 		_methodParameterTypes191 = new String[] {
 				"it.tref.liferay.portos.bo.model.ParereGeologo"
 			};
 
-		_methodName192 = "remove";
+		_methodName192 = "findByIntPraticaId";
 
-		_methodParameterTypes192 = new String[] {
-				"it.tref.liferay.portos.bo.model.ParereGeologo"
-			};
+		_methodParameterTypes192 = new String[] { "long", "int", "int" };
 
-		_methodName193 = "findByIntPraticaId";
+		_methodName193 = "countByIntPraticaId";
 
-		_methodParameterTypes193 = new String[] { "long", "int", "int" };
+		_methodParameterTypes193 = new String[] { "long" };
 
-		_methodName194 = "countByIntPraticaId";
+		_methodName194 = "findByIntPraticaIdParereVuoto";
 
-		_methodParameterTypes194 = new String[] { "long" };
+		_methodParameterTypes194 = new String[] { "long", "int", "int" };
 
-		_methodName195 = "findByIntPraticaIdParereVuoto";
+		_methodName195 = "countByIntPraticaIdParereVuoto";
 
-		_methodParameterTypes195 = new String[] { "long", "int", "int" };
+		_methodParameterTypes195 = new String[] { "long" };
 
-		_methodName196 = "countByIntPraticaIdParereVuoto";
+		_methodName196 = "findByIntPraticaId_GeologoId";
 
-		_methodParameterTypes196 = new String[] { "long" };
+		_methodParameterTypes196 = new String[] { "long", "long", "int", "int" };
 
-		_methodName197 = "findByIntPraticaId_GeologoId";
+		_methodName197 = "countByIntPraticaId_GeologoId";
 
-		_methodParameterTypes197 = new String[] { "long", "long", "int", "int" };
+		_methodParameterTypes197 = new String[] { "long", "long" };
 
-		_methodName198 = "countByIntPraticaId_GeologoId";
+		_methodName198 = "findByGeologoId";
 
-		_methodParameterTypes198 = new String[] { "long", "long" };
+		_methodParameterTypes198 = new String[] { "long", "int", "int" };
 
-		_methodName199 = "findByGeologoId";
+		_methodName199 = "findByCompanyIdGroupId";
 
-		_methodParameterTypes199 = new String[] { "long", "int", "int" };
+		_methodParameterTypes199 = new String[] { "long", "long" };
 
-		_methodName200 = "findByCompanyIdGroupId";
+		_methodName200 = "countByGeologoId";
 
-		_methodParameterTypes200 = new String[] { "long", "long" };
+		_methodParameterTypes200 = new String[] { "long" };
 
-		_methodName201 = "countByGeologoId";
+		_methodName201 = "findNotParereByGeologoId";
 
-		_methodParameterTypes201 = new String[] { "long" };
+		_methodParameterTypes201 = new String[] { "long", "int", "int" };
 
-		_methodName202 = "findNotParereByGeologoId";
+		_methodName202 = "findWithParereByGeologoId";
 
 		_methodParameterTypes202 = new String[] { "long", "int", "int" };
 
-		_methodName203 = "findWithParereByGeologoId";
+		_methodName203 = "countFindNotParereByGeologoId";
 
-		_methodParameterTypes203 = new String[] { "long", "int", "int" };
+		_methodParameterTypes203 = new String[] { "long" };
 
-		_methodName204 = "countFindNotParereByGeologoId";
+		_methodName204 = "countFindWithParereByGeologoId";
 
 		_methodParameterTypes204 = new String[] { "long" };
-
-		_methodName205 = "countFindWithParereByGeologoId";
-
-		_methodParameterTypes205 = new String[] { "long" };
 	}
 
 	public Object invokeMethod(String name, String[] parameterTypes,
@@ -352,111 +352,111 @@ public class ParereGeologoLocalServiceClpInvoker {
 				(com.liferay.portal.service.ServiceContext)arguments[3]);
 		}
 
-		if (_methodName188.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) {
+		if (_methodName187.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.updateParereGeologo(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (byte[])arguments[2],
 				(java.lang.String)arguments[3],
 				(com.liferay.portal.service.ServiceContext)arguments[4]);
 		}
 
+		if (_methodName188.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) {
+			return ParereGeologoLocalServiceUtil.deleteParereGeologo(((Long)arguments[0]).longValue());
+		}
+
 		if (_methodName189.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.deleteParereGeologo(((Long)arguments[0]).longValue());
+			return ParereGeologoLocalServiceUtil.deleteParereGeologo((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
 		}
 
 		if (_methodName190.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.deleteParereGeologo((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
+			return ParereGeologoLocalServiceUtil.updateParereGeologo((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
 		}
 
 		if (_methodName191.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.updateParereGeologo((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
+			return ParereGeologoLocalServiceUtil.remove((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
 		}
 
 		if (_methodName192.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.remove((it.tref.liferay.portos.bo.model.ParereGeologo)arguments[0]);
-		}
-
-		if (_methodName193.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByIntPraticaId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName194.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) {
+		if (_methodName193.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countByIntPraticaId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName195.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) {
+		if (_methodName194.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByIntPraticaIdParereVuoto(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName196.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) {
+		if (_methodName195.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countByIntPraticaIdParereVuoto(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName197.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) {
+		if (_methodName196.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByIntPraticaId_GeologoId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName198.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) {
+		if (_methodName197.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countByIntPraticaId_GeologoId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName199.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) {
+		if (_methodName198.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByGeologoId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName200.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) {
+		if (_methodName199.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByCompanyIdGroupId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName201.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) {
+		if (_methodName200.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countByGeologoId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName202.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) {
+		if (_methodName201.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findNotParereByGeologoId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName203.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
+		if (_methodName202.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findWithParereByGeologoId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName204.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
+		if (_methodName203.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countFindNotParereByGeologoId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName205.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) {
+		if (_methodName204.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countFindWithParereByGeologoId(((Long)arguments[0]).longValue());
 		}
 
@@ -509,6 +509,8 @@ public class ParereGeologoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes181;
 	private String _methodName186;
 	private String[] _methodParameterTypes186;
+	private String _methodName187;
+	private String[] _methodParameterTypes187;
 	private String _methodName188;
 	private String[] _methodParameterTypes188;
 	private String _methodName189;
@@ -543,6 +545,4 @@ public class ParereGeologoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes203;
 	private String _methodName204;
 	private String[] _methodParameterTypes204;
-	private String _methodName205;
-	private String[] _methodParameterTypes205;
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceBaseImpl.java
index de4ad2d3..0f0fd429 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ParereGeologoServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ParereGeologoServiceImpl
  * @see it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java
index 77da1f4a..c235f235 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ParereGeologoServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceBaseImpl.java
index 3d1c2224..197f98d6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ProvinciaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceClpInvoker.java
index ea7f5105..6247148f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ProvinciaLocalServiceClpInvoker {
@@ -114,75 +114,71 @@ public class ProvinciaLocalServiceClpInvoker {
 
 		_methodParameterTypes173 = new String[] { "java.lang.String" };
 
-		_methodName178 = "getProvinceAttive";
+		_methodName178 = "addProvincia";
 
-		_methodParameterTypes178 = new String[] {  };
-
-		_methodName179 = "addProvincia";
-
-		_methodParameterTypes179 = new String[] {
+		_methodParameterTypes178 = new String[] {
 				"long", "java.lang.String", "java.lang.String",
 				"java.lang.String", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName180 = "findAll";
+		_methodName179 = "findAll";
 
-		_methodParameterTypes180 = new String[] {
+		_methodParameterTypes179 = new String[] {
 				"int", "int", "com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName181 = "countByCompanyId";
+		_methodName180 = "countByCompanyId";
 
-		_methodParameterTypes181 = new String[] { "long" };
+		_methodParameterTypes180 = new String[] { "long" };
 
-		_methodName182 = "countByKeywords";
+		_methodName181 = "countByKeywords";
 
-		_methodParameterTypes182 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes181 = new String[] { "long", "java.lang.String" };
 
-		_methodName183 = "deleteProvincia";
+		_methodName182 = "deleteProvincia";
 
-		_methodParameterTypes183 = new String[] { "long" };
+		_methodParameterTypes182 = new String[] { "long" };
 
-		_methodName184 = "deleteProvincia";
+		_methodName183 = "deleteProvincia";
 
-		_methodParameterTypes184 = new String[] {
+		_methodParameterTypes183 = new String[] {
 				"it.tref.liferay.portos.bo.model.Provincia"
 			};
 
-		_methodName185 = "fetchByC_C";
+		_methodName184 = "fetchByC_C";
 
-		_methodParameterTypes185 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes184 = new String[] { "long", "java.lang.String" };
 
-		_methodName186 = "fetchByC_S";
+		_methodName185 = "fetchByC_S";
 
-		_methodParameterTypes186 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes185 = new String[] { "long", "java.lang.String" };
 
-		_methodName187 = "findByCompanyId";
+		_methodName186 = "findByCompanyId";
 
-		_methodParameterTypes187 = new String[] { "long", "int", "int" };
+		_methodParameterTypes186 = new String[] { "long", "int", "int" };
 
-		_methodName188 = "findByCompanyId";
+		_methodName187 = "findByCompanyId";
 
-		_methodParameterTypes188 = new String[] {
+		_methodParameterTypes187 = new String[] {
 				"long", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName189 = "findByC_C";
+		_methodName188 = "findByC_C";
 
-		_methodParameterTypes189 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes188 = new String[] { "long", "java.lang.String" };
 
-		_methodName190 = "findByKeywords";
+		_methodName189 = "findByKeywords";
 
-		_methodParameterTypes190 = new String[] {
+		_methodParameterTypes189 = new String[] {
 				"long", "java.lang.String", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName192 = "updateProvincia";
+		_methodName191 = "updateProvincia";
 
-		_methodParameterTypes192 = new String[] {
+		_methodParameterTypes191 = new String[] {
 				"long", "long", "java.lang.String", "java.lang.String",
 				"java.lang.String", "com.liferay.portal.service.ServiceContext"
 			};
@@ -291,80 +287,75 @@ public class ProvinciaLocalServiceClpInvoker {
 
 		if (_methodName178.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes178, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.getProvinceAttive();
-		}
-
-		if (_methodName179.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes179, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.addProvincia(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2],
 				(java.lang.String)arguments[3], (java.lang.String)arguments[4],
 				(com.liferay.portal.service.ServiceContext)arguments[5]);
 		}
 
-		if (_methodName180.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) {
+		if (_methodName179.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes179, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.findAll(((Integer)arguments[0]).intValue(),
 				((Integer)arguments[1]).intValue(),
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[2]);
 		}
 
+		if (_methodName180.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) {
+			return ProvinciaLocalServiceUtil.countByCompanyId(((Long)arguments[0]).longValue());
+		}
+
 		if (_methodName181.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.countByCompanyId(((Long)arguments[0]).longValue());
+			return ProvinciaLocalServiceUtil.countByKeywords(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName182.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.countByKeywords(((Long)arguments[0]).longValue(),
-				(java.lang.String)arguments[1]);
+			return ProvinciaLocalServiceUtil.deleteProvincia(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName183.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.deleteProvincia(((Long)arguments[0]).longValue());
+			return ProvinciaLocalServiceUtil.deleteProvincia((it.tref.liferay.portos.bo.model.Provincia)arguments[0]);
 		}
 
 		if (_methodName184.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.deleteProvincia((it.tref.liferay.portos.bo.model.Provincia)arguments[0]);
+			return ProvinciaLocalServiceUtil.fetchByC_C(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName185.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.fetchByC_C(((Long)arguments[0]).longValue(),
+			return ProvinciaLocalServiceUtil.fetchByC_S(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName186.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) {
-			return ProvinciaLocalServiceUtil.fetchByC_S(((Long)arguments[0]).longValue(),
-				(java.lang.String)arguments[1]);
-		}
-
-		if (_methodName187.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.findByCompanyId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName188.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) {
+		if (_methodName187.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.findByCompanyId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue(),
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[3]);
 		}
 
-		if (_methodName189.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) {
+		if (_methodName188.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.findByC_C(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName190.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) {
+		if (_methodName189.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.findByKeywords(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Integer)arguments[2]).intValue(),
@@ -372,8 +363,8 @@ public class ProvinciaLocalServiceClpInvoker {
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[4]);
 		}
 
-		if (_methodName192.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) {
+		if (_methodName191.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) {
 			return ProvinciaLocalServiceUtil.updateProvincia(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				(java.lang.String)arguments[2], (java.lang.String)arguments[3],
@@ -444,8 +435,6 @@ public class ProvinciaLocalServiceClpInvoker {
 	private String[] _methodParameterTypes188;
 	private String _methodName189;
 	private String[] _methodParameterTypes189;
-	private String _methodName190;
-	private String[] _methodParameterTypes190;
-	private String _methodName192;
-	private String[] _methodParameterTypes192;
+	private String _methodName191;
+	private String[] _methodParameterTypes191;
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceBaseImpl.java
index 4a55e73a..3ccc5457 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.ProvinciaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.ProvinciaServiceImpl
  * @see it.tref.liferay.portos.bo.service.ProvinciaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceClpInvoker.java
index a083cadf..64c8d0e1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ProvinciaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.ProvinciaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class ProvinciaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceBaseImpl.java
index 5264e2af..caf4236b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.SoggettoLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java
index 79507515..6b336e67 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SoggettoLocalServiceClpInvoker {
@@ -259,337 +259,337 @@ public class SoggettoLocalServiceClpInvoker {
 				"com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName195 = "fetchByOldSoggettId";
+		_methodName194 = "fetchByOldSoggettId";
+
+		_methodParameterTypes194 = new String[] { "long" };
+
+		_methodName195 = "findByIntPratica";
 
 		_methodParameterTypes195 = new String[] { "long" };
 
-		_methodName196 = "findByIntPratica";
+		_methodName196 = "countByIntPratica";
 
 		_methodParameterTypes196 = new String[] { "long" };
 
-		_methodName197 = "countByIntPratica";
+		_methodName197 = "findByDettPratica";
 
 		_methodParameterTypes197 = new String[] { "long" };
 
-		_methodName198 = "findByDettPratica";
+		_methodName198 = "countByDettPratica";
 
 		_methodParameterTypes198 = new String[] { "long" };
 
-		_methodName199 = "countByDettPratica";
-
-		_methodParameterTypes199 = new String[] { "long" };
+		_methodName199 = "findByDettPratica_CodiceFiscale";
 
-		_methodName200 = "findByDettPratica_CodiceFiscale";
+		_methodParameterTypes199 = new String[] { "long", "java.lang.String" };
 
-		_methodParameterTypes200 = new String[] { "long", "java.lang.String" };
+		_methodName200 = "findByDettPratica_CodiceFiscale_Rimosso";
 
-		_methodName201 = "findByDettPratica_CodiceFiscale_Rimosso";
-
-		_methodParameterTypes201 = new String[] {
+		_methodParameterTypes200 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName202 = "countByDettPratica_CodiceFiscale";
+		_methodName201 = "countByDettPratica_CodiceFiscale";
 
-		_methodParameterTypes202 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes201 = new String[] { "long", "java.lang.String" };
 
-		_methodName203 = "countByDettPratica_CodiceFiscale_Rimosso";
+		_methodName202 = "countByDettPratica_CodiceFiscale_Rimosso";
 
-		_methodParameterTypes203 = new String[] {
+		_methodParameterTypes202 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName204 = "findByIntPratica_CodiceFiscale";
+		_methodName203 = "findByIntPratica_CodiceFiscale";
 
-		_methodParameterTypes204 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes203 = new String[] { "long", "java.lang.String" };
 
-		_methodName205 = "findByIntPratica_CodiceFiscale_Rimosso";
+		_methodName204 = "findByIntPratica_CodiceFiscale_Rimosso";
 
-		_methodParameterTypes205 = new String[] {
+		_methodParameterTypes204 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName206 = "countByIntPratica_CodiceFiscale";
+		_methodName205 = "countByIntPratica_CodiceFiscale";
 
-		_methodParameterTypes206 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes205 = new String[] { "long", "java.lang.String" };
 
-		_methodName207 = "countByIntPratica_CodiceFiscale_Rimosso";
+		_methodName206 = "countByIntPratica_CodiceFiscale_Rimosso";
 
-		_methodParameterTypes207 = new String[] {
+		_methodParameterTypes206 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName208 = "findByIntPratica_TipologiaSoggetto";
+		_methodName207 = "findByIntPratica_TipologiaSoggetto";
 
-		_methodParameterTypes208 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes207 = new String[] { "long", "java.lang.String" };
 
-		_methodName209 = "findByDettPratica_TipologiaSoggetto";
+		_methodName208 = "findByDettPratica_TipologiaSoggetto";
 
-		_methodParameterTypes209 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes208 = new String[] { "long", "java.lang.String" };
 
-		_methodName210 = "findByDettPratica_TipologiaSoggetto_CodiceFiscale";
+		_methodName209 = "findByDettPratica_TipologiaSoggetto_CodiceFiscale";
 
-		_methodParameterTypes210 = new String[] {
+		_methodParameterTypes209 = new String[] {
 				"long", "java.lang.String", "java.lang.String"
 			};
 
-		_methodName211 = "findByIntPratica_TipologiaSoggetto_Rimosso";
+		_methodName210 = "findByIntPratica_TipologiaSoggetto_Rimosso";
 
-		_methodParameterTypes211 = new String[] {
+		_methodParameterTypes210 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName212 = "findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione";
+		_methodName211 = "findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione";
 
-		_methodParameterTypes212 = new String[] {
+		_methodParameterTypes211 = new String[] {
 				"long", "java.lang.String", "long"
 			};
 
-		_methodName213 = "getValidByIntPratica";
+		_methodName212 = "getValidByIntPratica";
+
+		_methodParameterTypes212 = new String[] { "long" };
+
+		_methodName213 = "getValidByDettPratica";
 
 		_methodParameterTypes213 = new String[] { "long" };
 
-		_methodName214 = "getValidByDettPratica";
+		_methodName214 = "countValidByIntPratica";
 
 		_methodParameterTypes214 = new String[] { "long" };
 
-		_methodName215 = "countValidByIntPratica";
+		_methodName216 = "getValidTmpByIntPratica";
 
-		_methodParameterTypes215 = new String[] { "long" };
+		_methodParameterTypes216 = new String[] { "long" };
 
-		_methodName217 = "getValidTmpByIntPratica";
+		_methodName217 = "countValidTmpByIntPratica";
 
 		_methodParameterTypes217 = new String[] { "long" };
 
-		_methodName218 = "countValidTmpByIntPratica";
+		_methodName219 = "getTmpNotCompletedByDettPratica";
 
-		_methodParameterTypes218 = new String[] { "long" };
+		_methodParameterTypes219 = new String[] { "long" };
 
-		_methodName220 = "getTmpNotCompletedByDettPratica";
+		_methodName220 = "countTmpNotCompletedByDettPratica";
 
 		_methodParameterTypes220 = new String[] { "long" };
 
-		_methodName221 = "countTmpNotCompletedByDettPratica";
+		_methodName222 = "getSoggettiPrincipaliValidTmpByDettPratica";
 
-		_methodParameterTypes221 = new String[] { "long" };
+		_methodParameterTypes222 = new String[] { "long" };
 
-		_methodName223 = "getSoggettiPrincipaliValidTmpByDettPratica";
+		_methodName223 = "getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
 
-		_methodParameterTypes223 = new String[] { "long" };
+		_methodParameterTypes223 = new String[] { "long", "java.lang.String[][]" };
 
-		_methodName224 = "getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
+		_methodName224 = "countSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
 
 		_methodParameterTypes224 = new String[] { "long", "java.lang.String[][]" };
 
-		_methodName225 = "countSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
+		_methodName225 = "getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
 
 		_methodParameterTypes225 = new String[] { "long", "java.lang.String[][]" };
 
-		_methodName226 = "getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto";
+		_methodName227 = "getValidTmpByDettPratica";
 
-		_methodParameterTypes226 = new String[] { "long", "java.lang.String[][]" };
+		_methodParameterTypes227 = new String[] { "long" };
 
-		_methodName228 = "getValidTmpByDettPratica";
+		_methodName228 = "getCfValidTmpByDettPratica";
 
 		_methodParameterTypes228 = new String[] { "long" };
 
-		_methodName229 = "getCfValidTmpByDettPratica";
+		_methodName229 = "getCfValidTmpByIntPratica_TipologiaSoggetto";
 
-		_methodParameterTypes229 = new String[] { "long" };
+		_methodParameterTypes229 = new String[] { "long", "java.lang.String" };
 
-		_methodName230 = "getCfValidTmpByIntPratica_TipologiaSoggetto";
+		_methodName230 = "getCfValidTmpByDettPratica_TipologiaSoggetto";
 
 		_methodParameterTypes230 = new String[] { "long", "java.lang.String" };
 
-		_methodName231 = "getCfValidTmpByDettPratica_TipologiaSoggetto";
+		_methodName231 = "countCfValidTmpByDettPratica";
 
-		_methodParameterTypes231 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes231 = new String[] { "long" };
 
-		_methodName232 = "countCfValidTmpByDettPratica";
+		_methodName233 = "getValidTmpByIntPratica_CodiceFiscale";
 
-		_methodParameterTypes232 = new String[] { "long" };
+		_methodParameterTypes233 = new String[] {
+				"long", "java.lang.String", "long"
+			};
 
-		_methodName234 = "getValidTmpByIntPratica_CodiceFiscale";
+		_methodName234 = "countValidTmpByIntPratica_CodiceFiscale";
 
 		_methodParameterTypes234 = new String[] {
 				"long", "java.lang.String", "long"
 			};
 
-		_methodName235 = "countValidTmpByIntPratica_CodiceFiscale";
+		_methodName235 = "getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto";
 
 		_methodParameterTypes235 = new String[] {
-				"long", "java.lang.String", "long"
+				"long", "java.lang.String", "java.lang.String"
 			};
 
 		_methodName236 = "getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto";
 
 		_methodParameterTypes236 = new String[] {
-				"long", "java.lang.String", "java.lang.String"
-			};
-
-		_methodName237 = "getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto";
-
-		_methodParameterTypes237 = new String[] {
 				"long", "java.lang.String", "java.lang.String", "long"
 			};
 
-		_methodName239 = "getValidByIntPratica_CodiceFiscale_TipologiaSoggetto";
+		_methodName238 = "getValidByIntPratica_CodiceFiscale_TipologiaSoggetto";
 
-		_methodParameterTypes239 = new String[] {
+		_methodParameterTypes238 = new String[] {
 				"long", "java.lang.String", "java.lang.String"
 			};
 
-		_methodName240 = "getValidByIntPratica_CodiceFiscale";
+		_methodName239 = "getValidByIntPratica_CodiceFiscale";
+
+		_methodParameterTypes239 = new String[] { "long", "java.lang.String" };
+
+		_methodName240 = "getValidByIntPratica_NoCodiceFiscale";
 
 		_methodParameterTypes240 = new String[] { "long", "java.lang.String" };
 
-		_methodName241 = "getValidByIntPratica_NoCodiceFiscale";
+		_methodName241 = "countValidByIntPratica_CodiceFiscale";
 
 		_methodParameterTypes241 = new String[] { "long", "java.lang.String" };
 
-		_methodName242 = "countValidByIntPratica_CodiceFiscale";
+		_methodName243 = "getValidByIntPratica_TipologiaSoggetto";
 
-		_methodParameterTypes242 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes243 = new String[] { "long", "java.lang.String" };
 
-		_methodName244 = "getValidByIntPratica_TipologiaSoggetto";
+		_methodName244 = "getValidTmpByIntPratica_TipologiaSoggetto";
 
 		_methodParameterTypes244 = new String[] { "long", "java.lang.String" };
 
-		_methodName245 = "getValidTmpByIntPratica_TipologiaSoggetto";
+		_methodName245 = "getValidTmpByDettPratica_TipologiaSoggetto";
 
 		_methodParameterTypes245 = new String[] { "long", "java.lang.String" };
 
-		_methodName246 = "getValidTmpByDettPratica_TipologiaSoggetto";
+		_methodName246 = "getCfValidByIntPratica";
 
-		_methodParameterTypes246 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes246 = new String[] { "long" };
 
-		_methodName247 = "getCfValidByIntPratica";
+		_methodName248 = "getValidByIntPratica_CodiciFiscali";
 
-		_methodParameterTypes247 = new String[] { "long" };
+		_methodParameterTypes248 = new String[] { "long", "java.util.List" };
 
-		_methodName249 = "getValidByIntPratica_CodiciFiscali";
+		_methodName249 = "getInvalidByIntPratica";
 
-		_methodParameterTypes249 = new String[] { "long", "java.util.List" };
+		_methodParameterTypes249 = new String[] { "long" };
 
-		_methodName250 = "getInvalidByIntPratica";
+		_methodName250 = "getInvalidTmpByIntPratica";
 
 		_methodParameterTypes250 = new String[] { "long" };
 
-		_methodName251 = "getInvalidTmpByIntPratica";
+		_methodName251 = "getRivalidatedTmpByIntPratica";
 
 		_methodParameterTypes251 = new String[] { "long" };
 
-		_methodName252 = "getRivalidatedTmpByIntPratica";
+		_methodName252 = "getValidUntilDettPraticaByIntPratica";
 
-		_methodParameterTypes252 = new String[] { "long" };
+		_methodParameterTypes252 = new String[] { "long", "long" };
 
 		_methodName253 = "getValidUntilDettPraticaByIntPratica";
 
-		_methodParameterTypes253 = new String[] { "long", "long" };
-
-		_methodName254 = "getValidUntilDettPraticaByIntPratica";
-
-		_methodParameterTypes254 = new String[] {
+		_methodParameterTypes253 = new String[] {
 				"long", "long", "java.lang.String"
 			};
 
-		_methodName255 = "countValidUntilDettPraticaByIntPratica";
+		_methodName254 = "countValidUntilDettPraticaByIntPratica";
 
-		_methodParameterTypes255 = new String[] { "long", "long" };
+		_methodParameterTypes254 = new String[] { "long", "long" };
 
-		_methodName257 = "findByDettPratica_TipologiaSoggetto_Aggiuntivo";
+		_methodName256 = "findByDettPratica_TipologiaSoggetto_Aggiuntivo";
 
-		_methodParameterTypes257 = new String[] {
+		_methodParameterTypes256 = new String[] {
 				"long", "java.lang.String", "boolean"
 			};
 
-		_methodName258 = "findByDettPratica_TipologiaSoggetto_Aggiuntivo_Rimosso";
+		_methodName257 = "findByDettPratica_TipologiaSoggetto_Aggiuntivo_Rimosso";
 
-		_methodParameterTypes258 = new String[] {
+		_methodParameterTypes257 = new String[] {
 				"long", "java.lang.String", "boolean", "boolean"
 			};
 
-		_methodName259 = "findByIntPratica_TipologiaSoggetto_Aggiuntivo_Rimosso";
+		_methodName258 = "findByIntPratica_TipologiaSoggetto_Aggiuntivo_Rimosso";
 
-		_methodParameterTypes259 = new String[] {
+		_methodParameterTypes258 = new String[] {
 				"long", "java.lang.String", "boolean", "boolean"
 			};
 
-		_methodName260 = "findByUserId";
+		_methodName259 = "findByUserId";
 
-		_methodParameterTypes260 = new String[] { "long" };
+		_methodParameterTypes259 = new String[] { "long" };
 
-		_methodName261 = "findByUserId";
+		_methodName260 = "findByUserId";
 
-		_methodParameterTypes261 = new String[] {
+		_methodParameterTypes260 = new String[] {
 				"long", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName262 = "findByUserId_CodiceFiscale";
+		_methodName261 = "findByUserId_CodiceFiscale";
 
-		_methodParameterTypes262 = new String[] {
+		_methodParameterTypes261 = new String[] {
 				"long", "java.lang.String", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName263 = "countByUserId_CodiceFiscale";
+		_methodName262 = "countByUserId_CodiceFiscale";
 
-		_methodParameterTypes263 = new String[] { "long", "java.lang.String" };
+		_methodParameterTypes262 = new String[] { "long", "java.lang.String" };
 
-		_methodName264 = "findByUserId_CodiceFiscale_TipologiaSoggetto";
+		_methodName263 = "findByUserId_CodiceFiscale_TipologiaSoggetto";
 
-		_methodParameterTypes264 = new String[] {
+		_methodParameterTypes263 = new String[] {
 				"long", "java.lang.String", "java.lang.String", "int", "int",
 				"com.liferay.portal.kernel.util.OrderByComparator"
 			};
 
-		_methodName265 = "countByUserId_CodiceFiscale_TipologiaSoggetto";
+		_methodName264 = "countByUserId_CodiceFiscale_TipologiaSoggetto";
 
-		_methodParameterTypes265 = new String[] {
+		_methodParameterTypes264 = new String[] {
 				"long", "java.lang.String", "java.lang.String"
 			};
 
-		_methodName266 = "findIntPraticaBySoggettoId";
+		_methodName265 = "findIntPraticaBySoggettoId";
 
-		_methodParameterTypes266 = new String[] { "long" };
+		_methodParameterTypes265 = new String[] { "long" };
 
-		_methodName267 = "updatePrincipale";
+		_methodName266 = "updatePrincipale";
 
-		_methodParameterTypes267 = new String[] {
+		_methodParameterTypes266 = new String[] {
 				"long", "java.lang.String", "java.lang.String"
 			};
 
-		_methodName268 = "completeInvalidation";
+		_methodName267 = "completeInvalidation";
 
-		_methodParameterTypes268 = new String[] { "long" };
+		_methodParameterTypes267 = new String[] { "long" };
 
-		_methodName269 = "getSoggettiSostituitiIds";
+		_methodName268 = "getSoggettiSostituitiIds";
 
-		_methodParameterTypes269 = new String[] { "long" };
+		_methodParameterTypes268 = new String[] { "long" };
 
-		_methodName270 = "validaSoggetto";
+		_methodName269 = "validaSoggetto";
 
-		_methodParameterTypes270 = new String[] { "long", "long" };
+		_methodParameterTypes269 = new String[] { "long", "long" };
 
-		_methodName271 = "invalidaSoggetto";
+		_methodName270 = "invalidaSoggetto";
 
-		_methodParameterTypes271 = new String[] { "long", "long" };
+		_methodParameterTypes270 = new String[] { "long", "long" };
 
-		_methodName272 = "invalidaESostituisciSoggetto";
+		_methodName271 = "invalidaESostituisciSoggetto";
 
-		_methodParameterTypes272 = new String[] { "long", "long", "long" };
+		_methodParameterTypes271 = new String[] { "long", "long", "long" };
 
-		_methodName273 = "allegaFileModifica";
+		_methodName272 = "allegaFileModifica";
 
-		_methodParameterTypes273 = new String[] {
+		_methodParameterTypes272 = new String[] {
 				"long", "long", "long", "byte[][]", "java.lang.String",
 				"java.lang.String", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName274 = "getSoggettiByIntPraticaId_DtRimozioneNull";
+		_methodName273 = "getSoggettiByIntPraticaId_DtRimozioneNull";
 
-		_methodParameterTypes274 = new String[] { "long" };
+		_methodParameterTypes273 = new String[] { "long" };
 	}
 
 	public Object invokeMethod(String name, String[] parameterTypes,
@@ -1012,348 +1012,348 @@ public class SoggettoLocalServiceClpInvoker {
 				(com.liferay.portal.service.ServiceContext)arguments[57]);
 		}
 
+		if (_methodName194.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) {
+			return SoggettoLocalServiceUtil.fetchByOldSoggettId(((Long)arguments[0]).longValue());
+		}
+
 		if (_methodName195.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) {
-			return SoggettoLocalServiceUtil.fetchByOldSoggettId(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName196.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) {
-			return SoggettoLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.countByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName197.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.findByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName198.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) {
-			return SoggettoLocalServiceUtil.findByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.countByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName199.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countByDettPratica(((Long)arguments[0]).longValue());
-		}
-
-		if (_methodName200.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName201.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) {
+		if (_methodName200.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName202.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) {
+		if (_methodName201.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByDettPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName203.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
+		if (_methodName202.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByDettPratica_CodiceFiscale_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName204.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
+		if (_methodName203.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName205.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) {
+		if (_methodName204.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName206.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) {
+		if (_methodName205.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName207.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) {
+		if (_methodName206.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByIntPratica_CodiceFiscale_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName208.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) {
+		if (_methodName207.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName209.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) {
+		if (_methodName208.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName210.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) {
+		if (_methodName209.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 		}
 
-		if (_methodName211.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) {
+		if (_methodName210.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName212.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) {
+		if (_methodName211.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
+		if (_methodName212.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidByIntPratica(((Long)arguments[0]).longValue());
+		}
+
 		if (_methodName213.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getValidByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName214.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.countValidByIntPratica(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName215.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countValidByIntPratica(((Long)arguments[0]).longValue());
+		if (_methodName216.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidTmpByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName217.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidTmpByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.countValidTmpByIntPratica(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName218.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countValidTmpByIntPratica(((Long)arguments[0]).longValue());
+		if (_methodName219.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getTmpNotCompletedByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName220.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getTmpNotCompletedByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.countTmpNotCompletedByDettPratica(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName221.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countTmpNotCompletedByDettPratica(((Long)arguments[0]).longValue());
+		if (_methodName222.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getSoggettiPrincipaliValidTmpByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName223.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getSoggettiPrincipaliValidTmpByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+				(java.lang.String[])arguments[1]);
 		}
 
 		if (_methodName224.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.countSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String[])arguments[1]);
 		}
 
 		if (_methodName225.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String[])arguments[1]);
 		}
 
-		if (_methodName226.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
-				(java.lang.String[])arguments[1]);
+		if (_methodName227.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidTmpByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName228.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidTmpByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getCfValidTmpByDettPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName229.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getCfValidTmpByDettPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getCfValidTmpByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName230.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getCfValidTmpByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getCfValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName231.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getCfValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
-				(java.lang.String)arguments[1]);
-		}
-
-		if (_methodName232.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countCfValidTmpByDettPratica(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName234.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
+		if (_methodName233.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName235.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) {
+		if (_methodName234.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countValidTmpByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], ((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName236.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) {
+		if (_methodName235.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 		}
 
-		if (_methodName237.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) {
+		if (_methodName236.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2],
 				((Long)arguments[3]).longValue());
 		}
 
-		if (_methodName239.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) {
+		if (_methodName238.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 		}
 
+		if (_methodName239.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1]);
+		}
+
 		if (_methodName240.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getValidByIntPratica_NoCodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName241.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByIntPratica_NoCodiceFiscale(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName242.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) {
-			return SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(((Long)arguments[0]).longValue(),
+		if (_methodName243.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName244.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName245.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
 		if (_methodName246.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(((Long)arguments[0]).longValue(),
-				(java.lang.String)arguments[1]);
+			return SoggettoLocalServiceUtil.getCfValidByIntPratica(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName247.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getCfValidByIntPratica(((Long)arguments[0]).longValue());
+		if (_methodName248.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getValidByIntPratica_CodiciFiscali(((Long)arguments[0]).longValue(),
+				(java.util.List<java.lang.String>)arguments[1]);
 		}
 
 		if (_methodName249.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidByIntPratica_CodiciFiscali(((Long)arguments[0]).longValue(),
-				(java.util.List<java.lang.String>)arguments[1]);
+			return SoggettoLocalServiceUtil.getInvalidByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName250.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getInvalidByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getInvalidTmpByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName251.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getInvalidTmpByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getRivalidatedTmpByIntPratica(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName252.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getRivalidatedTmpByIntPratica(((Long)arguments[0]).longValue());
+			return SoggettoLocalServiceUtil.getValidUntilDettPraticaByIntPratica(((Long)arguments[0]).longValue(),
+				((Long)arguments[1]).longValue());
 		}
 
 		if (_methodName253.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getValidUntilDettPraticaByIntPratica(((Long)arguments[0]).longValue(),
-				((Long)arguments[1]).longValue());
+				((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]);
 		}
 
 		if (_methodName254.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getValidUntilDettPraticaByIntPratica(((Long)arguments[0]).longValue(),
-				((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]);
-		}
-
-		if (_methodName255.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countValidUntilDettPraticaByIntPratica(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName257.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) {
+		if (_methodName256.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto_Aggiuntivo(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue());
 		}
 
-		if (_methodName258.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) {
+		if (_methodName257.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto_Aggiuntivo_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue(),
 				((Boolean)arguments[3]).booleanValue());
 		}
 
-		if (_methodName259.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) {
+		if (_methodName258.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto_Aggiuntivo_Rimosso(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Boolean)arguments[2]).booleanValue(),
 				((Boolean)arguments[3]).booleanValue());
 		}
 
-		if (_methodName260.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) {
+		if (_methodName259.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByUserId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName261.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) {
+		if (_methodName260.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByUserId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue(),
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[3]);
 		}
 
-		if (_methodName262.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes262, parameterTypes)) {
+		if (_methodName261.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByUserId_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1],
 				((Integer)arguments[2]).intValue(),
@@ -1361,14 +1361,14 @@ public class SoggettoLocalServiceClpInvoker {
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[4]);
 		}
 
-		if (_methodName263.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes263, parameterTypes)) {
+		if (_methodName262.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes262, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByUserId_CodiceFiscale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1]);
 		}
 
-		if (_methodName264.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) {
+		if (_methodName263.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes263, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findByUserId_CodiceFiscale_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2],
 				((Integer)arguments[3]).intValue(),
@@ -1376,58 +1376,58 @@ public class SoggettoLocalServiceClpInvoker {
 				(com.liferay.portal.kernel.util.OrderByComparator)arguments[5]);
 		}
 
-		if (_methodName265.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) {
+		if (_methodName264.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) {
 			return SoggettoLocalServiceUtil.countByUserId_CodiceFiscale_TipologiaSoggetto(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 		}
 
-		if (_methodName266.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes266, parameterTypes)) {
+		if (_methodName265.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) {
 			return SoggettoLocalServiceUtil.findIntPraticaBySoggettoId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName267.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) {
+		if (_methodName266.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes266, parameterTypes)) {
 			SoggettoLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(),
 				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 
 			return null;
 		}
 
-		if (_methodName268.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) {
+		if (_methodName267.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) {
 			SoggettoLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue());
 
 			return null;
 		}
 
-		if (_methodName269.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) {
+		if (_methodName268.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getSoggettiSostituitiIds(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName270.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) {
+		if (_methodName269.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) {
 			return SoggettoLocalServiceUtil.validaSoggetto(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName271.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) {
+		if (_methodName270.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) {
 			return SoggettoLocalServiceUtil.invalidaSoggetto(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName272.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes272, parameterTypes)) {
+		if (_methodName271.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) {
 			return SoggettoLocalServiceUtil.invalidaESostituisciSoggetto(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName273.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) {
+		if (_methodName272.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes272, parameterTypes)) {
 			return SoggettoLocalServiceUtil.allegaFileModifica(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue(), (byte[])arguments[3],
@@ -1435,8 +1435,8 @@ public class SoggettoLocalServiceClpInvoker {
 				(com.liferay.portal.service.ServiceContext)arguments[6]);
 		}
 
-		if (_methodName274.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes274, parameterTypes)) {
+		if (_methodName273.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getSoggettiByIntPraticaId_DtRimozioneNull(((Long)arguments[0]).longValue());
 		}
 
@@ -1503,6 +1503,8 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes192;
 	private String _methodName193;
 	private String[] _methodParameterTypes193;
+	private String _methodName194;
+	private String[] _methodParameterTypes194;
 	private String _methodName195;
 	private String[] _methodParameterTypes195;
 	private String _methodName196;
@@ -1543,24 +1545,24 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes213;
 	private String _methodName214;
 	private String[] _methodParameterTypes214;
-	private String _methodName215;
-	private String[] _methodParameterTypes215;
+	private String _methodName216;
+	private String[] _methodParameterTypes216;
 	private String _methodName217;
 	private String[] _methodParameterTypes217;
-	private String _methodName218;
-	private String[] _methodParameterTypes218;
+	private String _methodName219;
+	private String[] _methodParameterTypes219;
 	private String _methodName220;
 	private String[] _methodParameterTypes220;
-	private String _methodName221;
-	private String[] _methodParameterTypes221;
+	private String _methodName222;
+	private String[] _methodParameterTypes222;
 	private String _methodName223;
 	private String[] _methodParameterTypes223;
 	private String _methodName224;
 	private String[] _methodParameterTypes224;
 	private String _methodName225;
 	private String[] _methodParameterTypes225;
-	private String _methodName226;
-	private String[] _methodParameterTypes226;
+	private String _methodName227;
+	private String[] _methodParameterTypes227;
 	private String _methodName228;
 	private String[] _methodParameterTypes228;
 	private String _methodName229;
@@ -1569,32 +1571,32 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes230;
 	private String _methodName231;
 	private String[] _methodParameterTypes231;
-	private String _methodName232;
-	private String[] _methodParameterTypes232;
+	private String _methodName233;
+	private String[] _methodParameterTypes233;
 	private String _methodName234;
 	private String[] _methodParameterTypes234;
 	private String _methodName235;
 	private String[] _methodParameterTypes235;
 	private String _methodName236;
 	private String[] _methodParameterTypes236;
-	private String _methodName237;
-	private String[] _methodParameterTypes237;
+	private String _methodName238;
+	private String[] _methodParameterTypes238;
 	private String _methodName239;
 	private String[] _methodParameterTypes239;
 	private String _methodName240;
 	private String[] _methodParameterTypes240;
 	private String _methodName241;
 	private String[] _methodParameterTypes241;
-	private String _methodName242;
-	private String[] _methodParameterTypes242;
+	private String _methodName243;
+	private String[] _methodParameterTypes243;
 	private String _methodName244;
 	private String[] _methodParameterTypes244;
 	private String _methodName245;
 	private String[] _methodParameterTypes245;
 	private String _methodName246;
 	private String[] _methodParameterTypes246;
-	private String _methodName247;
-	private String[] _methodParameterTypes247;
+	private String _methodName248;
+	private String[] _methodParameterTypes248;
 	private String _methodName249;
 	private String[] _methodParameterTypes249;
 	private String _methodName250;
@@ -1607,8 +1609,8 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes253;
 	private String _methodName254;
 	private String[] _methodParameterTypes254;
-	private String _methodName255;
-	private String[] _methodParameterTypes255;
+	private String _methodName256;
+	private String[] _methodParameterTypes256;
 	private String _methodName257;
 	private String[] _methodParameterTypes257;
 	private String _methodName258;
@@ -1643,6 +1645,4 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes272;
 	private String _methodName273;
 	private String[] _methodParameterTypes273;
-	private String _methodName274;
-	private String[] _methodParameterTypes274;
 }
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceBaseImpl.java
index 5258fb9e..7117e060 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.SoggettoServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.SoggettoServiceImpl
  * @see it.tref.liferay.portos.bo.service.SoggettoServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceClpInvoker.java
index c7b0bf7e..44aa10cb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.SoggettoServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SoggettoServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceBaseImpl.java
index 40eabe40..fa4a15b1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.SorteggioLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java
index 24de587b..c5d0aa73 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SorteggioLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceBaseImpl.java
index 7d023ca8..967d8a97 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.SorteggioServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.SorteggioServiceImpl
  * @see it.tref.liferay.portos.bo.service.SorteggioServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceClpInvoker.java
index 0b631e3d..a83d55df 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.SorteggioServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class SorteggioServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceBaseImpl.java
index 24a5e5a0..3128093c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java
index 81c4747e..dc9b90a4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class StoricoSoggettoPraticaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceBaseImpl.java
index a9030049..91ed6a45 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.StoricoSoggettoPraticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceClpInvoker.java
index f99f55bf..17f0ae34 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class StoricoSoggettoPraticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceBaseImpl.java
index 5b6f9aad..62aab704 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.TempisticaLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java
index 7c7398f9..bbb95d00 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TempisticaLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceBaseImpl.java
index 2fd23e74..d2d10238 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.TempisticaServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.TempisticaServiceImpl
  * @see it.tref.liferay.portos.bo.service.TempisticaServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceClpInvoker.java
index 26dcf4f3..9c4ee9b8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.TempisticaServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TempisticaServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceBaseImpl.java
index 4ca20175..b3449b60 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceBaseImpl.java
@@ -73,7 +73,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.TerritorioLocalServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioLocalServiceImpl
  * @see it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceClpInvoker.java
index 1882981d..b8c3f2b8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioLocalServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TerritorioLocalServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceBaseImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceBaseImpl.java
index fe25ac00..0f05465b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceBaseImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceBaseImpl.java
@@ -60,7 +60,7 @@ import javax.sql.DataSource;
  * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.tref.liferay.portos.bo.service.impl.TerritorioServiceImpl}.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.impl.TerritorioServiceImpl
  * @see it.tref.liferay.portos.bo.service.TerritorioServiceUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceClpInvoker.java
index 35364b95..45145985 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceClpInvoker.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TerritorioServiceClpInvoker.java
@@ -19,7 +19,7 @@ import it.tref.liferay.portos.bo.service.TerritorioServiceUtil;
 import java.util.Arrays;
 
 /**
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @generated
  */
 public class TerritorioServiceClpInvoker {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AllegatoManualeServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AllegatoManualeServiceSoap.java
index c1839b52..141b1383 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AllegatoManualeServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AllegatoManualeServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualeServiceHttp
  * @see it.tref.liferay.portos.bo.model.AllegatoManualeSoap
  * @see it.tref.liferay.portos.bo.service.AllegatoManualeServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AsseverazioneServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AsseverazioneServiceSoap.java
index 9bba2ba7..bbcb931c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AsseverazioneServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AsseverazioneServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazioneServiceHttp
  * @see it.tref.liferay.portos.bo.model.AsseverazioneSoap
  * @see it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AvvisoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AvvisoServiceSoap.java
index 4b26dd8a..2a8be26e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AvvisoServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/AvvisoServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoServiceHttp
  * @see it.tref.liferay.portos.bo.model.AvvisoSoap
  * @see it.tref.liferay.portos.bo.service.AvvisoServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/CollaudoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/CollaudoServiceSoap.java
index fb56136e..7a090782 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/CollaudoServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/CollaudoServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoServiceHttp
  * @see it.tref.liferay.portos.bo.model.CollaudoSoap
  * @see it.tref.liferay.portos.bo.service.CollaudoServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComuneServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComuneServiceSoap.java
index 75d4b5e3..3946b737 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComuneServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComuneServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComuneServiceHttp
  * @see it.tref.liferay.portos.bo.model.ComuneSoap
  * @see it.tref.liferay.portos.bo.service.ComuneServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComunicazioneServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComunicazioneServiceSoap.java
index d3ddec9d..78c20bfe 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComunicazioneServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ComunicazioneServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazioneServiceHttp
  * @see it.tref.liferay.portos.bo.model.ComunicazioneSoap
  * @see it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ConfigurazioneServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ConfigurazioneServiceSoap.java
index 3cc605c0..4971dfd9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ConfigurazioneServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ConfigurazioneServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazioneServiceHttp
  * @see it.tref.liferay.portos.bo.model.ConfigurazioneSoap
  * @see it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ControlloPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ControlloPraticaServiceSoap.java
index 1b8f8821..a52b5bc2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ControlloPraticaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ControlloPraticaServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaServiceHttp
  * @see it.tref.liferay.portos.bo.model.ControlloPraticaSoap
  * @see it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DelegaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DelegaServiceSoap.java
index 6be76a04..7f776a3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DelegaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DelegaServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaServiceHttp
  * @see it.tref.liferay.portos.bo.model.DelegaSoap
  * @see it.tref.liferay.portos.bo.service.DelegaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocAggiuntivaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocAggiuntivaServiceSoap.java
index 17b263ed..3d6735f1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocAggiuntivaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocAggiuntivaServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaServiceHttp
  * @see it.tref.liferay.portos.bo.model.DocAggiuntivaSoap
  * @see it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocPraticaServiceSoap.java
index 168d7986..5bff7d64 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocPraticaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DocPraticaServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaServiceHttp
  * @see it.tref.liferay.portos.bo.model.DocPraticaSoap
  * @see it.tref.liferay.portos.bo.service.DocPraticaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/FineLavoriServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/FineLavoriServiceSoap.java
index 5ac9138a..1d3ae3ea 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/FineLavoriServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/FineLavoriServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriServiceHttp
  * @see it.tref.liferay.portos.bo.model.FineLavoriSoap
  * @see it.tref.liferay.portos.bo.service.FineLavoriServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/HistoryWorkflowActionServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/HistoryWorkflowActionServiceSoap.java
index 594b685f..cd5c0021 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/HistoryWorkflowActionServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/HistoryWorkflowActionServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionServiceHttp
  * @see it.tref.liferay.portos.bo.model.HistoryWorkflowActionSoap
  * @see it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java
index 5214adbc..036c9021 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java
@@ -56,7 +56,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaServiceHttp
  * @see it.tref.liferay.portos.bo.model.IntPraticaSoap
  * @see it.tref.liferay.portos.bo.service.IntPraticaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java
index 59c36431..28aeffb8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoServiceHttp
  * @see it.tref.liferay.portos.bo.model.PagamentoSoap
  * @see it.tref.liferay.portos.bo.service.PagamentoServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java
index f31ec5a7..c48e7cd0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoServiceHttp
  * @see it.tref.liferay.portos.bo.model.ParereGeologoSoap
  * @see it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ProvinciaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ProvinciaServiceSoap.java
index 243e499a..143d4c7e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ProvinciaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ProvinciaServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaServiceHttp
  * @see it.tref.liferay.portos.bo.model.ProvinciaSoap
  * @see it.tref.liferay.portos.bo.service.ProvinciaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/RelLeggiPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/RelLeggiPraticaServiceSoap.java
deleted file mode 100644
index 41da0efd..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/RelLeggiPraticaServiceSoap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package it.tref.liferay.portos.bo.service.http;
-
-/**
- * Provides the SOAP utility for the
- * {@link it.tref.liferay.portos.bo.service.RelLeggiPraticaServiceUtil} service utility. The
- * static methods of this class calls the same methods of the service utility.
- * However, the signatures are different because it is difficult for SOAP to
- * support certain types.
- *
- * <p>
- * ServiceBuilder follows certain rules in translating the methods. For example,
- * if the method in the service utility returns a {@link java.util.List}, that
- * is translated to an array of {@link it.tref.liferay.portos.bo.model.RelLeggiPraticaSoap}.
- * If the method in the service utility returns a
- * {@link it.tref.liferay.portos.bo.model.RelLeggiPratica}, that is translated to a
- * {@link it.tref.liferay.portos.bo.model.RelLeggiPraticaSoap}. Methods that SOAP cannot
- * safely wire are skipped.
- * </p>
- *
- * <p>
- * The benefits of using the SOAP utility is that it is cross platform
- * compatible. SOAP allows different languages like Java, .NET, C++, PHP, and
- * even Perl, to call the generated services. One drawback of SOAP is that it is
- * slow because it needs to serialize all calls into a text format (XML).
- * </p>
- *
- * <p>
- * You can see a list of services at http://localhost:8080/api/axis. Set the
- * property <b>axis.servlet.hosts.allowed</b> in portal.properties to configure
- * security.
- * </p>
- *
- * <p>
- * The SOAP utility is only generated for remote services.
- * </p>
- *
- * @author Davide Barbagallo, 3F Consulting
- * @see RelLeggiPraticaServiceHttp
- * @see it.tref.liferay.portos.bo.model.RelLeggiPraticaSoap
- * @see it.tref.liferay.portos.bo.service.RelLeggiPraticaServiceUtil
- * @generated
- */
-public class RelLeggiPraticaServiceSoap {
-}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SistemaCostruttivoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SistemaCostruttivoServiceSoap.java
deleted file mode 100644
index e7474bec..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SistemaCostruttivoServiceSoap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package it.tref.liferay.portos.bo.service.http;
-
-/**
- * Provides the SOAP utility for the
- * {@link it.tref.liferay.portos.bo.service.SistemaCostruttivoServiceUtil} service utility. The
- * static methods of this class calls the same methods of the service utility.
- * However, the signatures are different because it is difficult for SOAP to
- * support certain types.
- *
- * <p>
- * ServiceBuilder follows certain rules in translating the methods. For example,
- * if the method in the service utility returns a {@link java.util.List}, that
- * is translated to an array of {@link it.tref.liferay.portos.bo.model.SistemaCostruttivoSoap}.
- * If the method in the service utility returns a
- * {@link it.tref.liferay.portos.bo.model.SistemaCostruttivo}, that is translated to a
- * {@link it.tref.liferay.portos.bo.model.SistemaCostruttivoSoap}. Methods that SOAP cannot
- * safely wire are skipped.
- * </p>
- *
- * <p>
- * The benefits of using the SOAP utility is that it is cross platform
- * compatible. SOAP allows different languages like Java, .NET, C++, PHP, and
- * even Perl, to call the generated services. One drawback of SOAP is that it is
- * slow because it needs to serialize all calls into a text format (XML).
- * </p>
- *
- * <p>
- * You can see a list of services at http://localhost:8080/api/axis. Set the
- * property <b>axis.servlet.hosts.allowed</b> in portal.properties to configure
- * security.
- * </p>
- *
- * <p>
- * The SOAP utility is only generated for remote services.
- * </p>
- *
- * @author Davide Barbagallo, 3F Consulting
- * @see SistemaCostruttivoServiceHttp
- * @see it.tref.liferay.portos.bo.model.SistemaCostruttivoSoap
- * @see it.tref.liferay.portos.bo.service.SistemaCostruttivoServiceUtil
- * @generated
- */
-public class SistemaCostruttivoServiceSoap {
-}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SoggettoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SoggettoServiceSoap.java
index 31c24536..89b08c69 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SoggettoServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SoggettoServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoServiceHttp
  * @see it.tref.liferay.portos.bo.model.SoggettoSoap
  * @see it.tref.liferay.portos.bo.service.SoggettoServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SorteggioServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SorteggioServiceSoap.java
index ae179b6c..3db6346d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SorteggioServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/SorteggioServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioServiceHttp
  * @see it.tref.liferay.portos.bo.model.SorteggioSoap
  * @see it.tref.liferay.portos.bo.service.SorteggioServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/StoricoSoggettoPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/StoricoSoggettoPraticaServiceSoap.java
index 8f42bff0..3b4d4a59 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/StoricoSoggettoPraticaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/StoricoSoggettoPraticaServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaServiceHttp
  * @see it.tref.liferay.portos.bo.model.StoricoSoggettoPraticaSoap
  * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TempisticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TempisticaServiceSoap.java
index 900cd806..cb0afd75 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TempisticaServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TempisticaServiceSoap.java
@@ -48,7 +48,7 @@ package it.tref.liferay.portos.bo.service.http;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaServiceHttp
  * @see it.tref.liferay.portos.bo.model.TempisticaSoap
  * @see it.tref.liferay.portos.bo.service.TempisticaServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TerritorioServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TerritorioServiceSoap.java
index cf4d0867..878b5e0f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TerritorioServiceSoap.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/TerritorioServiceSoap.java
@@ -55,7 +55,7 @@ import java.rmi.RemoteException;
  * The SOAP utility is only generated for remote services.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioServiceHttp
  * @see it.tref.liferay.portos.bo.model.TerritorioSoap
  * @see it.tref.liferay.portos.bo.service.TerritorioServiceUtil
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java
index 4375811e..a0233a0e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -41,17 +37,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the allegato manuale local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.AllegatoManualeLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java
index dffcf810..2486fd36 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -26,17 +22,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the allegato manuale remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.AllegatoManualeService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AllegatoManualeServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AllegatoManualeServiceUtil
  */
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 26bcfde1..bad3bf71 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
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -19,7 +15,6 @@ import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
-import it.tref.liferay.portos.bo.shared.util.GenericUtils;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
 import it.tref.liferay.portos.bo.util.AsseverazioniUtil;
@@ -39,10 +34,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Scanner;
+import java.util.Set;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
@@ -67,17 +64,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the asseverazione local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.AsseverazioneLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil
  */
@@ -129,8 +124,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		Soggetto soggetto = null;
 		try {
 			soggetto = soggettoLocalService.getSoggetto(asseverazione.getSoggettoId());
-		} catch (SystemException | PortalException e) {
-		}
+		} catch (SystemException | PortalException e) {}
 		if (Validator.isNull(soggetto)
 				|| !soggetto.getCodiceFiscale().equalsIgnoreCase(asseverazione.getCodiceFiscale())) {
 			soggetto = null;
@@ -155,32 +149,32 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		String tipoProcedura = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()).getTipoProcedura();
 		String file = null;
 		switch (soggetto.getTipologiaSoggetto()) {
-		case TipoSoggettoUtil.COLLAUDATORE:
-			file = "collaudatore";
-			break;
-		case TipoSoggettoUtil.COMMITTENTE:
-			file = "committente";
-			break;
-		case TipoSoggettoUtil.DIRETTORE_LAVORI:
-			file = "direttore_lavori";
-			break;
-		case TipoSoggettoUtil.DITTA:
-			file = "costruttore";
-			break;
-		case TipoSoggettoUtil.GEOLOGO:
-			file = "geologo";
-			break;
-		case TipoSoggettoUtil.PROGETTISTA:
-			if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_C)) {
-				file = "progettista_c";
-			} else if (soggetto.getAmbitoProfessione().equalsIgnoreCase("architettonico")) {
-				file = "progettista_architettonico";
-			} else {
-				file = "calcolista";
-			}
-			break;
-		default:
-			return null;
+			case TipoSoggettoUtil.COLLAUDATORE:
+				file = "collaudatore";
+				break;
+			case TipoSoggettoUtil.COMMITTENTE:
+				file = "committente";
+				break;
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				file = "direttore_lavori";
+				break;
+			case TipoSoggettoUtil.DITTA:
+				file = "costruttore";
+				break;
+			case TipoSoggettoUtil.GEOLOGO:
+				file = "geologo";
+				break;
+			case TipoSoggettoUtil.PROGETTISTA:
+				if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_C)) {
+					file = "progettista_c";
+				} else if (soggetto.getAmbitoProfessione().equalsIgnoreCase("architettonico")) {
+					file = "progettista_architettonico";
+				} else {
+					file = "calcolista";
+				}
+				break;
+			default:
+				return null;
 		}
 		InputStream input = getClass().getClassLoader()
 				.getResourceAsStream("/resource/asseverazioni/" + file + ".html");
@@ -299,8 +293,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
 				|| TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
 				|| TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
-			List<Soggetto> nuoviSoggetti = new ArrayList<Soggetto>(
-					soggettoLocalService.getValidTmpByDettPratica(dettPraticaId));
+			Set<Soggetto> nuoviSoggetti = new HashSet<>(soggettoLocalService.getValidTmpByDettPratica(dettPraticaId));
 			List<String> cfNuoviSoggetti = soggettoLocalService.getCfValidTmpByDettPratica(dettPraticaId);
 			List<String> nuoviDelegati = new ArrayList<String>(
 					delegaLocalService.findCfByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] {
@@ -309,9 +302,8 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 							new String[] { AsseverazioniUtil.STATO_ESEGUITA }));
 			nuoviDelegati.removeAll(cfNuoviSoggetti);
 			for (String cfDelegato : nuoviDelegati) {
-				List<Soggetto> delegato = soggettoLocalService.getValidTmpByIntPratica_CodiceFiscale(intPraticaId,
-						cfDelegato, 0l);
-				GenericUtils.addAllIfnotExist(nuoviSoggetti, delegato);
+				nuoviSoggetti.addAll(soggettoLocalService.getValidTmpByIntPratica_CodiceFiscale(intPraticaId,
+						cfDelegato, 0L));
 			}
 			if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) {
 				User titolaredigitaleUser = userLocalService.getUser(intPratica.getUserId());
@@ -327,9 +319,8 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 				if (ValidazionePraticaUtil.isA98Required(dettPratica)) {
 					tipoSoggetti = (String[]) ArrayUtils.removeElement(tipoSoggetti, TipoSoggettoUtil.COMMITTENTE);
 				}
-				List<Soggetto> soggettiPrincipali = soggettoLocalService
-						.getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, tipoSoggetti);
-				GenericUtils.addAllIfnotExist(nuoviSoggetti, soggettiPrincipali);
+				nuoviSoggetti.addAll(soggettoLocalService.getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(
+						dettPraticaId, tipoSoggetti));
 			}
 			for (Soggetto soggetto : nuoviSoggetti) {
 				if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto())) {
@@ -504,8 +495,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		if (Validator.isNotNull(asseverazione.getFileEntryId())) {
 			try {
 				dlAppLocalService.deleteFileEntry(asseverazione.getFileEntryId());
-			} catch (PortalException e) {
-			}
+			} catch (PortalException e) {}
 		}
 		return super.deleteAsseverazione(asseverazione);
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneServiceImpl.java
index 064bdf79..f9200429 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -28,31 +24,27 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the asseverazione remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are
- * added, rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.AsseverazioneService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.AsseverazioneService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have
- * security checks based on the propagated JAAS credentials because this service
- * can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AsseverazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil
  */
 public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use
-	 * {@link it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil} to
-	 * access the asseverazione remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil} to access the asseverazione remote service.
 	 */
 
-	public void cambioStatoAsseverazione(long asseverazioneId, String stato) throws IOException,
-			SystemException, PortalException {
+	@Override
+	public void cambioStatoAsseverazione(long asseverazioneId, String stato) throws IOException, SystemException,
+			PortalException {
 
 		if (AsseverazioniUtil.hasCambioStatoAsseverazione(getUserId(), asseverazioneId)) {
 			asseverazioneLocalService.cambioStatoAsseverazione(getUserId(), asseverazioneId, stato);
@@ -62,8 +54,9 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 
 	}
 
-	public void cambioStatoAsseverazioni(long dettPraticaId, String stato) throws IOException,
-			SystemException, PrincipalException, PortalException {
+	@Override
+	public void cambioStatoAsseverazioni(long dettPraticaId, String stato) throws IOException, SystemException,
+			PrincipalException, PortalException {
 
 		if (AsseverazioniUtil.hasRichiediAsseverazioni(getUserId(), dettPraticaId)) {
 			asseverazioneLocalService.cambioStatoAsseverazioni(dettPraticaId, stato);
@@ -72,8 +65,9 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 		}
 	}
 
-	public void richiediAsseverazioni(long dettPraticaId, ServiceContext serviceContext)
-			throws PrincipalException, PortalException, SystemException {
+	@Override
+	public void richiediAsseverazioni(long dettPraticaId, ServiceContext serviceContext) throws PrincipalException,
+			PortalException, SystemException {
 
 		if (AsseverazioniUtil.hasRichiediAsseverazioni(getUserId(), dettPraticaId)) {
 			asseverazioneLocalService.richiediAsseverazioni(dettPraticaId, serviceContext);
@@ -82,8 +76,8 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 		}
 	}
 
-	public void resetAsseverazione(long dettPraticaId, long asseverazioneId) throws PortalException,
-			SystemException {
+	@Override
+	public void resetAsseverazione(long dettPraticaId, long asseverazioneId) throws PortalException, SystemException {
 
 		if (AsseverazioniUtil.hasAnnullaAsseverazioni(getUserId(), dettPraticaId)) {
 			asseverazioneLocalService.resetAsseverazione(asseverazioneId);
@@ -92,8 +86,9 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 		}
 	}
 
-	public void annullaAsseverazioni(long dettPraticaId) throws IOException, PrincipalException,
-			PortalException, SystemException {
+	@Override
+	public void annullaAsseverazioni(long dettPraticaId) throws IOException, PrincipalException, PortalException,
+			SystemException {
 
 		if (AsseverazioniUtil.hasAnnullaAsseverazioni(getUserId(), dettPraticaId)) {
 			asseverazioneLocalService.annullaAsseverazioni(dettPraticaId);
@@ -102,6 +97,7 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 		}
 	}
 
+	@Override
 	public void rimuoviFileAsseverazione(long asseverazioneId) throws SystemException, PortalException {
 
 		if (AsseverazioniUtil.hasGestisciFileAsseverazione(getUserId(), asseverazioneId)) {
@@ -111,172 +107,188 @@ public class AsseverazioneServiceImpl extends AsseverazioneServiceBaseImpl {
 		}
 	}
 
+	@Override
 	public FileEntry allegaFileAsseverazione(long asseverazioneId, byte[] content, String sourceFileName,
 			ServiceContext serviceContext) throws SystemException, PortalException {
 
 		if (AsseverazioniUtil.hasGestisciFileAsseverazione(getUserId(), asseverazioneId)) {
-			return asseverazioneLocalService.allegaFileAsseverazione(asseverazioneId, content,
-					sourceFileName, serviceContext);
+			return asseverazioneLocalService.allegaFileAsseverazione(asseverazioneId, content, sourceFileName,
+					serviceContext);
 		} else {
 			throw new SystemException("annulla-asseverazione-non-possibile");
 		}
 	}
 
+	@Override
 	public List<Asseverazione> findByIntPratica(long intPraticaId, int start, int end,
 			OrderByComparator orderByComparator) throws SystemException {
 
 		return asseverazioneLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator);
 	}
 
+	@Override
 	public List<Asseverazione> findByDettPratica(long dettPraticaId, int start, int end,
 			OrderByComparator orderByComparator) throws SystemException {
 
 		return asseverazioneLocalService.findByDettPratica(dettPraticaId, start, end, orderByComparator);
 	}
 
+	@Override
 	public int countByIntPratica(long intPraticaId) throws SystemException {
 
 		return asseverazioneLocalService.countByIntPratica(intPraticaId);
 	}
 
+	@Override
 	public int countByDettPratica(long dettPraticaId) throws SystemException {
 
 		return asseverazioneLocalService.countByDettPratica(dettPraticaId);
 	}
 
-	public List<Asseverazione> findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale,
-			int start, int end, OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Asseverazione> findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start,
+			int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start,
-				end, orderByComparator);
+		return asseverazioneLocalService.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end,
+				orderByComparator);
 	}
 
-	public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale)
-			throws SystemException {
+	@Override
+	public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException {
 
 		return asseverazioneLocalService.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale);
 	}
 
-	public List<Asseverazione> findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start,
-			int end, OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Asseverazione> findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
 
 		return asseverazioneLocalService.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end,
 				orderByComparator);
 	}
 
+	@Override
 	public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException {
 
 		return asseverazioneLocalService.countByCodiceFiscale_InEsito(codiceFiscale, esiti);
 	}
 
-	public List<Asseverazione> findByIntPratica_CodiceFiscale_InEsito(long intPraticaId,
-			String codiceFiscale, String[] esiti, int start, int end, OrderByComparator orderByComparator)
-			throws SystemException {
+	@Override
+	public List<Asseverazione> findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale,
+			String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale,
-				esiti, start, end, orderByComparator);
+		return asseverazioneLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti,
+				start, end, orderByComparator);
 	}
 
-	public List<Asseverazione> findByDettPratica_CodiceFiscale_InEsito(long dettPraticaId,
-			String codiceFiscale, String[] esiti, int start, int end, OrderByComparator orderByComparator)
-			throws SystemException {
+	@Override
+	public List<Asseverazione> findByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale,
+			String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByDettPratica_CodiceFiscale_InEsito(dettPraticaId,
-				codiceFiscale, esiti, start, end, orderByComparator);
+		return asseverazioneLocalService.findByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti,
+				start, end, orderByComparator);
 	}
 
+	@Override
 	public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti)
 			throws SystemException {
 
-		return asseverazioneLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale,
-				esiti);
+		return asseverazioneLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti);
 	}
 
-	public int countByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale,
-			String[] esiti) throws SystemException {
+	@Override
+	public int countByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale, String[] esiti)
+			throws SystemException {
 
-		return asseverazioneLocalService.countByDettPratica_CodiceFiscale_InEsito(dettPraticaId,
-				codiceFiscale, esiti);
+		return asseverazioneLocalService.countByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti);
 	}
 
-	public List<Asseverazione> findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start,
-			int end, OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Asseverazione> findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end,
-				orderByComparator);
+		return asseverazioneLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator);
 	}
 
+	@Override
 	public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException {
 
 		return asseverazioneLocalService.countByIntPratica_InEsito(intPraticaId, esiti);
 	}
 
-	public List<Asseverazione> findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start,
-			int end, OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Asseverazione> findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end,
-				orderByComparator);
+		return asseverazioneLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator);
 	}
 
+	@Override
 	public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException {
 
 		return asseverazioneLocalService.countByDettPratica_InEsito(dettPraticaId, esiti);
 	}
 
+	@Override
 	public List<Asseverazione> findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia,
 			String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia,
-				esiti, start, end, orderByComparator);
+		return asseverazioneLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start,
+				end, orderByComparator);
 	}
 
+	@Override
 	public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti)
 			throws SystemException {
 
-		return asseverazioneLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia,
-				esiti);
+		return asseverazioneLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti);
 	}
 
+	@Override
 	public List<Asseverazione> findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId,
 			String codiceFiscale, String tipologia, String[] esiti, int start, int end,
 			OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId,
-				codiceFiscale, tipologia, esiti, start, end, orderByComparator);
+		return asseverazioneLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale,
+				tipologia, esiti, start, end, orderByComparator);
 	}
 
+	@Override
 	public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale,
 			String tipologia, String[] esiti) throws SystemException {
 
-		return asseverazioneLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId,
-				codiceFiscale, tipologia, esiti);
+		return asseverazioneLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale,
+				tipologia, esiti);
 	}
 
-	public List<Asseverazione> findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia,
-			String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Asseverazione> findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti,
-				start, end, orderByComparator);
+		return asseverazioneLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end,
+				orderByComparator);
 	}
 
+	@Override
 	public List<Asseverazione> findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia,
 			String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-		return asseverazioneLocalService.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti,
-				start, end, orderByComparator);
+		return asseverazioneLocalService.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start,
+				end, orderByComparator);
 	}
 
+	@Override
 	public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti)
 			throws SystemException {
 
 		return asseverazioneLocalService.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti);
 	}
 
+	@Override
 	public int countByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti)
 			throws SystemException {
 
-		return asseverazioneLocalService
-				.countByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti);
+		return asseverazioneLocalService.countByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti);
 	}
 
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java
index aa1f9ab1..0fbaf1b7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -68,17 +64,15 @@ import com.liferay.util.dao.orm.CustomSQLUtil;
 
 /**
  * The implementation of the avviso local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.AvvisoLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil
  */
@@ -116,22 +110,22 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl {
 			String propertiesTemplate = null;
 			String tipoProcedura = intPratica.getTipoProcedura();
 			switch (statoPratica) {
-			case StatoPraticaConstants.SOTTOPOSTA_A_PARERE:
-				Sorteggio sorteggio = sorteggioLocalService.findByIntPratica(intPratica.getIntPraticaId());
-				if (Validator.isNull(tipoProcedura) || tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_A)
-						|| Validator.isNull(sorteggio)) {
+				case StatoPraticaConstants.SOTTOPOSTA_A_PARERE:
+					Sorteggio sorteggio = sorteggioLocalService.findByIntPratica(intPratica.getIntPraticaId());
+					if (Validator.isNull(tipoProcedura) || tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_A)
+							|| Validator.isNull(sorteggio)) {
+						propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPratica);
+					} else {
+						propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get("DPPS");
+					}
+					break;
+				case StatoPraticaConstants.VIDIMATA:
+					if (null == tipoProcedura)
+						tipoProcedura = Constants.PROCEDURA_A;
+					propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get("DP" + tipoProcedura);
+					break;
+				default:
 					propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPratica);
-				} else {
-					propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get("DPPS");
-				}
-				break;
-			case StatoPraticaConstants.VIDIMATA:
-				if (null == tipoProcedura)
-					tipoProcedura = Constants.PROCEDURA_A;
-				propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get("DP" + tipoProcedura);
-				break;
-			default:
-				propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPratica);
 			}
 			long fileEntryIdTemplate = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(),
 					propertiesTemplate);
@@ -374,20 +368,17 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl {
 				if (Validator.isNotNull(avviso.getFileEntryIdBase())) {
 					dlAppLocalService.deleteFileEntry(avviso.getFileEntryIdBase());
 				}
-			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {
-			}
+			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {}
 			try {
 				if (Validator.isNotNull(avviso.getFileEntryIdInvio())) {
 					dlAppLocalService.deleteFileEntry(avviso.getFileEntryIdInvio());
 				}
-			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {
-			}
+			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {}
 			try {
 				if (Validator.isNotNull(avviso.getFileEntryIdProtocollo())) {
 					dlAppLocalService.deleteFileEntry(avviso.getFileEntryIdProtocollo());
 				}
-			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {
-			}
+			} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {}
 		} catch (PortalException e) {
 			throw new SystemException(e);
 		}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java
index be0ebae6..9fd20bfa 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -23,17 +19,15 @@ import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
 
 /**
  * The implementation of the avviso remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.AvvisoService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.AvvisoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.AvvisoServiceUtil
  */
@@ -45,6 +39,7 @@ public class AvvisoServiceImpl extends AvvisoServiceBaseImpl {
 
 	@Override
 	public Avviso rilasciaFirma(long avvisoId, String cf) throws SystemException, PortalException {
+
 		Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId);
 		if (!avviso.getUserCodiceFiscalePrimaFirma().equalsIgnoreCase(getUser().getScreenName())) {
 			throw new SystemException("assegnazione non possibile perche' non assengato a " + cf);
@@ -54,6 +49,7 @@ public class AvvisoServiceImpl extends AvvisoServiceBaseImpl {
 
 	@Override
 	public Avviso assegnaFirma(long avvisoId, String cf) throws SystemException, PrincipalException, PortalException {
+
 		Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId);
 		if (!UserGroupRoleLocalServiceUtil.hasUserGroupRole(getUserId(), avviso.getGroupId(),
 				Constants.ROLE_NAME_FIRMA, true)) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java
index 0951b806..8483ec80 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -53,17 +49,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the collaudo local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.CollaudoLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.CollaudoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoServiceImpl.java
index 8471daa5..8278a419 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -25,96 +21,91 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the collaudo remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.CollaudoService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.CollaudoService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.CollaudoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.CollaudoServiceUtil
  */
 public class CollaudoServiceImpl extends CollaudoServiceBaseImpl {
-  /*
-   * NOTE FOR DEVELOPERS:
-   * 
-   * Never reference this interface directly. Always use {@link
-   * it.tref.liferay.portos.bo.service.CollaudoServiceUtil} to access the collaudo remote service.
-   */
-
-  public Collaudo getCollaudo(long collaudoId) throws PortalException, SystemException {
-    return collaudoLocalService.getCollaudo(collaudoId);
-  }
-
-  public Collaudo addCollaudo(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException {
-    // User user = userLocalService.getUser(serviceContext.getUserId());
-    // List<Soggetto> owners = soggettoLocalService.findByIntPratica_CodiceFiscale(intPraticaId,
-    // user.getScreenName());
-    // for (Soggetto owner : owners) {
-    // if (owner.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) {
-    // return collaudoLocalService.addCollaudo(intPraticaId, serviceContext);
-    // }
-    // }
-    // throw new SystemException("unbale to add Fine Lavori. Subject is not a direttore lavori");
-    return collaudoLocalService.addCollaudo(intPraticaId, serviceContext);
-  }
-
-  public Collaudo deleteCollaudo(Collaudo collaudo) throws PortalException, SystemException {
-
-    return collaudoLocalService.deleteCollaudo(collaudo);
-  }
-
-  public Collaudo deleteCollaudo(long collaudoId) throws PortalException, SystemException {
-
-    return collaudoLocalService.deleteCollaudo(collaudoId);
-  }
-
-
-  public Collaudo updateCollaudo(long userId, long collaudoId, long intPraticaId, boolean parziale, boolean completata,
-      Date dataCollaudo, String codiceFiscaleDelegato, boolean normEsenteBollo, String noteCollaudo)
-      throws PortalException, SystemException {
-
-    Collaudo collaudo = getCollaudo(collaudoId);
-
-    if (collaudo.getUserId() == userId) {
-      collaudo =
-          collaudoLocalService.updateCollaudo(userId, collaudoId, intPraticaId, parziale, completata, dataCollaudo,
-              codiceFiscaleDelegato, normEsenteBollo, noteCollaudo);
-    }
-
-    return collaudo;
-  }
-
-  public List<Collaudo> findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start,
-      int end, OrderByComparator orderByComparator) throws SystemException {
-    return collaudoLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end,
-        orderByComparator);
-  }
-
-  public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException {
-    return collaudoLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata);
-  }
-
-  public Collaudo getLastEditable(long intPraticaId) throws SystemException {
-    return collaudoLocalService.getLastEditable(intPraticaId);
-  }
-
-  public Collaudo pagaInvia(long collaudoId, String codiceFiscaleCommittente, String currentURL,
-      ServiceContext serviceContext) throws SystemException, PortalException {
-
-    return collaudoLocalService.pagaInvia(collaudoId, codiceFiscaleCommittente, currentURL, serviceContext);
-  }
-
-  public Collaudo updateEsito(long collaudoId, int stato) throws SystemException, PortalException {
-    // Collaudo fineLavori = collaudoLocalService.getCollaudo(collaudoId);
-    // DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(),
-    // ActionKeys.ADD_ENTRY);
-    return collaudoLocalService.updateEsito(collaudoId, stato);
-  }
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.CollaudoServiceUtil} to access the collaudo remote service.
+	 */
+
+	@Override
+	public Collaudo getCollaudo(long collaudoId) throws PortalException, SystemException {
+		return collaudoLocalService.getCollaudo(collaudoId);
+	}
+
+	@Override
+	public Collaudo addCollaudo(long intPraticaId, ServiceContext serviceContext) throws PortalException,
+			SystemException {
+
+		return collaudoLocalService.addCollaudo(intPraticaId, serviceContext);
+	}
+
+	@Override
+	public Collaudo deleteCollaudo(Collaudo collaudo) throws PortalException, SystemException {
+
+		return collaudoLocalService.deleteCollaudo(collaudo);
+	}
+
+	@Override
+	public Collaudo deleteCollaudo(long collaudoId) throws PortalException, SystemException {
+
+		return collaudoLocalService.deleteCollaudo(collaudoId);
+	}
+
+	@Override
+	public Collaudo updateCollaudo(long userId, long collaudoId, long intPraticaId, boolean parziale,
+			boolean completata, Date dataCollaudo, String codiceFiscaleDelegato, boolean normEsenteBollo,
+			String noteCollaudo) throws PortalException, SystemException {
+
+		Collaudo collaudo = getCollaudo(collaudoId);
+		if (collaudo.getUserId() == userId) {
+			collaudo = collaudoLocalService.updateCollaudo(userId, collaudoId, intPraticaId, parziale, completata,
+					dataCollaudo, codiceFiscaleDelegato, normEsenteBollo, noteCollaudo);
+		}
+		return collaudo;
+	}
+
+	@Override
+	public List<Collaudo> findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start,
+			int end, OrderByComparator orderByComparator) throws SystemException {
+
+		return collaudoLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException {
+
+		return collaudoLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata);
+	}
+
+	@Override
+	public Collaudo getLastEditable(long intPraticaId) throws SystemException {
+
+		return collaudoLocalService.getLastEditable(intPraticaId);
+	}
+
+	@Override
+	public Collaudo pagaInvia(long collaudoId, String codiceFiscaleCommittente, String currentURL,
+			ServiceContext serviceContext) throws SystemException, PortalException {
+
+		return collaudoLocalService.pagaInvia(collaudoId, codiceFiscaleCommittente, currentURL, serviceContext);
+	}
+
+	@Override
+	public Collaudo updateEsito(long collaudoId, int stato) throws SystemException, PortalException {
+
+		return collaudoLocalService.updateEsito(collaudoId, stato);
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java
index 9250cf0c..aac02cc8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -31,6 +27,7 @@ import com.liferay.portal.kernel.dao.orm.Criterion;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
 import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil;
 import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil;
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
@@ -44,35 +41,30 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the comune local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ComuneLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ComuneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil
  */
 public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
+
 	@Override
 	public Comune addComune(long userId, String codiceProvincia, String codiceComune, String codiceIstat,
 			String codiceBelfiore, String denominazione, boolean provincia, boolean stato, String mailSuap,
 			String mailSue, ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
 		validate(serviceContext.getCompanyId(), 0L, codiceProvincia, codiceComune, codiceIstat, codiceBelfiore,
 				denominazione, provincia);
-
 		Comune comune = comunePersistence.create(counterLocalService.increment(Comune.class.getName()));
-
 		comune.setCompanyId(serviceContext.getCompanyId());
 		comune.setUserId(user.getUserId());
 		comune.setUserName(user.getFullName());
@@ -88,9 +80,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 		comune.setMailSuap(mailSuap);
 		comune.setMailSue(mailSue);
 		comune = comunePersistence.update(comune);
-
 		return comune;
-
 	}
 
 	@Override
@@ -99,20 +89,15 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
 		validate(serviceContext.getCompanyId(), 0L, codiceProvincia, codiceComune, codiceIstat, codiceBelfiore,
 				denominazione, provincia);
-
 		Comune comune = comunePersistence.create(counterLocalService.increment(Comune.class.getName()));
-
 		comune.setCompanyId(serviceContext.getCompanyId());
 		comune.setUserId(user.getUserId());
 		comune.setUserName(user.getFullName());
 		comune.setCreateDate(serviceContext.getCreateDate(now));
 		comune.setModifiedDate(serviceContext.getModifiedDate(now));
-
 		comune.setCodiceProvincia(codiceProvincia);
 		comune.setCodiceComune(codiceComune);
 		comune.setCodiceIstat(codiceIstat);
@@ -122,7 +107,6 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 		comune.setMailSuap(mailSuap);
 		comune.setMailSue(mailSue);
 		comune = comunePersistence.update(comune);
-
 		return comune;
 	}
 
@@ -136,7 +120,6 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 	public long countByKeywords(long companyId, String keywords) throws SystemException {
 
 		DynamicQuery query = queryByKeywords(companyId, keywords);
-
 		return dynamicQueryCount(query);
 	}
 
@@ -144,7 +127,6 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 	public void deleteByCompanyId(long companyId) throws SystemException {
 
 		List<Comune> list = comunePersistence.findByCompanyId(companyId);
-
 		for (Comune comune : list) {
 			deleteComune(comune);
 		}
@@ -160,7 +142,6 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 	public Comune deleteComune(long comuneId) throws PortalException, SystemException {
 
 		Comune comune = comunePersistence.findByPrimaryKey(comuneId);
-
 		return deleteComune(comune);
 	}
 
@@ -221,12 +202,12 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 		return comunePersistence.findByC_CP(companyId, codiceProvincia, start, end, orderByComparator);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Comune> findByKeywords(long companyId, String keywords, int start, int end,
 			OrderByComparator orderByComparator) throws SystemException {
 
 		DynamicQuery query = queryByKeywords(companyId, keywords);
-
 		return dynamicQuery(query, start, end, orderByComparator);
 	}
 
@@ -242,14 +223,10 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 			String mailSue, ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
 		Comune comune = comunePersistence.fetchByPrimaryKey(comuneId);
-
 		validate(serviceContext.getCompanyId(), comuneId, codiceProvincia, codiceComune, codiceIstat,
 				comune.getCodiceBelfiore(), denominazione, provincia);
-
 		comune.setCompanyId(serviceContext.getCompanyId());
 		comune.setUserId(user.getUserId());
 		comune.setUserName(user.getFullName());
@@ -263,11 +240,8 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 		comune.setMailSue(mailSue);
 		comune.setDenominazione(denominazione);
 		comune.setProvincia(provincia);
-
 		comune = comunePersistence.update(comune);
-
 		return comune;
-
 	}
 
 	@Override
@@ -276,20 +250,15 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
 		Comune comune = comunePersistence.fetchByPrimaryKey(comuneId);
-
 		validate(serviceContext.getCompanyId(), comuneId, codiceProvincia, codiceComune, codiceIstat,
 				comune.getCodiceBelfiore(), denominazione, provincia);
-
 		comune.setCompanyId(serviceContext.getCompanyId());
 		comune.setUserId(user.getUserId());
 		comune.setUserName(user.getFullName());
 		comune.setCreateDate(serviceContext.getCreateDate(now));
 		comune.setModifiedDate(serviceContext.getModifiedDate(now));
-
 		comune.setCodiceProvincia(codiceProvincia);
 		comune.setCodiceComune(codiceComune);
 		comune.setCodiceIstat(codiceIstat);
@@ -297,9 +266,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 		comune.setMailSue(mailSue);
 		comune.setDenominazione(denominazione);
 		comune.setProvincia(provincia);
-
 		comune = comunePersistence.update(comune);
-
 		return comune;
 	}
 
@@ -307,13 +274,11 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 	public List<Comune> getComuniForOrganizationByUserId(long userId) throws SystemException {
 
 		List<Comune> comuni = new ArrayList<Comune>();
-
 		List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(userId);
 		if (Validator.isNotNull(organizationList)) {
 			for (Organization org : organizationList) {
-
 				List<Territorio> territori = territorioLocalService.getTerritori(org.getCompanyId(), org.getGroupId(),
-						-1, -1);
+						QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 				if (Validator.isNotNull(territori)) {
 					for (Territorio terr : territori) {
 						Comune comune = fetchComune(terr.getComuneId());
@@ -326,9 +291,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 				}
 			}
 		}
-
 		Collections.sort(comuni);
-
 		return comuni;
 	}
 
@@ -337,15 +300,12 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 	public List<Comune> getComuniForOrganizationByUserIdUfficioId(long userId, long ufficioId) throws SystemException {
 
 		List<Comune> comuni = new ArrayList<Comune>();
-
 		List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(userId);
 		if (Validator.isNotNull(organizationList)) {
 			for (Organization org : organizationList) {
-
 				if (org.getGroupId() == ufficioId) {
-
 					List<Territorio> territori = territorioLocalService.getTerritori(org.getCompanyId(),
-							org.getGroupId(), -1, -1);
+							org.getGroupId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 					if (Validator.isNotNull(territori)) {
 						for (Territorio terr : territori) {
 							Comune comune = fetchComune(terr.getComuneId());
@@ -359,9 +319,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 				}
 			}
 		}
-
 		Collections.sort(comuni);
-
 		return comuni;
 	}
 
@@ -369,7 +327,6 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 
 		DynamicQuery query = DynamicQueryFactoryUtil.forClass(Comune.class);
 		query.add(PropertyFactoryUtil.forName("companyId").eq(companyId));
-
 		Criterion criterion = RestrictionsFactoryUtil.ilike("codiceProvincia", StringPool.PERCENT + keywords
 				+ StringPool.PERCENT);
 		criterion = RestrictionsFactoryUtil.or(criterion,
@@ -389,41 +346,43 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl {
 			SystemException {
 
 		if (codiceBelfiore != null && !codiceBelfiore.startsWith("Z")) {
-
-			if (Validator.isNull(codiceProvincia))
+			if (Validator.isNull(codiceProvincia)) {
 				throw new CodiceProvinciaException();
-			if (Validator.isNull(codiceComune))
+			}
+			if (Validator.isNull(codiceComune)) {
 				throw new CodiceComuneException();
-			if (Validator.isNull(codiceIstat))
+			}
+			if (Validator.isNull(codiceIstat)) {
 				throw new CodiceIstatException();
+			}
 		}
-
-		if (Validator.isNull(codiceBelfiore))
+		if (Validator.isNull(codiceBelfiore)) {
 			throw new CodiceBelfioreException();
-		if (Validator.isNull(denominazione))
+		}
+		if (Validator.isNull(denominazione)) {
 			throw new DenominazioneException();
-
+		}
 		Comune comune = comunePersistence.fetchByC_CB(companyId, codiceBelfiore);
-		if (comune != null && comune.getPrimaryKey() != comuneId)
+		if (comune != null && comune.getPrimaryKey() != comuneId) {
 			throw new DuplicateComuneException();
+		}
 		if (!codiceBelfiore.startsWith("Z")) {
 			comune = comunePersistence.fetchByC_CI(companyId, codiceIstat);
-			if (comune != null && comune.getPrimaryKey() != comuneId)
+			if (comune != null && comune.getPrimaryKey() != comuneId) {
 				throw new DuplicateComuneException();
+			}
 		}
 	}
 
-	boolean checkIfContained(Comune comune, List<Comune> comuni) {
-		boolean result = false;
+	private boolean checkIfContained(Comune comune, List<Comune> comuni) {
 
+		boolean result = false;
 		for (Comune comuneEl : comuni) {
-
 			if (comuneEl.getComuneId() == comune.getComuneId()) {
 				result = true;
 				break;
 			}
 		}
-
 		return result;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java
index 7be93013..e6aec32e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -22,17 +18,15 @@ import com.liferay.portal.kernel.exception.SystemException;
 
 /**
  * The implementation of the comune remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ComuneService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ComuneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ComuneServiceUtil
  */
@@ -44,11 +38,13 @@ public class ComuneServiceImpl extends ComuneServiceBaseImpl {
 
 	@Override
 	public Comune getComune(long comuneId) throws PortalException, SystemException {
+
 		return comuneLocalService.getComune(comuneId);
 	}
 
 	@Override
 	public List<Comune> getComunes(int start, int end) throws SystemException {
+
 		return comuneLocalService.getComunes(start, end);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java
index a896cdd6..7508e4ed 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -42,17 +38,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the comunicazione local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ComunicazioneLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java
index 710b40ae..7d3f87ef 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -21,17 +17,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the comunicazione remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ComunicazioneService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ComunicazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java
index 49545252..262902ee 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -27,17 +23,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the configurazione local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ConfigurazioneLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil
  */
@@ -81,8 +75,7 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa
 		Configurazione configurazione = null;
 		try {
 			configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave);
-		} catch (NoSuchConfigurazioneException e) {
-		}
+		} catch (NoSuchConfigurazioneException e) {}
 		if (configurazione == null) {
 			configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName()));
 			configurazione.setChiave(chiave);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java
index ca2531dd..1ae5c6b9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -22,17 +16,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the configurazione remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ConfigurazioneService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ConfigurazioneServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java
index 7c7b95d0..94bb4644 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -77,17 +73,15 @@ import com.liferay.portlet.asset.model.AssetLinkConstants;
 
 /**
  * The implementation of the controllo pratica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ControlloPraticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil
  */
@@ -161,7 +155,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 	public ControlloPratica deleteControlloPratica(long controlloPraticaId) throws PortalException, SystemException {
 
 		ControlloPratica entry = controlloPraticaPersistence.findByPrimaryKey(controlloPraticaId);
-
 		return deleteControlloPratica(entry);
 	}
 
@@ -363,23 +356,23 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		} else {
 			boolean updateIntPratica = true;
 			switch (esito) {
-			case StatoPraticaConstants.CONFORME:
-			case StatoPraticaConstants.AUTORIZZATA:
-				ramoWorkflow = "approvato";
-				break;
-			case StatoPraticaConstants.NON_CONFORME:
-			case StatoPraticaConstants.NON_AUTORIZZATA:
-				ramoWorkflow = "non_approvato";
-				break;
-			case StatoPraticaConstants.INTEGRAZIONE:
-				ramoWorkflow = "richiesta_integrazione";
-				break;
-			case StatoPraticaConstants.ANNULLATA:
-				ramoWorkflow = "annullato";
-				updateIntPratica = false; // Annulla solo il workflow
-				break;
-			default:
-				break;
+				case StatoPraticaConstants.CONFORME:
+				case StatoPraticaConstants.AUTORIZZATA:
+					ramoWorkflow = "approvato";
+					break;
+				case StatoPraticaConstants.NON_CONFORME:
+				case StatoPraticaConstants.NON_AUTORIZZATA:
+					ramoWorkflow = "non_approvato";
+					break;
+				case StatoPraticaConstants.INTEGRAZIONE:
+					ramoWorkflow = "richiesta_integrazione";
+					break;
+				case StatoPraticaConstants.ANNULLATA:
+					ramoWorkflow = "annullato";
+					updateIntPratica = false; // Annulla solo il workflow
+					break;
+				default:
+					break;
 			}
 			if (updateIntPratica) {
 				intPraticaLocalService.updateStatoPratica(controlloPratica.getIntPraticaId(), esito);
@@ -424,7 +417,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 		JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 		jsonObject.put("istruttore", jsonArray);
-		Role role = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), "portos_istruttore");
+		Role role = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE);
 		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
 				controlloPratica.getGroupId(), role.getRoleId());
 		for (UserGroupRole userGroupRole : userGroupRoles) {
@@ -494,6 +487,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 	@Override
 	public ControlloPratica addPraticheAlControllo(long controlloPraticaId, long dettPraticaId) throws PortalException,
 			SystemException {
+
 		ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId);
 		controlloPratica.setDettPraticaId(dettPraticaId);
 		controlloPratica.setModifiedDate(new Date());
@@ -577,29 +571,29 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 					if (json.has(WorkflowConstants.WORKFLOW_TASKNAME_ESITO)) {
 						String appString = json.getString(WorkflowConstants.WORKFLOW_TASKNAME_ESITO);
 						switch (appString) {
-						case StatoPraticaConstants.INTEGRAZIONE:
-							tipoEsito = "Richiesta Integrazione";
-							break;
-						case StatoPraticaConstants.CONFORME:
-							if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-								tipoEsito = "Conforme";
-							} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-								tipoEsito = "Autorizzata";
-							}
-							break;
-						case StatoPraticaConstants.NON_CONFORME:
-							if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-								tipoEsito = "Non conforme";
-							} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-								tipoEsito = "Non autorizzata";
-							}
-							break;
-						case StatoPraticaConstants.ANNULLATA:
-							tipoEsito = "Annullata";
-							break;
-
-						default:
-							break;
+							case StatoPraticaConstants.INTEGRAZIONE:
+								tipoEsito = "Richiesta Integrazione";
+								break;
+							case StatoPraticaConstants.CONFORME:
+								if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+									tipoEsito = "Conforme";
+								} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
+									tipoEsito = "Autorizzata";
+								}
+								break;
+							case StatoPraticaConstants.NON_CONFORME:
+								if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+									tipoEsito = "Non conforme";
+								} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
+									tipoEsito = "Non autorizzata";
+								}
+								break;
+							case StatoPraticaConstants.ANNULLATA:
+								tipoEsito = "Annullata";
+								break;
+
+							default:
+								break;
 						}
 					}
 				}
@@ -640,37 +634,37 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 				_log.debug("Avviso " + tipo + StringPool.SPACE + avviso.getDtAvviso() + StringPool.SPACE
 						+ avviso.getCreateDate());
 				switch (tipo) {
-				case StatoPraticaConstants.INTEGRAZIONE:
-					start = avviso.getCreateDate();
-					end = null;
-					if (Validator.isNotNull(chiusura)) {
-						apertura = avviso.getDtAvviso();
-						chiusura = null;
-						stop = 0L;
-						_log.debug("Reset apertura al " + apertura);
-					}
-					_log.debug("IN start = " + start + ", pratica " + pratica.getNumeroProgetto());
-					break;
-				case StatoPraticaConstants.VIDIMATA:
-					if (Validator.isNull(chiusura)) {
+					case StatoPraticaConstants.INTEGRAZIONE:
+						start = avviso.getCreateDate();
+						end = null;
+						if (Validator.isNotNull(chiusura)) {
+							apertura = avviso.getDtAvviso();
+							chiusura = null;
+							stop = 0L;
+							_log.debug("Reset apertura al " + apertura);
+						}
+						_log.debug("IN start = " + start + ", pratica " + pratica.getNumeroProgetto());
+						break;
+					case StatoPraticaConstants.VIDIMATA:
+						if (Validator.isNull(chiusura)) {
+							end = avviso.getCreateDate();
+							_log.debug(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto());
+						} else {
+							apertura = avviso.getDtAvviso();
+							chiusura = start = end = null;
+							stop = 0L;
+							_log.debug("Reset apertura al " + apertura);
+						}
+						break;
+					case StatoPraticaConstants.INTEGRAZIONE_ACCETTATA:
 						end = avviso.getCreateDate();
 						_log.debug(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto());
-					} else {
-						apertura = avviso.getDtAvviso();
-						chiusura = start = end = null;
-						stop = 0L;
-						_log.debug("Reset apertura al " + apertura);
-					}
-					break;
-				case StatoPraticaConstants.INTEGRAZIONE_ACCETTATA:
-					end = avviso.getCreateDate();
-					_log.debug(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto());
-					break;
-				case StatoPraticaConstants.AUTORIZZATA:
-				case StatoPraticaConstants.NON_AUTORIZZATA:
-					chiusura = avviso.getCreateDate();
-					_log.debug("Chiusura al " + chiusura);
-					break;
+						break;
+					case StatoPraticaConstants.AUTORIZZATA:
+					case StatoPraticaConstants.NON_AUTORIZZATA:
+						chiusura = avviso.getCreateDate();
+						_log.debug("Chiusura al " + chiusura);
+						break;
 				}
 			}
 			if (Validator.isNotNull(start) && Validator.isNotNull(end)) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaServiceImpl.java
index 2827d018..d26169f6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -18,22 +12,21 @@ import it.tref.liferay.portos.bo.service.base.ControlloPraticaServiceBaseImpl;
 
 /**
  * The implementation of the controllo pratica remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.service.ControlloPraticaService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.ControlloPraticaService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ControlloPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil
  */
 public class ControlloPraticaServiceImpl extends ControlloPraticaServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil} to access the controllo pratica remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.ControlloPraticaServiceUtil} to access the controllo pratica remote service.
 	 */
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java
index 81359d7f..5b24f46a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -50,17 +46,15 @@ import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil;
 
 /**
  * The implementation of the delega local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DelegaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DelegaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil
  */
@@ -240,6 +234,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 		return delegaPersistence.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<String> findCfByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException {
 
@@ -248,6 +243,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 		return delegaPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Delega> findByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException {
 
@@ -255,6 +251,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 		return delegaPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<String> findCfByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, String[] esiti)
 			throws SystemException {
@@ -265,6 +262,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 		return delegaPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Delega> findByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, String[] esiti)
 			throws SystemException {
@@ -423,8 +421,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 				String sha256 = StringPool.BLANK;
 				try {
 					sha256 = DigestUtils.sha256Hex(dlAppLocalService.getFileEntry(fileEntryId).getContentStream());
-				} catch (Exception e) {
-				}
+				} catch (Exception e) {}
 				FirmeBean firmeBean = new FirmeBean();
 				String jsonFirmatari = FirmeUtil.addFirma(firmeBean, user.getScreenName());
 				docPraticaLocalService.addDocPraticaAnnullamento(userId, Delega.class.getName(), delega.getDelegaId(),
@@ -434,7 +431,6 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl {
 			} else {
 				_log.info("Impossibile generare documento delega - soggetto non trovato");
 			}
-
 		} catch (Exception e) {
 			_log.error("Errore in generaDocumentoConcludiDelegaGeologo", e);
 			throw new PortalException(e);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java
index a4721c80..eed9d6f5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -26,172 +22,221 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the delega remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.DelegaService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.DelegaService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DelegaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DelegaServiceUtil
  */
 public class DelegaServiceImpl extends DelegaServiceBaseImpl {
-  /*
-   * NOTE FOR DEVELOPERS:
-   * 
-   * Never reference this interface directly. Always use {@link
-   * it.tref.liferay.portos.bo.service.DelegaServiceUtil} to access the delega remote service.
-   */
-  public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale,
-      ServiceContext serviceContext) throws PortalException, SystemException {
-    if (!DelegheUtil.hasCreazioneDelega(userId, intPraticaId)) {
-      throw new SystemException("TODO aggiungere eccezione");
-    }
-    return delegaLocalService.addDelega(userId, intPraticaId, dettPraticaId, tipologia, codiceFiscale, serviceContext);
-  }
-
-
-  public Delega annullaDelega(long delegaId) throws PortalException, SystemException {
-    return annullaDelega(delegaLocalService.getDelega(delegaId));
-  }
-
-  public Delega annullaDelega(Delega delega) throws PortalException, SystemException {
-    IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId());
-    if (!DelegheUtil.hasAnnullaDelega(getUserId(), intPratica.getIntPraticaId())) {
-      throw new SystemException("TODO aggiungere eccezione");
-    }
-    return delegaLocalService.cambioStato(delega.getDelegaId(), DelegheUtil.STATO_ANNULLATA);
-  }
-
-  public Delega deleteDelega(Delega delega) throws PortalException, SystemException {
-    IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId());
-    if (!DelegheUtil.hasDeleteDelega(getUserId(), intPratica.getIntPraticaId())) {
-      throw new SystemException("TODO aggiungere eccezione");
-    }
-    return delegaLocalService.deleteDelega(delega);
-  }
-
-  public Delega deleteDelega(long delegaId) throws PortalException, SystemException {
-    return deleteDelega(delegaLocalService.getDelega(delegaId));
-  }
-
-  public Delega cambioStato(long userId, long delegaId, String esito) throws PortalException, SystemException {
-    if (!DelegheUtil.hasCambioStatoDelega(userId, delegaId)) {
-      throw new SystemException("TODO aggiungere eccezione");
-    }
-    return delegaLocalService.cambioStato(delegaId, esito);
-  }
-
-  public List<Delega> findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator)
-      throws SystemException {
-    return delegaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator);
-  }
-
-  public List<Delega> findByDettPratica(long dettPraticaId, int start, int end, OrderByComparator orderByComparator)
-      throws SystemException {
-    return delegaLocalService.findByDettPratica(dettPraticaId, start, end, orderByComparator);
-  }
-
-  public int countByIntPratica(long intPraticaId) throws SystemException {
-    return delegaLocalService.countByIntPratica(intPraticaId);
-  }
-
-  public int countByDettPratica(long dettPraticaId) throws SystemException {
-    return delegaLocalService.countByDettPratica(dettPraticaId);
-  }
-
-  public List<Delega> findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService
-        .findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end, orderByComparator);
-  }
-
-  public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException {
-    return delegaLocalService.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale);
-  }
-
-  public List<Delega> findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, orderByComparator);
-  }
-
-  public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException {
-    return delegaLocalService.countByCodiceFiscale_InEsito(codiceFiscale, esiti);
-  }
-
-  public List<Delega> findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti,
-      int start, int end, OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, start, end,
-        orderByComparator);
-  }
-
-  public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti)
-      throws SystemException {
-    return delegaLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti);
-  }
-
-  public List<Delega> findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator);
-  }
-
-  public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException {
-    return delegaLocalService.countByIntPratica_InEsito(intPraticaId, esiti);
-  }
-
-  public List<Delega> findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator);
-  }
-
-  public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException {
-    return delegaLocalService.countByDettPratica_InEsito(dettPraticaId, esiti);
-  }
-
-  public List<Delega> findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti,
-      int start, int end, OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start, end,
-        orderByComparator);
-  }
-
-  public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti)
-      throws SystemException {
-    return delegaLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti);
-  }
-
-  public List<Delega> findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale,
-      String tipologia, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, tipologia,
-        esiti, start, end, orderByComparator);
-  }
-
-  public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale,
-      String tipologia, String[] esiti) throws SystemException {
-    return delegaLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, tipologia,
-        esiti);
-  }
-
-  public List<Delega> findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti,
-      int start, int end, OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end,
-        orderByComparator);
-  }
-
-  public List<Delega> findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti,
-      int start, int end, OrderByComparator orderByComparator) throws SystemException {
-    return delegaLocalService.findByIntPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, end,
-        orderByComparator);
-  }
-
-  public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti)
-      throws SystemException {
-    return delegaLocalService.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti);
-  }
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.DelegaServiceUtil} to access the delega remote service.
+	 */
+	@Override
+	public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale,
+			ServiceContext serviceContext) throws PortalException, SystemException {
+
+		if (!DelegheUtil.hasCreazioneDelega(userId, intPraticaId)) {
+			throw new SystemException("TODO aggiungere eccezione");
+		}
+		return delegaLocalService.addDelega(userId, intPraticaId, dettPraticaId, tipologia, codiceFiscale,
+				serviceContext);
+	}
+
+	@Override
+	public Delega annullaDelega(long delegaId) throws PortalException, SystemException {
+
+		return annullaDelega(delegaLocalService.getDelega(delegaId));
+	}
+
+	@Override
+	public Delega annullaDelega(Delega delega) throws PortalException, SystemException {
+
+		IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId());
+		if (!DelegheUtil.hasAnnullaDelega(getUserId(), intPratica.getIntPraticaId())) {
+			throw new SystemException("TODO aggiungere eccezione");
+		}
+		return delegaLocalService.cambioStato(delega.getDelegaId(), DelegheUtil.STATO_ANNULLATA);
+	}
+
+	@Override
+	public Delega deleteDelega(Delega delega) throws PortalException, SystemException {
+
+		IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId());
+		if (!DelegheUtil.hasDeleteDelega(getUserId(), intPratica.getIntPraticaId())) {
+			throw new SystemException("TODO aggiungere eccezione");
+		}
+		return delegaLocalService.deleteDelega(delega);
+	}
+
+	@Override
+	public Delega deleteDelega(long delegaId) throws PortalException, SystemException {
+
+		return deleteDelega(delegaLocalService.getDelega(delegaId));
+	}
+
+	@Override
+	public Delega cambioStato(long userId, long delegaId, String esito) throws PortalException, SystemException {
+
+		if (!DelegheUtil.hasCambioStatoDelega(userId, delegaId)) {
+			throw new SystemException("TODO aggiungere eccezione");
+		}
+		return delegaLocalService.cambioStato(delegaId, esito);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator)
+			throws SystemException {
+
+		return delegaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator);
+	}
+
+	@Override
+	public List<Delega> findByDettPratica(long dettPraticaId, int start, int end, OrderByComparator orderByComparator)
+			throws SystemException {
+
+		return delegaLocalService.findByDettPratica(dettPraticaId, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica(long intPraticaId) throws SystemException {
+
+		return delegaLocalService.countByIntPratica(intPraticaId);
+	}
+
+	@Override
+	public int countByDettPratica(long dettPraticaId) throws SystemException {
+
+		return delegaLocalService.countByDettPratica(dettPraticaId);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException {
+
+		return delegaLocalService.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale);
+	}
+
+	@Override
+	public List<Delega> findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException {
+
+		return delegaLocalService.countByCodiceFiscale_InEsito(codiceFiscale, esiti);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, start,
+				end, orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti)
+			throws SystemException {
+
+		return delegaLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException {
+
+		return delegaLocalService.countByIntPratica_InEsito(intPraticaId, esiti);
+	}
+
+	@Override
+	public List<Delega> findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException {
+
+		return delegaLocalService.countByDettPratica_InEsito(dettPraticaId, esiti);
+	}
+
+	@Override
+	public List<Delega> findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti)
+			throws SystemException {
+
+		return delegaLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale,
+			String tipologia, String[] esiti, int start, int end, OrderByComparator orderByComparator)
+			throws SystemException {
+
+		return delegaLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale,
+				tipologia, esiti, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale,
+			String tipologia, String[] esiti) throws SystemException {
+
+		return delegaLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale,
+				tipologia, esiti);
+	}
+
+	@Override
+	public List<Delega> findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public List<Delega> findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
+
+		return delegaLocalService.findByIntPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti)
+			throws SystemException {
 
+		return delegaLocalService.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti);
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java
index e9f469a0..7f14138f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -41,6 +37,7 @@ import java.math.BigDecimal;
 import java.sql.Types;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -83,17 +80,15 @@ import com.liferay.portlet.asset.model.AssetLinkConstants;
 
 /**
  * The implementation of the dett pratica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DettPraticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil
  */
@@ -332,11 +327,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dynamicQuery(dynamicQuery, 0, 1);
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@Override
@@ -349,11 +340,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dynamicQuery(dynamicQuery, 0, 1);
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@Override
@@ -368,11 +355,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dynamicQuery(dynamicQuery, 0, 1);
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@Override
@@ -386,11 +369,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dynamicQuery(dynamicQuery, 0, 1);
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@Override
@@ -405,11 +384,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, 0, 1);
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@Override
@@ -426,12 +401,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
 		@SuppressWarnings("unchecked")
 		List<DettPratica> ritorno = dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, 0, 1);
-
-		if (ritorno.isEmpty()) {
-			return null;
-		} else {
-			return ritorno.get(0);
-		}
+		return ritorno.isEmpty() ? null : ritorno.get(0);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -458,8 +428,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE));
 		dynamicQuery.add(RestrictionsFactoryUtil.in("tipoIntegrazione", tipoPratiche));
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId"));
-		int size = dynamicQuery(dynamicQuery).size();
-		return size;
+		return dynamicQuery(dynamicQuery).size();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -487,8 +456,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		for (Soggetto soggetto : soggetti) {
 			try {
 				soggettoLocalService.deleteSoggetto(soggetto);
-			} catch (PortalException e) {
-			}
+			} catch (PortalException e) {}
 		}
 		List<DocPratica> allegati = docPraticaLocalService.findByClassPk(dettPratica.getDettPraticaId());
 		for (DocPratica allegato : allegati) {
@@ -508,8 +476,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		for (Pagamento pagamento : pagamenti) {
 			try {
 				pagamentoLocalService.deletePagamento(pagamento);
-			} catch (PortalException e) {
-			}
+			} catch (PortalException e) {}
 		}
 		return super.deleteDettPratica(dettPratica);
 	}
@@ -1562,6 +1529,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	@Override
 	public void updateAsset(DettPratica dettPratica, long[] categoryIds, boolean visible) throws SystemException,
 			PortalException {
+
 	}
 
 	@Override
@@ -1638,24 +1606,24 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 
 		DettPratica dettPratica = getDettPratica(dettPraticaId);
 		switch (tipologiaSoggetto) {
-		case TipoSoggettoUtil.COMMITTENTE:
-			dettPratica.setCodiceFiscalePrincipaleCommittente(codiceFiscale);
-			break;
-		case TipoSoggettoUtil.COLLAUDATORE:
-			dettPratica.setCodiceFiscalePrincipaleCollaudatore(codiceFiscale);
-			break;
-		case TipoSoggettoUtil.DIRETTORE_LAVORI:
-			dettPratica.setCodiceFiscalePrincipaleDirettoreLavori(codiceFiscale);
-			break;
-		case TipoSoggettoUtil.PROGETTISTA:
-			dettPratica.setCodiceFiscalePrincipaleProgettista(codiceFiscale);
-			break;
-		case TipoSoggettoUtil.GEOLOGO:
-			dettPratica.setCodiceFiscalePrincipaleGeologo(codiceFiscale);
-			break;
-		case TipoSoggettoUtil.DITTA:
-			dettPratica.setCodiceFiscalePrincipaleDitta(codiceFiscale);
-			break;
+			case TipoSoggettoUtil.COMMITTENTE:
+				dettPratica.setCodiceFiscalePrincipaleCommittente(codiceFiscale);
+				break;
+			case TipoSoggettoUtil.COLLAUDATORE:
+				dettPratica.setCodiceFiscalePrincipaleCollaudatore(codiceFiscale);
+				break;
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				dettPratica.setCodiceFiscalePrincipaleDirettoreLavori(codiceFiscale);
+				break;
+			case TipoSoggettoUtil.PROGETTISTA:
+				dettPratica.setCodiceFiscalePrincipaleProgettista(codiceFiscale);
+				break;
+			case TipoSoggettoUtil.GEOLOGO:
+				dettPratica.setCodiceFiscalePrincipaleGeologo(codiceFiscale);
+				break;
+			case TipoSoggettoUtil.DITTA:
+				dettPratica.setCodiceFiscalePrincipaleDitta(codiceFiscale);
+				break;
 		}
 		dettPratica = updateDettPratica(dettPratica);
 		return dettPratica;
@@ -1664,70 +1632,21 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	private static final List<String> dettPraticaFields;
 	private static final Map<String, Integer> dettPraticaFieldsTypes;
 	static {
-		@SuppressWarnings("serial")
-		List<String> hiddenFields = new ArrayList<String>() {
-			{
-				add("causalePagamentoBolli");
-				add("causalePagamentoOneri");
-				add("codiceFiscaleDelegato");
-				add("codicePagamentoBolli");
-				add("codicePagamentoOneri");
-				add("codiceRuoloDelegato");
-				add("companyId");
-				add("completa");
-				add("createDate");
-				add("dataEffettuazione");
-				add("dettPraticaId");
-				add("dtInvioSignal");
-				add("dtProtocollo");
-				add("geoDtRelazione");
-				add("gestita");
-				add("groupId");
-				add("importoBolli");
-				add("importoSpeseIstruttoria");
-				add("integrazione");
-				add("intPraticaId");
-				add("mezzoPagamentoBolli");
-				add("mezzoPagamentoOneri");
-				add("modifiedDate");
-				add("pagAdeguamentoSismico");
-				add("pagAltro");
-				add("pagamentoIdBolli");
-				add("pagamentoIdOneri");
-				add("pagCalcolatoAdeguamentoSismico");
-				add("pagCalcolatoMiglioramentoSismico");
-				add("pagCalcolatoOperaNonQuantificabile");
-				add("pagCalcolatoRiparazioneInterventoLocale");
-				add("pagEffettivoAdeguamentoSismico");
-				add("pagEffettivoMiglioramentoSismico");
-				add("pagEffettivoOperaNonQuantificabile");
-				add("pagEffettivoRiparazioneInterventoLocale");
-				add("pagMiglioramentoSismico");
-				add("pagMiglioramentoSismicoSicilia");
-				add("pagNoteUtente");
-				add("pagNuovaCostruzione");
-				add("pagOperaNonQuantificabile");
-				add("pagRiparazioneInterventoLocale");
-				add("pagVarianti");
-				add("protocollo");
-				add("soggettoSostituitoId");
-				add("status");
-				add("statusByUserId");
-				add("statusByUserName");
-				add("statusDate");
-				add("statusTask");
-				add("tipoIntegrazione");
-				add("uuid_");
-				add("userId");
-				add("userName");
-				add("varianteNumero");
-				add("varianteSostanziale");
-				add("variataDa");
-				add("version");
-				add("versionata");
-				add("workflowForzato");
-			}
-		};
+		List<String> hiddenFields = Arrays.asList("causalePagamentoBolli", "causalePagamentoOneri",
+				"codiceFiscaleDelegato", "codicePagamentoBolli", "codicePagamentoOneri", "codiceRuoloDelegato",
+				"companyId", "completa", "createDate", "dataEffettuazione", "dettPraticaId", "dtInvioSignal",
+				"dtProtocollo", "geoDtRelazione", "gestita", "groupId", "importoBolli", "importoSpeseIstruttoria",
+				"integrazione", "intPraticaId", "mezzoPagamentoBolli", "mezzoPagamentoOneri", "modifiedDate",
+				"pagAdeguamentoSismico", "pagAltro", "pagamentoIdBolli", "pagamentoIdOneri",
+				"pagCalcolatoAdeguamentoSismico", "pagCalcolatoMiglioramentoSismico",
+				"pagCalcolatoOperaNonQuantificabile", "pagCalcolatoRiparazioneInterventoLocale",
+				"pagEffettivoAdeguamentoSismico", "pagEffettivoMiglioramentoSismico",
+				"pagEffettivoOperaNonQuantificabile", "pagEffettivoRiparazioneInterventoLocale",
+				"pagMiglioramentoSismico", "pagMiglioramentoSismicoSicilia", "pagNoteUtente", "pagNuovaCostruzione",
+				"pagOperaNonQuantificabile", "pagRiparazioneInterventoLocale", "pagVarianti", "protocollo",
+				"soggettoSostituitoId", "status", "statusByUserId", "statusByUserName", "statusDate", "statusTask",
+				"tipoIntegrazione", "uuid_", "userId", "userName", "varianteNumero", "varianteSostanziale",
+				"variataDa", "version", "versionata", "workflowForzato");
 		dettPraticaFields = new ArrayList<>();
 		dettPraticaFieldsTypes = new HashMap<>();
 		for (int i = 0; i < DettPraticaImpl.TABLE_COLUMNS.length; i++) {
@@ -1794,21 +1713,21 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	public boolean isNumber(String field) {
 
 		switch (dettPraticaFieldsTypes.get(field)) {
-		case Types.BOOLEAN:
-		case Types.TIMESTAMP:
-			return false;
-		case Types.VARCHAR:
-			switch (field) {
-			case "importoSpeseIstruttoria":
+			case Types.BOOLEAN:
+			case Types.TIMESTAMP:
+				return false;
+			case Types.VARCHAR:
+				switch (field) {
+					case "importoSpeseIstruttoria":
+						return true;
+				}
+				return false;
+			case Types.BIGINT:
+			case Types.DOUBLE:
+			case Types.INTEGER:
 				return true;
-			}
-			return false;
-		case Types.BIGINT:
-		case Types.DOUBLE:
-		case Types.INTEGER:
-			return true;
-		default:
-			_log.info(dettPraticaFieldsTypes.get(field));
+			default:
+				_log.info(dettPraticaFieldsTypes.get(field));
 		}
 		return true;
 	}
@@ -1817,31 +1736,31 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	public String format(String field, Serializable value) {
 
 		switch (dettPraticaFieldsTypes.get(field)) {
-		case Types.BOOLEAN:
-			return (Boolean) value ? "Sì" : "No";
-		case Types.TIMESTAMP:
-			Date dt;
-			if (value instanceof Long) {
-				dt = new Date((Long) value);
-			} else if (value instanceof String) {
-				String s = (String) value;
-				if (s.isEmpty()) {
-					return s;
+			case Types.BOOLEAN:
+				return (Boolean) value ? "Sì" : "No";
+			case Types.TIMESTAMP:
+				Date dt;
+				if (value instanceof Long) {
+					dt = new Date((Long) value);
+				} else if (value instanceof String) {
+					String s = (String) value;
+					if (s.isEmpty()) {
+						return s;
+					}
+					dt = new Date(Long.parseLong(s));
+				} else {
+					return "{{{{{{{" + value + "}}}}}}}";
 				}
-				dt = new Date(Long.parseLong(s));
-			} else {
-				return "{{{{{{{" + value + "}}}}}}}";
-			}
-			return FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(dt);
-		case Types.VARCHAR:
-			return (String) value;
-		case Types.BIGINT:
-		case Types.DOUBLE:
-		case Types.INTEGER:
-			return NumberFormat.getInstance().format(value);
-		default:
-			_log.info(dettPraticaFieldsTypes.get(field));
-			return "XXXXXXXXXXXXX";
+				return FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(dt);
+			case Types.VARCHAR:
+				return (String) value;
+			case Types.BIGINT:
+			case Types.DOUBLE:
+			case Types.INTEGER:
+				return NumberFormat.getInstance().format(value);
+			default:
+				_log.info(dettPraticaFieldsTypes.get(field));
+				return "XXXXXXXXXXXXX";
 		}
 	}
 
@@ -1852,6 +1771,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	}
 
 	private DynamicQuery queryVersioning(long intPraticaId) {
+
 		DynamicQuery query = dynamicQuery();
 		query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		query.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_APPROVED));
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java
index ce024bc1..c4de965f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -32,17 +28,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the dett pratica remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DettPraticaService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DettPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DettPraticaServiceUtil
  */
@@ -184,7 +178,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 
 		DettPratica dettPratica = null;
 		if (!disabledSubmit && DelegheUtil.hasDelegaCompilazioneDomanda(userId, dettPraticaId)) {
-
 			dettPratica = dettPraticaLocalService.updateDettPraticaDatiDomanda(userId, dettPraticaId, intPraticaId,
 					tipoIntegrazione, destinazione, ag, descLongIntervento, via, localita, estremiCatastali,
 					estremiPratCom, varianteSostanziale, collaudoStatico, codiceFiscaleDelegatoCommittente,
@@ -218,7 +211,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 					normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt,
 					clRischioPostInt, intervFinPub, intervFinPubDesc, tcNuovaCostruzioneComplessa, serviceContext,
 					bozza);
-
 		}
 		if (!geoDisabledSubmit && DelegheUtil.hasDelegaCompilazioneSezioneGeologica(userId, dettPraticaId)) {
 			dettPratica = dettPraticaLocalService.updateDettPraticaGeologo(userId, dettPraticaId, intPraticaId,
@@ -229,7 +221,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 					geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni,
 					geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche,
 					geoDtRelazione, serviceContext, bozza);
-
 		}
 		return dettPratica;
 	}
@@ -293,7 +284,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 				pagCalcolatoOperaNonQuantificabile, pagEffettivoAdeguamentoSismico, pagEffettivoMiglioramentoSismico,
 				pagEffettivoRiparazioneInterventoLocale, pagEffettivoOperaNonQuantificabile, pagNoteUtente,
 				codiceFiscaleCommittente, currentURL, serviceContext);
-
 	}
 
 	@Override
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java
index bebb58ad..e264e3c6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -38,17 +34,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the doc aggiuntiva local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DocAggiuntivaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil
  */
@@ -172,8 +166,7 @@ public class DocAggiuntivaLocalServiceImpl extends DocAggiuntivaLocalServiceBase
 			if (Validator.isNotNull(docAggiuntiva.getFileEntryId())) {
 				dlAppLocalService.deleteFileEntry(docAggiuntiva.getFileEntryId());
 			}
-		} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {
-		} catch (PortalException e) {
+		} catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) {} catch (PortalException e) {
 			throw new SystemException(e);
 		}
 		return super.deleteDocAggiuntiva(docAggiuntiva);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaServiceImpl.java
index 79f4bc27..c2c03e6b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -24,82 +20,100 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the doc aggiuntiva remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.DocAggiuntivaService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.DocAggiuntivaService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DocAggiuntivaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil
  */
 public class DocAggiuntivaServiceImpl extends DocAggiuntivaServiceBaseImpl {
-  /*
-   * NOTE FOR DEVELOPERS:
-   * 
-   * Never reference this interface directly. Always use {@link
-   * it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil} to access the doc aggiuntiva remote
-   * service.
-   */
-
-  public List<DocAggiuntiva> findByIntPratica(long intPraticaId) throws SystemException {
-    return docAggiuntivaLocalService.findByIntPratica(intPraticaId);
-  }
-
-  public List<DocAggiuntiva> findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator)
-      throws SystemException {
-    return docAggiuntivaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator);
-  }
-
-  public int countByIntPratica(long intPraticaId) throws SystemException {
-    return docAggiuntivaLocalService.countByIntPratica(intPraticaId);
-  }
-
-  public List<DocAggiuntiva> findByDettPratica(long dettPraticaId) throws SystemException {
-    return docAggiuntivaLocalService.findByIntPratica(dettPraticaId);
-  }
-
-  public List<DocAggiuntiva> findByDettPratica(long dettPraticaId, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return docAggiuntivaLocalService.findByIntPratica(dettPraticaId, start, end, orderByComparator);
-  }
-
-  public int countByDettPratica(long dettPraticaId) throws SystemException {
-    return docAggiuntivaLocalService.countByIntPratica(dettPraticaId);
-  }
-
-  public List<DocAggiuntiva> findByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException {
-    return docAggiuntivaLocalService.findByIntPraticaFeVisible(intPraticaId, feVisible);
-  }
-
-  public List<DocAggiuntiva> findByIntPratica(long intPraticaId, boolean feVisible, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
-    return docAggiuntivaLocalService.findByIntPraticaFeVisible(intPraticaId, feVisible, start, end, orderByComparator);
-  }
-
-  public int countByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException {
-    return docAggiuntivaLocalService.countByIntPraticaFeVisible(intPraticaId, feVisible);
-  }
-
-  public DocAggiuntiva addDocAggiuntiva(long userId, long intPraticaId, long dettPraticaId, String descrizione,
-      boolean feVisible, byte[] content, String sourceFileName, ServiceContext serviceContext) throws SystemException,
-      PortalException {
-    return docAggiuntivaLocalService.addDocAggiuntiva(userId, intPraticaId, dettPraticaId, descrizione, feVisible,
-        content, sourceFileName, serviceContext);
-  }
-
-  public DocAggiuntiva deleteDocAggiuntiva(DocAggiuntiva docAggiuntiva) throws SystemException {
-    return docAggiuntivaLocalService.deleteDocAggiuntiva(docAggiuntiva);
-  }
-
-  public DocAggiuntiva deleteDocAggiuntiva(long docAggiuntivaId) throws PortalException, SystemException {
-    return docAggiuntivaLocalService.deleteDocAggiuntiva(docAggiuntivaId);
-  }
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil} to access the doc aggiuntiva remote service.
+	 */
+
+	@Override
+	public List<DocAggiuntiva> findByIntPratica(long intPraticaId) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPratica(intPraticaId);
+	}
+
+	@Override
+	public List<DocAggiuntiva> findByIntPratica(long intPraticaId, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByIntPratica(long intPraticaId) throws SystemException {
+
+		return docAggiuntivaLocalService.countByIntPratica(intPraticaId);
+	}
+
+	@Override
+	public List<DocAggiuntiva> findByDettPratica(long dettPraticaId) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPratica(dettPraticaId);
+	}
+
+	@Override
+	public List<DocAggiuntiva> findByDettPratica(long dettPraticaId, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPratica(dettPraticaId, start, end, orderByComparator);
+	}
+
+	@Override
+	public int countByDettPratica(long dettPraticaId) throws SystemException {
+
+		return docAggiuntivaLocalService.countByIntPratica(dettPraticaId);
+	}
+
+	@Override
+	public List<DocAggiuntiva> findByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPraticaFeVisible(intPraticaId, feVisible);
+	}
+
+	@Override
+	public List<DocAggiuntiva> findByIntPratica(long intPraticaId, boolean feVisible, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
+
+		return docAggiuntivaLocalService.findByIntPraticaFeVisible(intPraticaId, feVisible, start, end,
+				orderByComparator);
+	}
+
+	@Override
+	public int countByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException {
+
+		return docAggiuntivaLocalService.countByIntPraticaFeVisible(intPraticaId, feVisible);
+	}
+
+	@Override
+	public DocAggiuntiva addDocAggiuntiva(long userId, long intPraticaId, long dettPraticaId, String descrizione,
+			boolean feVisible, byte[] content, String sourceFileName, ServiceContext serviceContext)
+			throws SystemException, PortalException {
+
+		return docAggiuntivaLocalService.addDocAggiuntiva(userId, intPraticaId, dettPraticaId, descrizione, feVisible,
+				content, sourceFileName, serviceContext);
+	}
+
+	@Override
+	public DocAggiuntiva deleteDocAggiuntiva(DocAggiuntiva docAggiuntiva) throws SystemException {
+
+		return docAggiuntivaLocalService.deleteDocAggiuntiva(docAggiuntiva);
+	}
+
+	@Override
+	public DocAggiuntiva deleteDocAggiuntiva(long docAggiuntivaId) throws PortalException, SystemException {
 
+		return docAggiuntivaLocalService.deleteDocAggiuntiva(docAggiuntivaId);
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java
index 40c07bc8..6a944dbd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -53,17 +49,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the doc pratica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DocPraticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil
  */
@@ -80,8 +74,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 			if (Validator.isNotNull(docPratica.getDlFileEntryId())) {
 				dlAppLocalService.deleteFileEntry(docPratica.getDlFileEntryId());
 			}
-		} catch (PortalException e) {
-		}
+		} catch (PortalException e) {}
 		return super.deleteDocPratica(docPratica);
 	}
 
@@ -343,6 +336,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return (int) docPraticaPersistence.countWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getDocPraticaDaInviareDax(int start, int end) throws SystemException {
 
@@ -409,6 +403,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return docPraticaPersistence.findByClassPk_Tipologia(classPk, tipologia, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> findByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
@@ -420,6 +415,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return soggettoPersistence.findWithDynamicQuery(dynamicQuery, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> findByIntPratica_ClassPk_Tipologia(long intPraticaId, long classPk, String tipologia,
 			int start, int end) throws SystemException {
@@ -432,6 +428,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> findByIntPratica_ClassPk_Tipologie(long intPraticaId, long classPk, List<String> tipologie)
 			throws SystemException {
@@ -444,6 +441,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> findByIntPratica_ClassPkEqual_Tipologie(long intPraticaId, long classPk,
 			List<String> tipologie) throws SystemException {
@@ -475,6 +473,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return findDistinctDlFileEntryId(new long[] { classPk }, tipologia, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Long> findDistinctDlFileEntryId(long[] classPks, String tipologia, int start, int end)
 			throws SystemException {
@@ -491,6 +490,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return docPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidByIntPratica(long intPraticaId) throws SystemException {
 
@@ -501,6 +501,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
@@ -521,6 +522,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return (int) docPraticaPersistence.countWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
@@ -531,6 +533,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidTmpByIntPratica_DettPratica_Tipologia(long intPraticaId, long dettPraticaId,
 			String tipologia, int start, int end) throws SystemException {
@@ -543,6 +546,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery, start, end);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidTmpByIntPratica_Tipologie(long intPraticaId, String[] tipologie, int start, int end)
 			throws SystemException {
@@ -569,6 +573,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getInvalidByIntPratica(long intPraticaId) throws SystemException {
 
@@ -579,6 +584,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getInvalidTmpByIntPratica(long intPraticaId) throws SystemException {
 
@@ -589,6 +595,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		return dynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getValidUntilClassPkByIntPratica(long intPraticaId, long classPk, String tipologia,
 			int start, int end) throws SystemException {
@@ -610,11 +617,11 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		for (DocPratica docPratica : allegatiDaInvalidare) {
 			docPratica.setRimosso(true);
 			docPratica.setDtDataRimozione(now);
-
 			docPratica = updateDocPratica(docPratica);
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> getDocPraticaWithOldFileEntryId(int start, int end) throws SystemException {
 
@@ -657,6 +664,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 	}
 
 	// Metodo nuovo ADT
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<DocPratica> findByIntPratica_ClassPk_TipologiaNew(long intPraticaId, long classPk, String tipologia,
 			int start, int end) throws SystemException {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java
index d386fd10..29b88c10 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -24,17 +20,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the doc pratica remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.DocPraticaService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.DocPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.DocPraticaServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java
index c889c0bb..20311c22 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -54,17 +50,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the fine lavori local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.FineLavoriLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil
  */
@@ -77,7 +71,6 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 	private FineLavori initFineLavori(ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userLocalService.getUser(serviceContext.getUserId());
-
 		Date now = new Date();
 		FineLavori fineLavori = fineLavoriPersistence
 				.create(counterLocalService.increment(DettPratica.class.getName()));
@@ -161,11 +154,9 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false));
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId"));
+		@SuppressWarnings("unchecked")
 		List<FineLavori> fineLavoriList = dynamicQuery(dynamicQuery, 0, 1);
-		if (!fineLavoriList.isEmpty()) {
-			return fineLavoriList.get(0);
-		}
-		return null;
+		return fineLavoriList.isEmpty() ? null : fineLavoriList.get(0);
 	}
 
 	@Override
@@ -175,11 +166,9 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true));
 		dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId"));
+		@SuppressWarnings("unchecked")
 		List<FineLavori> fineLavoriList = dynamicQuery(dynamicQuery, 0, 1);
-		if (!fineLavoriList.isEmpty()) {
-			return fineLavoriList.get(0);
-		}
-		return null;
+		return fineLavoriList.isEmpty() ? null : fineLavoriList.get(0);
 	}
 
 	@Override
@@ -411,6 +400,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		return fineLavoriPersistence.countByIntPraticaId_Parziale_Completata(intPraticaId, parziale, completata);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<FineLavori> findByIntPraticaId_Parziale_leFineLavoriId(long fineLavoriId, long intPraticaId,
 			boolean parziale, int start, int end, OrderByComparator orderByComparator) throws SystemException {
@@ -430,10 +420,10 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.lt("fineLavoriId", fineLavoriId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale));
-		List<FineLavori> results = dynamicQuery(dynamicQuery);
-		return results.size();
+		return dynamicQuery(dynamicQuery).size();
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<FineLavori> findFineLavoriCompleteNotProtocollo(int start, int end) throws SystemException {
 
@@ -461,6 +451,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		return dynamicQuery;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<FineLavori> findFineLavoriCompleteNotGestite(int start, int end) throws SystemException {
 
@@ -486,16 +477,17 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		return dynamicQuery;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Long> findIntPraticaByFineLavori() throws PortalException, SystemException {
 
 		DynamicQuery dynamicQuery = dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true));
 		dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId")));
-		List<Long> ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery);
-		return ids;
+		return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Long> findIntPraticaByFineLavori(String codiceFiscaleDelegatoCollaudo) throws PortalException,
 			SystemException {
@@ -504,7 +496,6 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true));
 		dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleDelegatoCollaudo", codiceFiscaleDelegatoCollaudo));
 		dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId")));
-		List<Long> ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery);
-		return ids;
+		return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java
index 3100c47c..effef6ae 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -25,149 +21,134 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the fine lavori remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.FineLavoriService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.FineLavoriService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.FineLavoriServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.FineLavoriServiceUtil
  */
 public class FineLavoriServiceImpl extends FineLavoriServiceBaseImpl {
-  /*
-   * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
-   * it.tref.liferay.portos.bo.service.FineLavoriServiceUtil} to access the fine lavori remote
-   * service.
-   */
-
-  public FineLavori getFineLavori(long fineLavoriId) throws PortalException, SystemException {
-
-    return fineLavoriLocalService.getFineLavori(fineLavoriId);
-  }
-
-  public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException,
-      SystemException {
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.FineLavoriServiceUtil} to access the fine lavori remote service.
+	 */
 
-    // User user = userLocalService.getUser(serviceContext.getUserId());
-    // List<Soggetto> owners = soggettoLocalService.findByIntPratica_CodiceFiscale(intPraticaId,
-    // user.getScreenName());
-    // for (Soggetto owner : owners) {
-    // if (owner.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) {
-    // return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext);
-    // }
-    // }
-    // throw new SystemException("unbale to add Fine Lavori. Subject is not a direttore lavori");
-    return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext);
-  }
+	@Override
+	public FineLavori getFineLavori(long fineLavoriId) throws PortalException, SystemException {
 
-  public FineLavori deleteFineLavori(FineLavori fineLavori) throws PortalException, SystemException {
+		return fineLavoriLocalService.getFineLavori(fineLavoriId);
+	}
 
-    return fineLavoriLocalService.deleteFineLavori(fineLavori);
-  }
+	@Override
+	public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException,
+			SystemException {
 
-  public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException {
+		return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext);
+	}
 
-    return fineLavoriLocalService.deleteFineLavori(fineLavoriId);
-  }
+	@Override
+	public FineLavori deleteFineLavori(FineLavori fineLavori) throws PortalException, SystemException {
 
-  public FineLavori updateFineLavori(FineLavori fineLavori) throws SystemException {
+		return fineLavoriLocalService.deleteFineLavori(fineLavori);
+	}
 
-    return fineLavoriLocalService.updateFineLavori(fineLavori);
-  }
+	@Override
+	public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException {
 
-  public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale,
-      boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo,
-      boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws PortalException, SystemException {
+		return fineLavoriLocalService.deleteFineLavori(fineLavoriId);
+	}
 
-    FineLavori fineLavori = getFineLavori(fineLavoriId);
+	@Override
+	public FineLavori updateFineLavori(FineLavori fineLavori) throws SystemException {
 
-    if (fineLavori.getUserId() == userId) {
-      fineLavori =
-          fineLavoriLocalService.updateFineLavori(userId, fineLavoriId, intPraticaId, parziale, completata,
-              dataFineLavori, codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo, comunicazioneDirettoreLavori);
-    }
+		return fineLavoriLocalService.updateFineLavori(fineLavori);
+	}
 
-    return fineLavori;
-  }
+	@Override
+	public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale,
+			boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo,
+			boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws PortalException, SystemException {
 
-  public FineLavori getLastEditable(long intPraticaId) throws SystemException {
+		FineLavori fineLavori = getFineLavori(fineLavoriId);
+		if (fineLavori.getUserId() == userId) {
+			fineLavori = fineLavoriLocalService.updateFineLavori(userId, fineLavoriId, intPraticaId, parziale,
+					completata, dataFineLavori, codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo,
+					comunicazioneDirettoreLavori);
+		}
+		return fineLavori;
+	}
 
-    return fineLavoriLocalService.getLastEditable(intPraticaId);
-  }
+	@Override
+	public FineLavori getLastEditable(long intPraticaId) throws SystemException {
 
-  public FineLavori getLastCompleted(long intPraticaId) throws SystemException {
+		return fineLavoriLocalService.getLastEditable(intPraticaId);
+	}
 
-    return fineLavoriLocalService.getLastCompleted(intPraticaId);
-  }
+	@Override
+	public FineLavori getLastCompleted(long intPraticaId) throws SystemException {
 
-  public List<FineLavori> findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end,
-      OrderByComparator orderByComparator) throws SystemException {
+		return fineLavoriLocalService.getLastCompleted(intPraticaId);
+	}
 
-    return fineLavoriLocalService.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator);
-  }
+	@Override
+	public List<FineLavori> findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
 
-  public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException {
+		return fineLavoriLocalService
+				.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator);
+	}
 
-    return fineLavoriLocalService.countByIntPraticaId_Parziale(intPraticaId, parziale);
-  }
+	@Override
+	public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException {
 
-  public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL,
-      ServiceContext serviceContext) throws SystemException, PortalException {
+		return fineLavoriLocalService.countByIntPraticaId_Parziale(intPraticaId, parziale);
+	}
 
-    return fineLavoriLocalService.pagaInvia(fineLavoriId, codiceFiscaleCommittente, currentURL, serviceContext);
-  }
+	@Override
+	public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL,
+			ServiceContext serviceContext) throws SystemException, PortalException {
 
-  public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException {
+		return fineLavoriLocalService.pagaInvia(fineLavoriId, codiceFiscaleCommittente, currentURL, serviceContext);
+	}
 
-    // FineLavori fineLavori = fineLavoriLocalService.getFineLavori(fineLavoriId);
-    // DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(),
-    // ActionKeys.ADD_ENTRY);
-    return fineLavoriLocalService.updateEsito(fineLavoriId, stato);
-  }
+	@Override
+	public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException {
 
-  public List<FineLavori> findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato, int start,
-      int end, OrderByComparator orderByComparator) throws SystemException {
+		return fineLavoriLocalService.updateEsito(fineLavoriId, stato);
+	}
 
-    return fineLavoriLocalService.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end,
-        orderByComparator);
-  }
+	@Override
+	public List<FineLavori> findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato,
+			int start, int end, OrderByComparator orderByComparator) throws SystemException {
 
-  public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato) throws SystemException {
+		return fineLavoriLocalService.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end,
+				orderByComparator);
+	}
 
-    return fineLavoriLocalService.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato);
-  }
+	@Override
+	public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato)
+			throws SystemException {
 
-  public List<FineLavori> findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start,
-      int end, OrderByComparator orderByComparator) throws SystemException {
+		return fineLavoriLocalService.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato);
+	}
 
-    return fineLavoriLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end,
-        orderByComparator);
-  }
+	@Override
+	public List<FineLavori> findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start,
+			int end, OrderByComparator orderByComparator) throws SystemException {
 
-  public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException {
+		return fineLavoriLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end,
+				orderByComparator);
+	}
 
-    return fineLavoriLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata);
-  }
+	@Override
+	public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException {
 
-  // public void sostituisciPagamento(long pagamentoId, long fineLavoriId, String
-  // codiceFiscaleCommittente, String mezzo,
-  // String url, ServiceContext serviceContext) throws PortalException, SystemException {
-  //
-  // FineLavori fineLavori = fineLavoriLocalService.getFineLavori(fineLavoriId);
-  // if (getUserId() == fineLavori.getUserId()) {
-  // fineLavoriLocalService.sostituisciPagamento(pagamentoId, fineLavoriId,
-  // codiceFiscaleCommittente, mezzo, url,
-  // serviceContext);
-  // } else {
-  // throw new SystemException("pagamento aggiornabile solo da titolare del dettPratica");
-  // }
-  //
-  // }
+		return fineLavoriLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata);
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java
index 8d689449..2341dfca 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -25,17 +21,15 @@ import com.liferay.portal.kernel.exception.SystemException;
 
 /**
  * The implementation of the history workflow action local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil
  */
@@ -62,6 +56,7 @@ public class HistoryWorkflowActionLocalServiceImpl extends HistoryWorkflowAction
 
 	@Override
 	public List<HistoryWorkflowAction> findByIntPratica(long intPraticaId) throws SystemException {
+
 		return historyWorkflowActionPersistence.findByIntPratica(intPraticaId);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionServiceImpl.java
index d9af21c5..4c2b99e0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -18,23 +12,22 @@ import it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionServiceBaseIm
 
 /**
  * The implementation of the history workflow action remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.service.HistoryWorkflowActionService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.HistoryWorkflowActionService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil
  */
-public class HistoryWorkflowActionServiceImpl
-	extends HistoryWorkflowActionServiceBaseImpl {
+public class HistoryWorkflowActionServiceImpl extends HistoryWorkflowActionServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil} to access the history workflow action remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.HistoryWorkflowActionServiceUtil} to access the history workflow action remote
+	 * service.
 	 */
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
index 1e1807ad..2ac01e97 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -37,13 +33,11 @@ import it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil;
 import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
-import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil;
 import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.util.AvvisoUtil;
 import it.tref.liferay.portos.bo.util.AzioniPraticheUtil;
 import it.tref.liferay.portos.bo.util.Constants;
-import it.tref.liferay.portos.bo.util.MailUtil;
 import it.tref.liferay.portos.bo.util.PraticaUtil;
 import it.tref.liferay.portos.bo.util.WorkflowConstants;
 import it.tref.liferay.portos.bo.util.WorkflowUtil;
@@ -79,7 +73,6 @@ import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
-import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.json.JSONSerializer;
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
@@ -90,7 +83,6 @@ import com.liferay.portal.kernel.search.Indexable;
 import com.liferay.portal.kernel.search.IndexableType;
 import com.liferay.portal.kernel.search.Indexer;
 import com.liferay.portal.kernel.search.IndexerRegistryUtil;
-import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.MimeTypesUtil;
 import com.liferay.portal.kernel.util.StringPool;
@@ -107,17 +99,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the int pratica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.IntPraticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil
  */
@@ -129,7 +119,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 
 	private static Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class);
 
-	private static final Map<String, String> tipiProcedure = new LinkedHashMap<>();
+	private static final Map<String, String> tipiProcedure = new LinkedHashMap<>(3);
 	static {
 		putTipoProcedura(Constants.PROCEDURA_A);
 		putTipoProcedura(Constants.PROCEDURA_B);
@@ -137,11 +127,13 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	}
 
 	private static void putTipoProcedura(String tipo) {
+
 		tipiProcedure.put(tipo, LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-procedura-" + tipo));
 	}
 
 	@Override
 	public Map<String, String> getTipiProcedure() {
+
 		return tipiProcedure;
 	}
 
@@ -201,12 +193,11 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	@Override
 	public Map<String, List<IntPratica>> findSorteggiabili(long companyId, Date dtSorteggio) throws SystemException,
 			PortalException {
+
 		HashMap<String, List<IntPratica>> ret = new HashMap<>();
 		List<IntPratica> lista = new ArrayList<IntPratica>();
-
 		int dow = Integer.parseInt(configurazioneService.findByC_ChiaveString(companyId,
 				ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO));
-
 		Date[] date = SismicaUtil.getWeekInterval(dow, dtSorteggio);
 		DynamicQuery dq = intPraticaLocalService.dynamicQuery();
 		dq.add(PropertyFactoryUtil.forName("companyId").eq(companyId));
@@ -482,36 +473,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		return intPratica;
 	}
 
-	private void inviaMailNotifica(IntPratica intPratica) throws SystemException, PortalException {
-
-		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
-		Comune comune = comuneLocalService.getComune(territorio.getComuneId());
-		DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-		String eMail = StringPool.BLANK;
-		if (dettPratica.getSuap()) {
-			eMail = comune.getMailSuap();
-		} else {
-			eMail = comune.getMailSue();
-		}
-		String[] to = { eMail };
-		String[] cc = new String[0];
-		String[] ccn = new String[0];
-		String url = FascicoloURLUtil.getFascicoloFEViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId(),
-				StringPool.BLANK, StringPool.BLANK);
-		JSONObject templateVariables = JSONFactoryUtil.createJSONObject();
-		templateVariables.put("cont", StringPool.BLANK);
-		templateVariables.put("anno", StringPool.BLANK);
-		templateVariables.put("dataVidimazione", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm")
-				.format(intPratica.getDtPratica()));
-		templateVariables.put("link", url);
-		ServiceContext serviceContext = new ServiceContext();
-		serviceContext.setScopeGroupId(intPratica.getGroupId());
-		serviceContext.setCompanyId(intPratica.getCompanyId());
-		serviceContext.setUserId(intPratica.getUserId());
-		MailUtil.invioMailNotifica(intPratica.getIntPraticaId(), 0l, intPratica.getIntPraticaId(),
-				IntPratica.class.getName(), to, cc, ccn, "INVIO-SUAP", templateVariables, null, serviceContext);
-	}
-
 	@Override
 	public IntPratica sospendiPratica(long intPraticaId, boolean sospesa) throws SystemException, PortalException {
 
@@ -924,8 +885,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		String sha256 = StringPool.BLANK;
 		try {
 			sha256 = DigestUtils.sha256Hex(dlAppLocalService.getFileEntry(fileEntryId).getContentStream());
-		} catch (Exception e) {
-		}
+		} catch (Exception e) {}
 		DocPratica allegatoAnnullamento = docPraticaLocalService.addDocPraticaAnnullamento(userId,
 				IntPratica.class.getName(), intPraticaId, intPraticaId, fileEntryId, fileName,
 				DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO, sha256, jsonFirmatari, serviceContext);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
index 0072496c..912cf939 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -33,17 +29,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the int pratica remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.IntPraticaService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.IntPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.IntPraticaServiceUtil
  */
@@ -71,31 +65,13 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
 		}
 	}
 
-	// public void pagaInvia(long intPraticaId, int pagAdeguamentoSismico, int pagAltro, int
-	// pagMiglioramentoSismico,
-	// int pagNuovaCostruzione, boolean pagNuoveCostruzioni, boolean pagRiparazioneInterventoLocale,
-	// boolean pagVarianti, String importoSpeseIstruttoria, String codiceFiscaleCommittente, String
-	// currentUrl,
-	// ServiceContext serviceContext) throws PortalException, SystemException {
-	//
-	//
-	// intPraticaLocalService.pagaInvia(intPraticaId, pagAdeguamentoSismico, pagAltro,
-	// pagMiglioramentoSismico,
-	// pagNuovaCostruzione, pagNuoveCostruzioni, pagRiparazioneInterventoLocale, pagVarianti,
-	// importoSpeseIstruttoria,
-	// codiceFiscaleCommittente, currentUrl, serviceContext);
-	//
-	// }
-
 	@Override
 	public void sospendiPratica(long intPraticaId, boolean sospesa) throws PortalException, SystemException {
 
 		IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
 		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
-
 		IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.SOSPENDI_FASCICOLO);
 		intPraticaLocalService.sospendiPratica(intPraticaId, sospesa);
-
 	}
 
 	@Override
@@ -104,7 +80,6 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
 
 		IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
 		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
-
 		IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_TITOLARE);
 		intPraticaLocalService.cambiaTitolare(intPraticaId, soggettoId, serviceContext);
 	}
@@ -231,13 +206,10 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
 	public String geosisma(long intPraticaId) throws PortalException, SystemException {
 
 		JSONObject json = JSONFactoryUtil.createJSONObject();
-
 		IntPratica intPratica = intPraticaLocalService.fetchIntPratica(intPraticaId);
 		if (Validator.isNotNull(intPratica)) {
 			json.put("intPraticaId", intPratica.getIntPraticaId());
 		}
-
 		return json.toString();
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java
index 4e415f0f..0a59dc35 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -47,17 +43,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the pagamento local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.PagamentoLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.PagamentoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil
  */
@@ -147,17 +141,17 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 			intPraticaId = dettPratica.getIntPraticaId();
 			if (updateReference) {
 				switch (tipoPagamento) {
-				case PagamentoConstants.PAGAMENTO_ONERI:
-					dettPratica.setPagamentoIdOneri(pagamento.getPagamentoId());
-					dettPratica.setCodicePagamentoOneri(pagamento.getCodice());
-					dettPratica.setCausalePagamentoOneri(pagamento.getCausale());
-					dettPratica.setMezzoPagamentoOneri(mezzo);
-					break;
-				case PagamentoConstants.PAGAMENTO_BOLLI:
-					dettPratica.setPagamentoIdBolli(pagamento.getPagamentoId());
-					dettPratica.setCodicePagamentoBolli(pagamento.getCodice());
-					dettPratica.setCausalePagamentoBolli(pagamento.getCausale());
-					dettPratica.setMezzoPagamentoBolli(mezzo);
+					case PagamentoConstants.PAGAMENTO_ONERI:
+						dettPratica.setPagamentoIdOneri(pagamento.getPagamentoId());
+						dettPratica.setCodicePagamentoOneri(pagamento.getCodice());
+						dettPratica.setCausalePagamentoOneri(pagamento.getCausale());
+						dettPratica.setMezzoPagamentoOneri(mezzo);
+						break;
+					case PagamentoConstants.PAGAMENTO_BOLLI:
+						dettPratica.setPagamentoIdBolli(pagamento.getPagamentoId());
+						dettPratica.setCodicePagamentoBolli(pagamento.getCodice());
+						dettPratica.setCausalePagamentoBolli(pagamento.getCausale());
+						dettPratica.setMezzoPagamentoBolli(mezzo);
 				}
 				dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica);
 			}
@@ -166,13 +160,13 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 			intPraticaId = fineLavori.getIntPraticaId();
 			if (updateReference) {
 				switch (tipoPagamento) {
-				case PagamentoConstants.PAGAMENTO_ONERI:
-					throw new SystemException("error.fields.fineLavori.pagamento.classPk.invalid");
-				case PagamentoConstants.PAGAMENTO_BOLLI:
-					fineLavori.setPagamentoId(pagamento.getPagamentoId());
-					fineLavori.setCodicePagamento(pagamento.getCodice());
-					fineLavori.setCausalePagamento(pagamento.getCausale());
-					fineLavori.setMezzoPagamento(mezzo);
+					case PagamentoConstants.PAGAMENTO_ONERI:
+						throw new SystemException("error.fields.fineLavori.pagamento.classPk.invalid");
+					case PagamentoConstants.PAGAMENTO_BOLLI:
+						fineLavori.setPagamentoId(pagamento.getPagamentoId());
+						fineLavori.setCodicePagamento(pagamento.getCodice());
+						fineLavori.setCausalePagamento(pagamento.getCausale());
+						fineLavori.setMezzoPagamento(mezzo);
 				}
 				fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori);
 			}
@@ -181,13 +175,13 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 			intPraticaId = collaudo.getIntPraticaId();
 			if (updateReference) {
 				switch (tipoPagamento) {
-				case PagamentoConstants.PAGAMENTO_ONERI:
-					throw new SystemException("error.fields.collaudo.pagamento.classPk.invalid");
-				case PagamentoConstants.PAGAMENTO_BOLLI:
-					collaudo.setPagamentoId(pagamento.getPagamentoId());
-					collaudo.setCodicePagamento(pagamento.getCodice());
-					collaudo.setCausalePagamento(pagamento.getCausale());
-					collaudo.setMezzoPagamento(mezzo);
+					case PagamentoConstants.PAGAMENTO_ONERI:
+						throw new SystemException("error.fields.collaudo.pagamento.classPk.invalid");
+					case PagamentoConstants.PAGAMENTO_BOLLI:
+						collaudo.setPagamentoId(pagamento.getPagamentoId());
+						collaudo.setCodicePagamento(pagamento.getCodice());
+						collaudo.setCausalePagamento(pagamento.getCausale());
+						collaudo.setMezzoPagamento(mezzo);
 				}
 				collaudo = collaudoLocalService.updateCollaudo(collaudo);
 			}
@@ -234,6 +228,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 		return updatePagamento(pagamento);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Pagamento> findByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo, int start, int end)
 			throws SystemException {
@@ -252,6 +247,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 		return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Pagamento> findByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo,
 			String utilizzata, int start, int end) throws SystemException {
@@ -316,6 +312,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 				OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true));
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Pagamento> findInPending(Date date, int start, int end, OrderByComparator comparator)
 			throws SystemException {
@@ -332,6 +329,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 	}
 
 	private DynamicQuery createPendingQuery(Date date) {
+
 		DynamicQuery dynamicQuery = dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.in("utilizzata", new String[] {
 				PagamentoConstants.UTILIZZATA_IN_CORSO, PagamentoConstants.UTILIZZATA_ANNULLATO }));
@@ -347,6 +345,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 
 	@Override
 	public Pagamento deletePagamento(long pagamentoId) throws PortalException, SystemException {
+
 		return deletePagamento(getPagamento(pagamentoId));
 	}
 
@@ -356,8 +355,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 		if (Validator.isNotNull(pagamento.getFileEntryId())) {
 			try {
 				dlAppLocalService.deleteFileEntry(pagamento.getFileEntryId());
-			} catch (PortalException e) {
-			}
+			} catch (PortalException e) {}
 		}
 		if (DettPratica.class.getName().equalsIgnoreCase(pagamento.getClassName())) {
 			deleteDettPraticaPagamento(pagamento);
@@ -424,6 +422,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 		return pagamentoPersistence.countByIntPratica(intPraticaId);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Pagamento> findByIntPratica_Visible(long intPraticaId) throws SystemException {
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java
index 157b6ec1..e397564f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -29,17 +25,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the pagamento remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.PagamentoService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.PagamentoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.PagamentoServiceUtil
  */
@@ -108,7 +102,7 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
 	private long findTitolare(long pagamentoId) throws PortalException, SystemException {
 
 		Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId);
-		long userId = 0l;
+		long userId = 0L;
 		if (DettPratica.class.getName().equals(pagamento.getClassName())) {
 			DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk());
 			userId = dettPratica.getUserId();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java
index 06887667..caae1a28 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -38,17 +34,15 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 
 /**
  * The implementation of the parere geologo local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.ParereGeologoLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil
  */
@@ -62,7 +56,6 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 	public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId,
 			ServiceContext serviceContext) throws SystemException, PortalException {
 
-		validateParereGeologo(geologoUserId, intPraticaId, dettPraticaId);
 		long parereGeologoId = counterLocalService.increment(ParereGeologo.class.getName());
 		ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId);
 		parereGeologo.setCompanyId(serviceContext.getCompanyId());
@@ -79,10 +72,6 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 		return parereGeologoPersistence.update(parereGeologo);
 	}
 
-	private void validateParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId) {
-		// TODO
-	}
-
 	@Override
 	public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName,
 			ServiceContext serviceContext) throws PortalException, SystemException {
@@ -130,6 +119,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 	@Override
 	public ParereGeologo deleteParereGeologo(long parereGeologoId) throws PortalException, SystemException {
+
 		return deleteParereGeologo(getParereGeologo(parereGeologoId));
 	}
 
@@ -150,21 +140,25 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 	@Override
 	public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException {
+
 		return parereGeologoPersistence.update(parereGeologo);
 	}
 
 	@Override
 	public ParereGeologo remove(ParereGeologo parereGeologoId) throws SystemException {
+
 		return parereGeologoPersistence.remove(parereGeologoId);
 	}
 
 	@Override
 	public List<ParereGeologo> findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException {
+
 		return parereGeologoPersistence.findByIntPraticaId(intPraticaId, start, end);
 	}
 
 	@Override
 	public int countByIntPraticaId(long intPraticaId) throws SystemException {
+
 		return parereGeologoPersistence.countByIntPraticaId(intPraticaId);
 	}
 
@@ -177,6 +171,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 	@Override
 	public int countByIntPraticaIdParereVuoto(long intPraticaId) throws SystemException {
+
 		return parereGeologoPersistence.countByIntPraticaId_Parere(intPraticaId, StringPool.BLANK);
 	}
 
@@ -189,11 +184,13 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 	@Override
 	public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException {
+
 		return parereGeologoPersistence.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId);
 	}
 
 	@Override
 	public List<ParereGeologo> findByGeologoId(long geologoUserId, int start, int end) throws SystemException {
+
 		return parereGeologoPersistence.findByGeologoId(geologoUserId, start, end);
 	}
 
@@ -204,6 +201,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 	@Override
 	public int countByGeologoId(long geologoUserId) throws SystemException {
+
 		return parereGeologoPersistence.countByGeologoId(geologoUserId);
 	}
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java
index d8e62a67..3a2af0c7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -27,97 +23,87 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the parere geologo remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.ParereGeologoService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.ParereGeologoService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ParereGeologoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil
  */
 public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl {
-  /*
-   * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
-   * it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil} to access the parere geologo remote
-   * service.
-   */
-
-
-  @Override
-public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId,
-      ServiceContext serviceContext) throws SystemException, PortalException {
-
-    IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
-    Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
-    IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO);
-
-    return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, serviceContext);
-  }
-
-  @Override
-public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName,
-      ServiceContext serviceContext) throws PortalException, SystemException {
-
-    return parereGeologoLocalService.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
-  }
-
-  @Override
-public ParereGeologo deleteParereGeologo(long parereGeologoId) throws SystemException, PortalException {
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil} to access the parere geologo remote service.
+	 */
 
-    return parereGeologoLocalService.deleteParereGeologo(parereGeologoId);
-  }
+	@Override
+	public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId,
+			ServiceContext serviceContext) throws SystemException, PortalException {
 
-  @Override
-public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException {
+		IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
+		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
+		IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO);
+		return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, serviceContext);
+	}
 
-    return parereGeologoLocalService.deleteParereGeologo(parereGeologo);
-  }
+	@Override
+	public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName,
+			ServiceContext serviceContext) throws PortalException, SystemException {
 
-  @Override
-public List<ParereGeologo> findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException {
+		return parereGeologoLocalService
+				.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
+	}
 
-    // TODO permessi
+	@Override
+	public ParereGeologo deleteParereGeologo(long parereGeologoId) throws SystemException, PortalException {
 
-    return parereGeologoLocalService.findByIntPraticaId(intPraticaId, start, end);
-  }
+		return parereGeologoLocalService.deleteParereGeologo(parereGeologoId);
+	}
 
-  @Override
-public List<ParereGeologo> findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end)
-      throws SystemException {
+	@Override
+	public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException {
 
-    // TODO permessi
+		return parereGeologoLocalService.deleteParereGeologo(parereGeologo);
+	}
 
-    return parereGeologoLocalService.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end);
-  }
+	@Override
+	public List<ParereGeologo> findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException {
 
-  @Override
-public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException {
+		// TODO permessi
+		return parereGeologoLocalService.findByIntPraticaId(intPraticaId, start, end);
+	}
 
-    // TODO permessi
+	@Override
+	public List<ParereGeologo> findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end)
+			throws SystemException {
 
-    return parereGeologoLocalService.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId);
-  }
+		// TODO permessi
+		return parereGeologoLocalService.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end);
+	}
 
-  @Override
-public List<ParereGeologo> findByGeologoId(long geologoUserId, int start, int end) throws SystemException {
+	@Override
+	public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException {
 
-    // TODO permessi
+		// TODO permessi
+		return parereGeologoLocalService.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId);
+	}
 
-    return parereGeologoLocalService.findByGeologoId(geologoUserId, start, end);
-  }
+	@Override
+	public List<ParereGeologo> findByGeologoId(long geologoUserId, int start, int end) throws SystemException {
 
-  @Override
-public int countByGeologoId(long geologoUserId) throws SystemException {
+		// TODO permessi
+		return parereGeologoLocalService.findByGeologoId(geologoUserId, start, end);
+	}
 
-    // TODO permessi
+	@Override
+	public int countByGeologoId(long geologoUserId) throws SystemException {
 
-    return parereGeologoLocalService.countByGeologoId(geologoUserId);
-  }
+		// TODO permessi
+		return parereGeologoLocalService.countByGeologoId(geologoUserId);
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaLocalServiceImpl.java
index dbd8199b..be8763e4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -20,7 +16,6 @@ import it.tref.liferay.portos.bo.SiglaException;
 import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.service.base.ProvinciaLocalServiceBaseImpl;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -39,145 +34,113 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the provincia local service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are
- * added, rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.service.ProvinciaLocalService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.ProvinciaLocalService} interface.
  * <p>
- * This is a local service. Methods of this service will not have security
- * checks based on the propagated JAAS credentials because this service can only
- * be accessed from within the same VM.
+ * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
+ * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil
  */
 public class ProvinciaLocalServiceImpl extends ProvinciaLocalServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 * 
-	 * Never reference this interface directly. Always use {@link
-	 * it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil} to access
-	 * the provincia local service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil} to access the provincia local service.
 	 */
-	
-	// Manifattura Web Group per Regione Siciliana
-	public List<Provincia> getProvinceAttive() {
-		List<Provincia> ret = new ArrayList<Provincia>();
-		return ret;
-	}
 
 	@Override
-	public Provincia addProvincia(long userId, String codiceProvincia,
-			String provincia, String regione, String sigla,
-			ServiceContext serviceContext) throws PortalException,
-			SystemException {
+	public Provincia addProvincia(long userId, String codiceProvincia, String provincia, String regione, String sigla,
+			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
-		validate(serviceContext.getCompanyId(), 0L, codiceProvincia, provincia,
-				regione, sigla);
-
-		Provincia provinciaO = provinciaPersistence.create(counterLocalService
-				.increment(Provincia.class.getName()));
-
+		validate(serviceContext.getCompanyId(), 0L, codiceProvincia, provincia, regione, sigla);
+		Provincia provinciaO = provinciaPersistence.create(counterLocalService.increment(Provincia.class.getName()));
 		provinciaO.setCompanyId(serviceContext.getCompanyId());
 		provinciaO.setUserId(user.getUserId());
 		provinciaO.setUserName(user.getFullName());
 		provinciaO.setCreateDate(serviceContext.getCreateDate(now));
 		provinciaO.setModifiedDate(serviceContext.getModifiedDate(now));
-
 		provinciaO.setCodiceProvincia(codiceProvincia);
 		provinciaO.setProvincia(provincia);
 		provinciaO.setRegione(regione);
 		provinciaO.setSigla(sigla);
-
 		provinciaO = provinciaPersistence.update(provinciaO);
-
 		return provinciaO;
 	}
 
-	public List<Provincia> findAll(int start, int end,
-			OrderByComparator orderByComparator) throws SystemException {
+	@Override
+	public List<Provincia> findAll(int start, int end, OrderByComparator orderByComparator) throws SystemException {
+
 		return provinciaPersistence.findAll(start, end, orderByComparator);
 	}
 
 	@Override
 	public int countByCompanyId(long companyId) throws SystemException {
+
 		return provinciaPersistence.countByCompanyId(companyId);
 	}
 
 	@Override
-	public long countByKeywords(long companyId, String keywords)
-			throws SystemException {
-
-		DynamicQuery query = queryByKeywords(companyId, keywords);
+	public long countByKeywords(long companyId, String keywords) throws SystemException {
 
-		return dynamicQueryCount(query);
+		return dynamicQueryCount(queryByKeywords(companyId, keywords));
 	}
 
 	@Override
-	public Provincia deleteProvincia(long provinciaId) throws PortalException,
-			SystemException {
-
-		Provincia provincia = provinciaPersistence
-				.findByPrimaryKey(provinciaId);
+	public Provincia deleteProvincia(long provinciaId) throws PortalException, SystemException {
 
-		return deleteProvincia(provincia);
+		return deleteProvincia(provinciaPersistence.findByPrimaryKey(provinciaId));
 	}
 
 	@Override
-	public Provincia deleteProvincia(Provincia provincia)
-			throws SystemException {
-
-		comunePersistence.removeByC_CP(provincia.getCompanyId(),
-				provincia.getCodiceProvincia());
+	public Provincia deleteProvincia(Provincia provincia) throws SystemException {
 
+		comunePersistence.removeByC_CP(provincia.getCompanyId(), provincia.getCodiceProvincia());
 		return super.deleteProvincia(provincia);
 	}
 
 	@Override
-	public Provincia fetchByC_C(long companyId, String codiceProvincia)
-			throws SystemException {
+	public Provincia fetchByC_C(long companyId, String codiceProvincia) throws SystemException {
+
 		return provinciaPersistence.fetchByC_C(companyId, codiceProvincia);
 	}
 
 	@Override
-	public Provincia fetchByC_S(long companyId, String sigla)
-			throws SystemException {
+	public Provincia fetchByC_S(long companyId, String sigla) throws SystemException {
+
 		return provinciaPersistence.fetchByC_S(companyId, sigla);
 	}
 
 	@Override
-	public List<Provincia> findByCompanyId(long companyId, int start, int end)
-			throws SystemException {
+	public List<Provincia> findByCompanyId(long companyId, int start, int end) throws SystemException {
+
 		return provinciaPersistence.findByCompanyId(companyId, start, end);
 	}
 
 	@Override
-	public List<Provincia> findByCompanyId(long companyId, int start, int end,
-			OrderByComparator orderByComparator) throws SystemException {
-		return provinciaPersistence.findByCompanyId(companyId, start, end,
-				orderByComparator);
+	public List<Provincia> findByCompanyId(long companyId, int start, int end, OrderByComparator orderByComparator)
+			throws SystemException {
+
+		return provinciaPersistence.findByCompanyId(companyId, start, end, orderByComparator);
 	}
 
 	@Override
-	public Provincia findByC_C(long companyId, String codiceProvincia)
-			throws NoSuchProvinciaException, SystemException {
+	public Provincia findByC_C(long companyId, String codiceProvincia) throws NoSuchProvinciaException, SystemException {
+
 		return provinciaPersistence.findByC_C(companyId, codiceProvincia);
 	}
 
-	public List<Provincia> findByKeywords(long companyId, String keywords,
-			int start, int end, OrderByComparator orderByComparator)
-			throws SystemException {
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Provincia> findByKeywords(long companyId, String keywords, int start, int end,
+			OrderByComparator orderByComparator) throws SystemException {
 
 		DynamicQuery query = queryByKeywords(companyId, keywords);
-
 		return dynamicQuery(query, start, end, orderByComparator);
 	}
 
@@ -185,73 +148,57 @@ public class ProvinciaLocalServiceImpl extends ProvinciaLocalServiceBaseImpl {
 
 		DynamicQuery query = DynamicQueryFactoryUtil.forClass(Provincia.class);
 		query.add(PropertyFactoryUtil.forName("companyId").eq(companyId));
-
-		Criterion criterion = RestrictionsFactoryUtil.ilike("codiceProvincia",
-				StringPool.PERCENT + keywords + StringPool.PERCENT);
-		criterion = RestrictionsFactoryUtil.or(
-				criterion,
-				RestrictionsFactoryUtil.ilike("provincia", StringPool.PERCENT
-						+ keywords + StringPool.PERCENT));
-		criterion = RestrictionsFactoryUtil.or(
-				criterion,
-				RestrictionsFactoryUtil.ilike("regione", StringPool.PERCENT
-						+ keywords + StringPool.PERCENT));
-		criterion = RestrictionsFactoryUtil.or(
-				criterion,
-				RestrictionsFactoryUtil.ilike("sigla", StringPool.PERCENT
-						+ keywords + StringPool.PERCENT));
+		Criterion criterion = RestrictionsFactoryUtil.ilike("codiceProvincia", StringPool.PERCENT + keywords
+				+ StringPool.PERCENT);
+		criterion = RestrictionsFactoryUtil.or(criterion,
+				RestrictionsFactoryUtil.ilike("provincia", StringPool.PERCENT + keywords + StringPool.PERCENT));
+		criterion = RestrictionsFactoryUtil.or(criterion,
+				RestrictionsFactoryUtil.ilike("regione", StringPool.PERCENT + keywords + StringPool.PERCENT));
+		criterion = RestrictionsFactoryUtil.or(criterion,
+				RestrictionsFactoryUtil.ilike("sigla", StringPool.PERCENT + keywords + StringPool.PERCENT));
 		query.add(criterion);
 		return query;
 	}
 
-	public Provincia updateProvincia(long userId, long provinciaId,
-			String provincia, String regione, String sigla,
-			ServiceContext serviceContext) throws PortalException,
-			SystemException {
+	@Override
+	public Provincia updateProvincia(long userId, long provinciaId, String provincia, String regione, String sigla,
+			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
-		Provincia provinciaO = provinciaPersistence
-				.fetchByPrimaryKey(provinciaId);
-
-		validate(serviceContext.getCompanyId(), provinciaId,
-				provinciaO.getCodiceProvincia(), provincia, regione, sigla);
-
+		Provincia provinciaO = provinciaPersistence.fetchByPrimaryKey(provinciaId);
+		validate(serviceContext.getCompanyId(), provinciaId, provinciaO.getCodiceProvincia(), provincia, regione, sigla);
 		provinciaO.setCompanyId(serviceContext.getCompanyId());
 		provinciaO.setUserId(user.getUserId());
 		provinciaO.setUserName(user.getFullName());
 		provinciaO.setCreateDate(serviceContext.getCreateDate(now));
 		provinciaO.setModifiedDate(serviceContext.getModifiedDate(now));
-
 		provinciaO.setProvincia(provincia);
 		provinciaO.setRegione(regione);
 		provinciaO.setSigla(sigla);
-
 		provinciaO = provinciaPersistence.update(provinciaO);
-
 		return provinciaO;
 	}
 
-	private void validate(long companyId, long provinciaId,
-			String codiceProvincia, String provincia, String regione,
+	private void validate(long companyId, long provinciaId, String codiceProvincia, String provincia, String regione,
 			String sigla) throws PortalException, SystemException {
 
-		if (Validator.isNull(codiceProvincia))
+		if (Validator.isNull(codiceProvincia)) {
 			throw new CodiceProvinciaException();
-		if (Validator.isNull(provincia))
+		}
+		if (Validator.isNull(provincia)) {
 			throw new ProvinciaException();
-		if (Validator.isNull(sigla))
+		}
+		if (Validator.isNull(sigla)) {
 			throw new SiglaException();
-
-		Provincia provinciaO = provinciaPersistence.fetchByC_C(companyId,
-				codiceProvincia);
-		if (provinciaO != null && provinciaO.getPrimaryKey() != provinciaId)
+		}
+		Provincia provinciaO = provinciaPersistence.fetchByC_C(companyId, codiceProvincia);
+		if (provinciaO != null && provinciaO.getPrimaryKey() != provinciaId) {
 			throw new DuplicateProvinciaException();
+		}
 		provinciaO = provinciaPersistence.fetchByC_S(companyId, sigla);
-		if (provinciaO != null && provinciaO.getPrimaryKey() != provinciaId)
+		if (provinciaO != null && provinciaO.getPrimaryKey() != provinciaId) {
 			throw new DuplicateProvinciaException();
+		}
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaServiceImpl.java
index 0dd6d30a..eb075870 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ProvinciaServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -18,22 +12,21 @@ import it.tref.liferay.portos.bo.service.base.ProvinciaServiceBaseImpl;
 
 /**
  * The implementation of the provincia remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.service.ProvinciaService} interface.
- *
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.bo.service.ProvinciaService} interface.
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.ProvinciaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.ProvinciaServiceUtil
  */
 public class ProvinciaServiceImpl extends ProvinciaServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.ProvinciaServiceUtil} to access the provincia remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.bo.service.ProvinciaServiceUtil} to access the provincia remote service.
 	 */
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java
index 88f27142..2622b393 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -40,17 +36,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the soggetto local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.SoggettoLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil
  */
@@ -78,15 +72,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 
 		User user = userPersistence.findByPrimaryKey(userId);
 		Date now = new Date();
-		validate(serviceContext.getScopeGroupId(), 0L, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale,
-				codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio,
-				comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio,
-				domicilioExtra, comune, comuneEstero, provincia, via, numeroCivico, cap, denominazione, sedeLegale,
-				legaleRap, dataNascitaRap, provinciaNascitaRap, comuneNascitaRap, viaRap, numeroCivicoRap, capRap,
-				provinciaRap, comuneRap, comuneRapEstero, albo, alboDescr, regAlbo, provAlbo, numIscrAlbo, telefono,
-				fax, email, tipologiaSoggetto, aggiuntivo, rimosso, ambitoAttivita, ambitoProfessione,
-				intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, soggettoSostituitoId, oldSoggettoId);
-
 		Soggetto soggetto = soggettoPersistence.create(counterLocalService.increment(Soggetto.class.getName()));
 		soggetto.setCompanyId(serviceContext.getCompanyId());
 		soggetto.setUserId(user.getUserId());
@@ -268,28 +253,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		Date now = new Date();
-		validate(serviceContext.getScopeGroupId(), 0L, dettPraticaId, intPraticaId, soggettoToClone.getNome(),
-				soggettoToClone.getCognome(), soggettoToClone.getCodiceFiscale(),
-				soggettoToClone.getCodiceFiscaleDelegato(), soggettoToClone.getDataNascita(),
-				soggettoToClone.getProvinciaNascita(), soggettoToClone.getComuneNascita(),
-				soggettoToClone.getComuneDomicilio(), soggettoToClone.getComuneDomicilioEstero(),
-				soggettoToClone.getProvinciaDomicilio(), soggettoToClone.getViaDomicilio(),
-				soggettoToClone.getNumeroCivicoDomicilio(), soggettoToClone.getCapDomicilio(),
-				soggettoToClone.getDomicilioExtra(), soggettoToClone.getComune(), soggettoToClone.getComuneEstero(),
-				soggettoToClone.getProvincia(), soggettoToClone.getVia(), soggettoToClone.getNumeroCivico(),
-				soggettoToClone.getCap(), soggettoToClone.getDenominazione(), soggettoToClone.getSedeLegale(),
-				soggettoToClone.getLegaleRap(), soggettoToClone.getDataNascitaRap(),
-				soggettoToClone.getProvinciaNascitaRap(), soggettoToClone.getComuneNascitaRap(),
-				soggettoToClone.getViaRap(), soggettoToClone.getNumeroCivicoRap(), soggettoToClone.getCapRap(),
-				soggettoToClone.getProvinciaRap(), soggettoToClone.getComuneRap(),
-				soggettoToClone.getComuneRapEstero(), soggettoToClone.getAlbo(), soggettoToClone.getAlboDescr(),
-				soggettoToClone.getRegAlbo(), soggettoToClone.getProvinciaAlbo(), soggettoToClone.getNumIscrAlbo(),
-				soggettoToClone.getTelefono(), soggettoToClone.getFax(), soggettoToClone.getEmail(),
-				soggettoToClone.getTipologiaSoggetto(), soggettoToClone.getAggiuntivo(), soggettoToClone.getRimosso(),
-				soggettoToClone.getAmbitoAttivita(), soggettoToClone.getAmbitoProfessione(),
-				soggettoToClone.getIntPraticaIdRimozione(), soggettoToClone.getDettPraticaIdRimozione(),
-				soggettoToClone.getDtDataRimozione(), soggettoToClone.getSoggettoSostituitoId(),
-				soggettoToClone.getOldSoggettoId());
 		Soggetto soggetto = soggettoPersistence.create(counterLocalService.increment(Soggetto.class.getName()));
 		soggetto.setCompanyId(serviceContext.getCompanyId());
 		soggetto.setUserId(userId);
@@ -363,26 +326,20 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 			if (Validator.isNotNull(soggetto.getFileVariazioneId())) {
 				docPraticaLocalService.deleteDocPratica(soggetto.getFileVariazioneId());
 			}
-		} catch (PortalException e) {
-
-		}
-
+		} catch (PortalException e) {}
 		Soggetto ret = super.deleteSoggetto(soggetto);
-
 		long intPraticaId = soggetto.getIntPraticaId();
 		long idSoggetto = soggetto.getSoggettoId();
 		List<Soggetto> soggettiIntPratica = soggettoLocalService.findByIntPratica(intPraticaId);
 		for (Soggetto sgt : soggettiIntPratica) {
 			long sostituitoDa = sgt.getSostituitoDa();
-			if(Validator.isNotNull(sostituitoDa) && sostituitoDa > 0 && idSoggetto == sostituitoDa){
+			if (Validator.isNotNull(sostituitoDa) && sostituitoDa > 0 && idSoggetto == sostituitoDa) {
 				sgt.setSostituitoDa(0);
 				sgt.setDettPraticaIdRimozione(0);
 				soggettoPersistence.update(sgt);
 			}
 		}
-
 		return ret;
-
 	}
 
 	@Override
@@ -412,27 +369,14 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 			ServiceContext serviceContext) throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(userId);
-
 		Date now = new Date();
-
-		validate(serviceContext.getScopeGroupId(), soggettoId, dettPraticaId, intPraticaId, nome, cognome,
-				codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio,
-				comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio,
-				domicilioExtra, comune, comuneEstero, provincia, via, numeroCivico, cap, denominazione, sedeLegale,
-				legaleRap, dataNascitaRap, provinciaNascitaRap, comuneNascitaRap, viaRap, numeroCivicoRap, capRap,
-				provinciaRap, comuneRap, comuneRapEstero, albo, alboDescr, regAlbo, provAlbo, numIscrAlbo, telefono,
-				fax, email, tipologiaSoggetto, aggiuntivo, rimosso, ambitoAttivita, ambitoProfessione,
-				intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, soggettoSostituitoId, oldSoggettoId);
-
 		Soggetto soggetto = soggettoPersistence.fetchByPrimaryKey(soggettoId);
-
 		soggetto.setCompanyId(serviceContext.getCompanyId());
 		soggetto.setUserId(user.getUserId());
 		soggetto.setUserName(user.getFullName());
 		soggetto.setCreateDate(serviceContext.getCreateDate(now));
 		soggetto.setModifiedDate(serviceContext.getModifiedDate(now));
 		soggetto.setGroupId(serviceContext.getScopeGroupId());
-
 		soggetto.setDettPraticaId(dettPraticaId);
 		soggetto.setIntPraticaId(intPraticaId);
 		soggetto.setNome(nome);
@@ -485,9 +429,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		soggetto.setDtDataRimozione(dtDataRimozione);
 		soggetto.setSoggettoSostituitoId(soggettoSostituitoId);
 		soggetto.setTmp(tmp);
-
 		soggetto = soggettoPersistence.update(soggetto);
-
 		return soggetto;
 	}
 
@@ -515,30 +457,9 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 				fax, email, tipologiaSoggetto, aggiuntivo, rimosso, ambitoAttivita, ambitoProfessione,
 				intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, soggettoSostituitoId, oldSoggettoId,
 				false, serviceContext);
-
 		soggetto = allegaFileModifica(soggetto.getSoggettoId(), userId, intPraticaId, content, sourceFileName,
 				jsonFirmatari, serviceContext);
-
 		return soggetto;
-
-	}
-
-	private void validate(long groupId, long soggettoId, long dettPraticaId, long intPraticaId, String nome,
-			String cognome, String codiceFiscale, String codiceFiscaleDelegato, Date dataNascita,
-			String provinciaNascita, String comuneNascita, String comuneDomicilio, String comuneDomicilioEstero,
-			String provinciaDomicilio, String viaDomicilio, String numeroCivicoDomicilio, String capDomicilio,
-			String domicilioExtra, String comune, String comuneEstero, String provincia, String via,
-			String numeroCivico, String cap, String denominazione, String sedeLegale, String legaleRap,
-			Date dataNascitaRap, String provinciaNascitaRap, String comuneNascitaRap, String viaRap,
-			String numeroCivicoRap, String capRap, String provinciaRap, String comuneRap, String comuneRapEstero,
-			String albo, String alboDescr, String regAlbo, String provAlbo, String numIscrAlbo, String telefono,
-			String fax, String email, String tipologiaSoggetto, boolean aggiuntivo, boolean rimosso,
-			String ambitoAttivita, String ambitoProfessione, long intPraticaIdRimozione, long dettPraticaIdRimozione,
-			Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId) throws PortalException,
-			SystemException {
-
-		// TODO Write your own validation code
-
 	}
 
 	@Override
@@ -719,7 +640,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false));
-
 		return dynamicQuery;
 	}
 
@@ -728,7 +648,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 	public List<Soggetto> getTmpNotCompletedByDettPratica(long dettPraticaId) throws SystemException {
 
 		DynamicQuery dynamicQuery = createTmpNotcompletedQueryByDettPratica(dettPraticaId);
-
 		dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId"));
 		return soggettoPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -746,7 +665,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaId", dettPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", true));
-
 		return dynamicQuery;
 	}
 
@@ -799,13 +717,11 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 				dettPratica.getCodiceFiscalePrincipaleCommittente(),
 				dettPratica.getCodiceFiscalePrincipaleDirettoreLavori(), dettPratica.getCodiceFiscalePrincipaleDitta(),
 				dettPratica.getCodiceFiscalePrincipaleGeologo(), dettPratica.getCodiceFiscalePrincipaleProgettista() };
-
 		DynamicQuery dynamicQuery = dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", dettPratica.getIntPraticaId()));
 		dynamicQuery.add(RestrictionsFactoryUtil.in("codiceFiscale", cfPrincipali));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false));
-
 		return dynamicQuery;
 	}
 
@@ -865,7 +781,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaId", dettPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false));
-
 		return dynamicQuery;
 	}
 
@@ -929,14 +844,12 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscale", codiceFiscale));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false));
-
 		Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
 		dynamicQuery.add(disjunction);
 		if (Validator.isNotNull(docDettPraticaId)) {
 			disjunction.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l));
 			disjunction.add(RestrictionsFactoryUtil.le("dettPraticaIdRimozione", docDettPraticaId));
 		}
-
 		return dynamicQuery;
 	}
 
@@ -1057,7 +970,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.isNull("dtDataRimozione"));
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false));
-
 		return dynamicQuery;
 	}
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java
index 0c2ec380..cff33ad9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -26,17 +22,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the soggetto remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.SoggettoService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.SoggettoServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.SoggettoServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java
index b9496bfb..c3992c22 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -33,17 +29,15 @@ import com.liferay.util.dao.orm.CustomSQLUtil;
 
 /**
  * The implementation of the sorteggio local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.SorteggioLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.SorteggioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java
index 48fd0491..6b19a383 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -16,17 +12,15 @@ import it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl;
 
 /**
  * The implementation of the sorteggio remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.SorteggioService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.SorteggioServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java
index de0c9746..affbcb80 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -25,17 +21,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the storico soggetto pratica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java
index ae6cf943..0205b998 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -18,17 +12,15 @@ import it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseI
 
 /**
  * The implementation of the storico soggetto pratica remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil
  */
@@ -38,4 +30,4 @@ public class StoricoSoggettoPraticaServiceImpl extends StoricoSoggettoPraticaSer
 	 * it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil} to access the storico soggetto pratica
 	 * remote service.
 	 */
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java
index bff3ba8d..abcbdd4e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -42,17 +38,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the tempistica local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.TempisticaLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.TempisticaLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaServiceImpl.java
index 5dffabc4..0ec43f3e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaServiceImpl.java
@@ -1,15 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -18,17 +12,15 @@ import it.tref.liferay.portos.bo.service.base.TempisticaServiceBaseImpl;
 
 /**
  * The implementation of the tempistica remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.TempisticaService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.TempisticaServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.TempisticaServiceUtil
  */
@@ -37,4 +29,4 @@ public class TempisticaServiceImpl extends TempisticaServiceBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
 	 * it.tref.liferay.portos.bo.service.TempisticaServiceUtil} to access the tempistica remote service.
 	 */
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioLocalServiceImpl.java
index bca23ff6..be9275eb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioLocalServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -34,17 +30,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the territorio local service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.TerritorioLocalService} interface.
- *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
  * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.TerritorioLocalServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java
index 34ca0a1e..a80ea6c6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java
@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
  */
 
 package it.tref.liferay.portos.bo.service.impl;
@@ -24,17 +20,15 @@ import com.liferay.portal.service.ServiceContext;
 
 /**
  * The implementation of the territorio remote service.
- *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.tref.liferay.portos.bo.service.TerritorioService} interface.
- *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
  * credentials because this service can be accessed remotely.
  * </p>
  *
- * @author Salvatore La Manna, Manifattura Web Group
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see it.tref.liferay.portos.bo.service.base.TerritorioServiceBaseImpl
  * @see it.tref.liferay.portos.bo.service.TerritorioServiceUtil
  */
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java
index 5c96356f..68b9d749 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AllegatoManualePersistence
  * @see AllegatoManualeUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java
index 15633d6f..f9489e0d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AsseverazionePersistence
  * @see AsseverazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java
index 38e33edc..a8a28936 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see AvvisoPersistence
  * @see AvvisoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java
index 02dcaba3..1c9ee855 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see CollaudoPersistence
  * @see CollaudoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java
index 4a23bffd..b5054e85 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunePersistence
  * @see ComuneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java
index f5b8166f..b8d76564 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ComunicazionePersistence
  * @see ComunicazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java
index 32809343..4a0e9a11 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ConfigurazionePersistence
  * @see ConfigurazioneUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java
index a4fa6f91..7c1fa3f1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ControlloPraticaPersistence
  * @see ControlloPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java
index 8c56fb32..a2090464 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DelegaPersistence
  * @see DelegaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java
index f35bff1b..eabc1419 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DettPraticaPersistence
  * @see DettPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java
index c25ae1dc..cbb97b8f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocAggiuntivaPersistence
  * @see DocAggiuntivaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java
index 255330f7..1a35a013 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see DocPraticaPersistence
  * @see DocPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java
index 15f0504f..e2a7716d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see FineLavoriPersistence
  * @see FineLavoriUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java
index f80406ab..7b45230e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java
@@ -57,7 +57,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see HistoryWorkflowActionPersistence
  * @see HistoryWorkflowActionUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java
index 80bc6adf..605304c7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java
@@ -65,7 +65,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see IntPraticaPersistence
  * @see IntPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java
index ee3b3b9b..a21d5628 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java
@@ -63,7 +63,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see PagamentoPersistence
  * @see PagamentoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java
index e4133c60..d4e4eb82 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ParereGeologoPersistence
  * @see ParereGeologoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java
index 2c7a846f..28c40f09 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java
@@ -58,7 +58,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see ProvinciaPersistence
  * @see ProvinciaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java
index ef2db5f2..9472e823 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SoggettoPersistence
  * @see SoggettoUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java
index fc566b28..5bcc9a03 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see SorteggioPersistence
  * @see SorteggioUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java
index 0c095d3d..0bff1915 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java
@@ -57,7 +57,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see StoricoSoggettoPraticaPersistence
  * @see StoricoSoggettoPraticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java
index 252fc452..61d576eb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java
@@ -61,7 +61,7 @@ import java.util.Set;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TempisticaPersistence
  * @see TempisticaUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java
index c8e0dee9..c7f4d1dd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java
@@ -60,7 +60,7 @@ import java.util.List;
  * Caching information and settings can be found in <code>portal.properties</code>
  * </p>
  *
- * @author Davide Barbagallo, 3F Consulting
+ * @author Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l.
  * @see TerritorioPersistence
  * @see TerritorioUtil
  * @generated
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java
index 35c2d287..7ea967f7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java
@@ -1,9 +1,9 @@
 package it.tref.liferay.portos.bo.startup;
 
-import java.util.Date;
-
 import it.tref.liferay.portos.bo.shared.util.Constants;
 
+import java.util.Date;
+
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.events.SimpleAction;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -35,16 +35,11 @@ public class CompanyExpandoStartupAction extends SimpleAction {
 
 		String[] defaultActions = { ActionKeys.VIEW, ActionKeys.UPDATE };
 		String[] guestActions = { ActionKeys.VIEW };
-
 		try {
-
 			for (String companyIdStr : companyIds) {
-
 				long companyId = Long.valueOf(companyIdStr);
 				initExpandoColumnCompany(companyId, defaultActions, guestActions);
-
 			}
-
 		} catch (Exception e) {
 			_log.error("Errore nella procedura automatizzata di configurazione", e);
 		}
@@ -54,65 +49,46 @@ public class CompanyExpandoStartupAction extends SimpleAction {
 			throws NumberFormatException, SystemException {
 
 		String className = Company.class.getName();
-
 		addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES,
-				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES_URL,
+				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES_URL, defaultActions,
+				guestActions);
+		addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS,
+				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_URL, defaultActions,
+				guestActions);
+		addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT,
+				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT_URL,
 				defaultActions, guestActions);
-
-		addExpandoColumnIfNotExists(companyId, className,
-				Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS, ExpandoColumnConstants.STRING,
-				Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_URL, defaultActions, guestActions);
-
-		addExpandoColumnIfNotExists(companyId, className,
-				Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT, ExpandoColumnConstants.STRING,
-				Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT_URL, defaultActions, guestActions);
-
 		addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT,
-				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT_URL,
-				defaultActions, guestActions);
-
+				ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT_URL, defaultActions,
+				guestActions);
 		addExpandoColumnIfNotExists(companyId, className,
-				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL,
-				ExpandoColumnConstants.STRING,
+				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, ExpandoColumnConstants.STRING,
 				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_VALUE, defaultActions, guestActions);
-
 		addExpandoColumnIfNotExists(companyId, className,
-				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL,
-				ExpandoColumnConstants.STRING,
+				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, ExpandoColumnConstants.STRING,
 				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_VALUE, defaultActions, guestActions);
-
-		addExpandoColumnIfNotExists(companyId, className, Constants.ORG_CUSTOM_FIELD_PO,
-				ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions);
-
+		addExpandoColumnIfNotExists(companyId, className, Constants.ORG_CUSTOM_FIELD_PO, ExpandoColumnConstants.STRING,
+				StringPool.BLANK, defaultActions, guestActions);
 		addExpandoColumnIfNotExists(companyId, className, Constants.GESTIONE_PRATICA_URL_FE,
 				ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions);
-
 		addExpandoColumnIfNotExists(companyId, className, Constants.GESTIONE_PRATICA_URL_BO,
 				ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions);
-
 		addExpandoColumnIfNotExists(companyId, className, Constants.CF_ORGANIZATION_MEMBERSHIP,
 				ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions);
-
-		// Manifattura Web Group, mofidica per rendere la dimensione massima
-		// degli allegati configurabile da pannello di controllo. In origine era
-		// hardcoded a 20971520 byte.
+		// Manifattura Web Group, mofidica per rendere la dimensione massima degli allegati configurabile da pannello di
+		// controllo. In origine era hardcoded a 20971520 byte.
 		addExpandoColumnIfNotExists(companyId, className,
-				Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_IN_MIB,
-				ExpandoColumnConstants.SHORT,
-				Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_DEFAULT, defaultActions,
-				guestActions);
+				Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_IN_MIB, ExpandoColumnConstants.SHORT,
+				Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_DEFAULT, defaultActions, guestActions);
 
 		addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_LINK_SEED,
-				ExpandoColumnConstants.STRING, String.valueOf(new Date().getTime()), defaultActions,
-				guestActions);
+				ExpandoColumnConstants.STRING, String.valueOf(new Date().getTime()), defaultActions, guestActions);
 	}
 
-	private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name,
-			int type, String defaultData, String[] defaultActions, String[] guestActions)
-			throws SystemException {
+	private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name, int type,
+			String defaultData, String[] defaultActions, String[] guestActions) throws SystemException {
 
 		long classNameId = PortalUtil.getClassNameId(className);
-
 		ExpandoTable expandoTable = null;
 		try {
 			expandoTable = ExpandoTableLocalServiceUtil.getTable(companyId, classNameId,
@@ -121,59 +97,47 @@ public class CompanyExpandoStartupAction extends SimpleAction {
 			try {
 				expandoTable = ExpandoTableLocalServiceUtil.addTable(companyId, classNameId,
 						ExpandoTableConstants.DEFAULT_TABLE_NAME);
-			} catch (PortalException e1) {
-			}
+			} catch (PortalException e1) {}
 		}
-
-		ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil
-				.getColumn(expandoTable.getTableId(), name);
-
+		ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil.getColumn(expandoTable.getTableId(), name);
 		if (expandoColumn == null) {
-
 			try {
-				// Manifattura Web Group, modifica per rendere possibile la
-				// creazione di campi personalizzati di tipo intero
+				// Manifattura Web Group, modifica per rendere possibile la creazione di campi personalizzati di tipo
+				// intero
 				switch (type) {
-				case ExpandoColumnConstants.INTEGER:
-					expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name,
-							type, Integer.valueOf(defaultData));
-					break;
-				case ExpandoColumnConstants.LONG:
-					expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name,
-							type, Long.valueOf(defaultData));
-					break;
-				case ExpandoColumnConstants.SHORT:
-					expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name,
-							type, Short.valueOf(defaultData));
-					break;
-				default:
-					expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name,
-							type, defaultData);
+					case ExpandoColumnConstants.INTEGER:
+						expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type,
+								Integer.valueOf(defaultData));
+						break;
+					case ExpandoColumnConstants.LONG:
+						expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type,
+								Long.valueOf(defaultData));
+						break;
+					case ExpandoColumnConstants.SHORT:
+						expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type,
+								Short.valueOf(defaultData));
+						break;
+					default:
+						expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type,
+								defaultData);
 				}
-
-			} catch (PortalException e) {
-			}
+			} catch (PortalException e) {}
 		}
-
 		try {
-
 			Role roleGuest = RoleLocalServiceUtil.getRole(companyId, RoleConstants.GUEST);
 			Role rolePowerUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.POWER_USER);
 			Role roleUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.USER);
 
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), roleGuest.getRoleId(), guestActions);
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), rolePowerUser.getRoleId(), defaultActions);
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), roleUser.getRoleId(), defaultActions);
-		} catch (PortalException e) {
-		}
-
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					roleGuest.getRoleId(), guestActions);
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					rolePowerUser.getRoleId(), defaultActions);
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					roleUser.getRoleId(), defaultActions);
+		} catch (PortalException e) {}
 		return expandoColumn;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java
index 47733f1d..b51477b9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java
@@ -25,8 +25,6 @@ public class KaleoListenereStartupAction extends ModelListenerStartupAction {
 				new ModelListenerWrapper("portos-kaleo-web", KaleoInstanceToken.class.getName(),
 						KaleoInstanceTokenModelListener.class.getName()),
 				new ModelListenerWrapper("portos-kaleo-web", KaleoLog.class.getName(),
-						KaleoLogModelListener.class.getName())
-
-		};
+						KaleoLogModelListener.class.getName()) };
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java
index 8f197296..2fef4fa4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java
@@ -28,13 +28,13 @@ public class RoleUpdateAction extends SimpleAction {
 		super();
 	}
 
+	@Override
 	public void run(String[] ids) throws ActionException {
 
 		for (String companyId : ids) {
 			// TODO aggiunta di tutti i ruoli
 			try {
-				Role role = RoleLocalServiceUtil.fetchRole(Long.valueOf(companyId),
-						Constants.ROLE_NAME_GEOLOGO);
+				Role role = RoleLocalServiceUtil.fetchRole(Long.valueOf(companyId), Constants.ROLE_NAME_GEOLOGO);
 				if (Validator.isNull(role)) {
 					long userId = UserLocalServiceUtil.getDefaultUserId(Long.valueOf(companyId));
 					String className = Role.class.getName();
@@ -47,15 +47,13 @@ public class RoleUpdateAction extends SimpleAction {
 					int type = RoleConstants.TYPE_REGULAR;
 					String subtype = null;
 					ServiceContext serviceContext = null;
-					RoleLocalServiceUtil.addRole(userId, className, classPK, name, titleMap, descriptionMap,
-							type, subtype, serviceContext);
+					RoleLocalServiceUtil.addRole(userId, className, classPK, name, titleMap, descriptionMap, type,
+							subtype, serviceContext);
 					_log.info("Aggiunto ruolo " + name);
 				}
-
 			} catch (PortalException | SystemException e) {
 				_log.error("Errore durante l'aggiunta di un ruolo", e);
 			}
 		}
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java
index 67f55a39..229e6edb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java
@@ -4,12 +4,12 @@ import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.UniqueList;
 import com.liferay.portal.model.Role;
 import com.liferay.portal.model.User;
 import com.liferay.portal.model.UserGroupRole;
@@ -19,26 +19,17 @@ import com.liferay.portal.service.UserLocalServiceUtil;
 
 public class GestioneFirmeUtil {
 
-	@SuppressWarnings("serial")
-	private static List<String> tipoDocumentoFirmaBase = new UniqueList<String>() {
-		{
-			add("MA");
-			add(StatoPraticaConstants.INTEGRAZIONE);
-		}
-	};
+	private static List<String> tipoDocumentoFirmaBase = Arrays.asList("MA", StatoPraticaConstants.INTEGRAZIONE);
 
-	public static boolean hasFirmaPermision(long userId, long groupId) throws PortalException,
-			SystemException {
+	public static boolean hasFirmaPermision(long userId, long groupId) throws PortalException, SystemException {
 
-		return UserGroupRoleLocalServiceUtil.hasUserGroupRole(userId, groupId, Constants.ROLE_NAME_FIRMA,
-				true);
+		return UserGroupRoleLocalServiceUtil.hasUserGroupRole(userId, groupId, Constants.ROLE_NAME_FIRMA, true);
 	}
 
-	public static boolean hasFirmaPermisionDirigente(long userId, long groupId) throws PortalException,
-			SystemException {
+	public static boolean hasFirmaPermisionDirigente(long userId, long groupId) throws PortalException, SystemException {
 
-		return UserGroupRoleLocalServiceUtil.hasUserGroupRole(userId, groupId,
-				Constants.ROLE_NAME_FIRMA_DIRIGENTE, true);
+		return UserGroupRoleLocalServiceUtil.hasUserGroupRole(userId, groupId, Constants.ROLE_NAME_FIRMA_DIRIGENTE,
+				true);
 	}
 
 	public static boolean userCanSignAvviso(long userId, long groupId, long avvisoId) throws PortalException,
@@ -60,8 +51,8 @@ public class GestioneFirmeUtil {
 		} else {
 			role = RoleLocalServiceUtil.getRole(companyId, Constants.ROLE_NAME_FIRMA_DIRIGENTE);
 		}
-		List<UserGroupRole> UserGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
-				groupId, role.getRoleId());
+		List<UserGroupRole> UserGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(groupId,
+				role.getRoleId());
 		if (UserGroupRoles.size() == 1) {
 			User user = UserLocalServiceUtil.getUser(UserGroupRoles.get(0).getUserId());
 			codiceFiscaleFirma = user.getScreenName();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/workflow/ControlloPraticaWorkflowHandler.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/workflow/ControlloPraticaWorkflowHandler.java
index 6d135c8c..592cf3ae 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/workflow/ControlloPraticaWorkflowHandler.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/workflow/ControlloPraticaWorkflowHandler.java
@@ -13,8 +13,6 @@ import java.util.Map;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.BaseWorkflowHandler;
@@ -22,17 +20,13 @@ import com.liferay.portal.service.ServiceContext;
 
 public class ControlloPraticaWorkflowHandler extends BaseWorkflowHandler {
 
-	private Log _log = LogFactoryUtil.getLog(ControlloPraticaWorkflowHandler.class);
-
 	@Override
 	public String getClassName() {
-
 		return ControlloPratica.class.getName();
 	}
 
 	@Override
 	public String getType(Locale locale) {
-
 		return "controlloPratica";
 	}
 
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 2ec0560a..8b829a5a 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=2694
-    build.date=1629898346801
+    build.number=2707
+    build.date=1630332946709
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_cambia_titolare.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_cambia_titolare.jsp
index 0f40e5d5..fd11bb61 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_cambia_titolare.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_cambia_titolare.jsp
@@ -1,59 +1,48 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.GenericUtils"%>
-<%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
-<%@page import="com.liferay.portal.kernel.util.ListUtil"%>
-<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
-<%@page import="java.util.Map"%>
-<%@page import="java.util.HashMap"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%>
-
+<%@page import="java.util.HashSet"%>
+<%@page import="java.util.Set"%>
 <%@include file="/html/fascicolo/init.jsp"%>
-
 <%
-	long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
-	String buttonIdCambiaTitolare = ParamUtil.getString(request, "buttonIdCambiaTitolare");
-	
-	String randomId = StringUtil.randomId();
-	String formNameCambiaTitolare = "formNameCambiaTitolare"+randomId; 
-	String divIdCambiaTitolare = "divIdCambiaTitolare"+randomId;  
-	IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-	
-
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+String buttonIdCambiaTitolare = ParamUtil.getString(request, "buttonIdCambiaTitolare");
+String randomId = StringUtil.randomId();
+String formNameCambiaTitolare = "formNameCambiaTitolare" + randomId;
+String divIdCambiaTitolare = "divIdCambiaTitolare" + randomId;
+IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 %>
-
 <liferay-portlet:actionURL name="cambiaTitolare" var="cambiaTitolareURL">
-	<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId())%>" />
-	<liferay-util:param name="companyId" value="<%=String.valueOf(intPratica.getCompanyId())%>" />
-	<liferay-util:param name="redirect" value="<%=currentURL%>" />
+	<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
+	<liferay-util:param name="companyId" value="<%= String.valueOf(intPratica.getCompanyId()) %>" />
+	<liferay-util:param name="redirect" value="<%= currentURL %>" />
 </liferay-portlet:actionURL>
-
-<aui:form name="<%=formNameCambiaTitolare %>" method="post" action="<%= cambiaTitolareURL %>" >
+<aui:form name="<%= formNameCambiaTitolare %>" method="post" action="<%= cambiaTitolareURL %>" >
 	<div id='<%= renderResponse.getNamespace() + divIdCambiaTitolare %>' class="hide" >
 		<aui:select name="nuovoSoggettoCF" label="Seleziona nuovo titolare" showEmptyOption="true">
-		<%		
-			User titolare = UserLocalServiceUtil.getUser(intPratica.getUserId());
-			List<String> cfs = 	new ArrayList<String>();
-			List<String> cfsoggettiValidi = SoggettoLocalServiceUtil.getCfValidByIntPratica(intPraticaId);
-			GenericUtils.addAllIfnotExist(cfs, cfsoggettiValidi);
-			cfs.remove(titolare.getScreenName());
-			
-			for (String cf : cfs ){
-			  List<Soggetto> soggetti = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(intPraticaId, cf);
-			  if (!soggetti.isEmpty()){			    
+		<%
+		User titolare = UserLocalServiceUtil.getUser(intPratica.getUserId());
+		Set<String> cfs = new HashSet<String>(SoggettoLocalServiceUtil.getCfValidByIntPratica(intPraticaId));
+		cfs.remove(titolare.getScreenName());
+		for (String cf : cfs ) {
+			List<Soggetto> soggetti = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(intPraticaId, cf);
+			if (!soggetti.isEmpty()) {
+		%>
+				<aui:option cssClass="text-uppercase" value="<%= cf %>"
+						label="<%= soggetti.get(0).getDescrizioneCompleta() %>" />
+		<%
+			}
+		}
 		%>
-			<aui:option cssClass="text-uppercase" value="<%= cf %>" label="<%= soggetti.get(0).getDescrizioneCompleta() %>" />
-		<% }} %>			
 		</aui:select>
 	</div>
 	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>" >
-		<liferay-util:param name="formName" value="<%=formNameCambiaTitolare %>"></liferay-util:param>
-		<liferay-util:param name="titolo" value="Cambia titolare pratica"></liferay-util:param>
-		<liferay-util:param name="buttonId" value="<%=buttonIdCambiaTitolare %>"></liferay-util:param>
-		<liferay-util:param name="buttonConferma" value="CONFERMA"></liferay-util:param>
-		<liferay-util:param name="contentDiv" value="<%=divIdCambiaTitolare %>"></liferay-util:param>
-		<liferay-util:param name="width" value="500"></liferay-util:param>
-		<liferay-util:param name="buttonBar" value="true"></liferay-util:param>
+		<liferay-util:param name="formName" value="<%= formNameCambiaTitolare %>" />
+		<liferay-util:param name="titolo" value="Cambia titolare pratica" />
+		<liferay-util:param name="buttonId" value="<%= buttonIdCambiaTitolare %>" />
+		<liferay-util:param name="buttonConferma" value="CONFERMA" />
+		<liferay-util:param name="contentDiv" value="<%= divIdCambiaTitolare %>" />
+		<liferay-util:param name="width" value="500" />
+		<liferay-util:param name="buttonBar" value="true" />
 	</liferay-util:include>
 </aui:form>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp
index f537ff76..b4aa3c97 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp
@@ -5,6 +5,7 @@
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
 <%@page import="java.util.ArrayList"%>
 <%@page import="java.util.Collections"%>
 <%@include file="/html/fascicolo/init.jsp"%>
@@ -66,7 +67,8 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani
 						<%
 						List<UserGroupRole>	tecniciIstruttori = new ArrayList<UserGroupRole>();
 						for (Organization org : organizationList) {
-							Role role = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_istruttore");
+							Role role = RoleLocalServiceUtil.getRole(org.getCompanyId(),
+									Constants.ROLE_NAME_ISTRUTTORE);
 							List<UserGroupRole>	istruttori = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
 									org.getGroupId(), role.getRoleId());
 							for (UserGroupRole userGroupRole : istruttori) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java
index 22dd0302..b7f251a3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java
@@ -1,5 +1,10 @@
 package it.tref.liferay.portos.deployalert.action;
 
+import it.tref.liferay.portos.deployalert.constants.MailConstants;
+import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
+
+import java.util.List;
+
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.events.SimpleAction;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -16,78 +21,61 @@ import com.liferay.portal.model.Company;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.util.PortalUtil;
 
-import it.tref.liferay.portos.deployalert.constants.MailConstants;
-import it.tref.liferay.portos.deployalert.model.NotificationMail;
-import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil;
-import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
-import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
-import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+public class DeployAction extends SimpleAction {
 
-import java.util.List;
+	private final static Log _log = LogFactoryUtil.getLog(DeployAction.class);
 
-public class DeployAction extends SimpleAction {
+	@Override
+	public void run(final String[] ids) throws ActionException {
+
+		MessageBusUtil.registerMessageListener(DestinationNames.HOT_DEPLOY, new MessageListener() {
+
+			@Override
+			public void receive(Message message) throws MessageListenerException {
+
+				String evento = message.getString("command");
+				String nomePlugin = message.getString("servletContextName");
+
+				if (evento.equals("undeploy") && nomePlugin.equals("portos-deploy-alert-portlet")) {
+					try {
+						NotificationLogLocalServiceUtil.addNotification(nomePlugin, evento);
+					} catch (PortalException | SystemException e) {
+						_log.error(e, e);
+					}
+					MessageBusUtil.unregisterMessageListener(DestinationNames.HOT_DEPLOY, this);
+				} else if (evento.equals("deploy") || evento.equals("undeploy")) {
+					try {
+						List<NotificationMail> notifications;
+
+						NotificationLogLocalServiceUtil.addNotification(nomePlugin, evento);
+
+						notifications = NotificationMailLocalServiceUtil.findNotifications(
+								PortalUtil.getDefaultCompanyId(), nomePlugin);
+
+						for (int i = 0; i < notifications.size(); i++) {
+
+							String templateName = notifications.get(i).getNomeTemplate();
+
+							if (templateName.equals(MailConstants.DEFAULT_TEMPLATE)) {
+								if (evento.equals("deploy")) {
+									templateName = MailConstants.DEFAULT_DEPLOY_TEMPLATE;
+								} else {
+									templateName = MailConstants.DEFAULT_UNDEPLOY_TEMPLATE;
+								}
+							}
+
+							JSONObject parametri = DeployAlertUtil.getParametri(nomePlugin, evento);
+
+							ServiceContext serviceContext = DeployAlertUtil.getServiceContext();
+							MailManagerUtil.sendMailByTemplateName(Company.class.toString(),
+									serviceContext.getCompanyId(), templateName, parametri, serviceContext);
+						}
 
-  private final static Log _log = LogFactoryUtil.getLog(DeployAction.class);
-
-  @Override
-  public void run(final String[] ids) throws ActionException {
-    /*
-     * ServiceContext serviceContext = DeployAlertUtil.getServiceContext(); try {
-     * PermissionThreadLocal
-     * .setPermissionChecker(PermissionCheckerFactoryUtil.create(UserLocalServiceUtil
-     * .getUser(serviceContext.getUserId()))); } catch (Exception e) { _log.error(e, e); }
-     * DeployAlertUtil.addDefaultDeployMailTemplate(serviceContext);
-     * DeployAlertUtil.addDefaultUndeployMailTemplate(serviceContext);
-     */
-
-    MessageBusUtil.registerMessageListener(DestinationNames.HOT_DEPLOY, new MessageListener() {
-
-      @Override
-      public void receive(Message message) throws MessageListenerException {
-
-        String evento = message.getString("command");
-        String nomePlugin = message.getString("servletContextName");
-
-        if (evento.equals("undeploy") && nomePlugin.equals("portos-deploy-alert-portlet")) {
-          try {
-            NotificationLogLocalServiceUtil.addNotification(nomePlugin, evento);
-          } catch (PortalException | SystemException e) {
-            _log.error(e, e);
-          }
-          MessageBusUtil.unregisterMessageListener(DestinationNames.HOT_DEPLOY, this);
-        } else if (evento.equals("deploy") || evento.equals("undeploy")) {
-          try {
-            List<NotificationMail> notifications;
-
-            NotificationLogLocalServiceUtil.addNotification(nomePlugin, evento);
-
-            notifications =
-                NotificationMailLocalServiceUtil.findNotifications(PortalUtil.getDefaultCompanyId(), nomePlugin);
-
-            for (int i = 0; i < notifications.size(); i++) {
-
-              String templateName = notifications.get(i).getNomeTemplate();
-
-              if (templateName.equals(MailConstants.DEFAULT_TEMPLATE)) {
-                if (evento.equals("deploy")) {
-                  templateName = MailConstants.DEFAULT_DEPLOY_TEMPLATE;
-                } else {
-                  templateName = MailConstants.DEFAULT_UNDEPLOY_TEMPLATE;
-                }
-              }
-
-              JSONObject parametri = DeployAlertUtil.getParametri(nomePlugin, evento);
-
-              ServiceContext serviceContext = DeployAlertUtil.getServiceContext();
-              MailManagerUtil.sendMailByTemplateName(Company.class.toString(), serviceContext.getCompanyId(),
-                  templateName, parametri, serviceContext);
-            }
-
-          } catch (Exception e) {
-            _log.error(e, e);
-          }
-        }
-      }
-    });
-  }
+					} catch (Exception e) {
+						_log.error(e, e);
+					}
+				}
+			}
+		});
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/build.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/build.xml
index 6ea20ceb..9001232c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/build.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/build.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE project>
-
 <project name="portos-fe-portlet" basedir="." default="deploy">
 	<property name="import.shared" value="portos-bo-shared,portos-mail-manager-shared,portos-report-shared" />
 	<import file="../build-common-portlet.xml" />
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/content/Language.properties
index 97408c8a..f002e120 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/content/Language.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/content/Language.properties
@@ -1,12 +1,9 @@
-
 asseverazioni-attive-domanda-non-modificabile = Asseverazioni Attive - Domanda non modificabile
 domanda-non-modificabile = Domanda non modificabile
 fascicolo-action-open-pratica = Apri pratica
 fascicolo-action-parere-geologo = Esprimi parere
 pagamento-attivo-domanda-non-modificabile = Pagamento in corso - Domanda non modificabile
 
-
-#ADT bug id = 22
 #fascicolo_title_intervento = Descrizione Intervento
 add-fascicolo = Aggiungi Progetto
 data-richiesta = Data richiesta
@@ -28,7 +25,6 @@ tipologia-soggetto = Tipologia Soggetto
 variante = Variante
 view-fascicolo = Visualizza Fascicolo
 
-
 add-delega = Aggiungi Delega
 cat_dati_domanda = Dati domanda
 chiudi-tutte-deleghe = Chiudi tutte le deleghe
@@ -48,7 +44,6 @@ view-docaggiuntiva = Documentazione Aggiuntiva
 view-riepilogo = Riepilogo
 view-storico = Cronostoria
 
-
 add-allegato = Aggiungi allegato
 add-soggetto = Aggiungi soggetto
 annulla-asseverazioni = Annulla Asseverazioni
@@ -69,7 +64,6 @@ sostituisci-pagamento = Effettua pagamento con IRIS
 tipologia = Tipologia
 upload-allegato = Allegato
 
-
 cancel = Annulla
 help_message_allegato_variazione_soggetti = <p>Per concludere la variazione soggetto è necessario allegare un file firmato dal soggetto in questione e almeno uno dei soggetti già inseriti nella pratica.</p><p>SOLO nel caso di COMMITTENTE, l'unica firma OBBLIGATORIA è quella del TITOLARE DIGITALE della pratica.</p>
 #help_message_calcolo_importo = Calcolare l'importo e poi premere su "Paga e invia".<br/><br/><strong>ATTENZIONE:</strong><br/>Assicurarsi di consentire l'apertura dei popup per l'indirizzo <strong><em>https://www327.regione.toscana.it:443</em></strong>.<br/><ul style = "list-style:disc;padding-left:20px"><li><a href = "https://support.google.com/chrome/answer/95472?co = GENIE.Platform%3DDesktop&hl = it" target = "_blank">Istruzioni Chrome</a></li><li><a href = "https://support.mozilla.org/it/kb/Controllare%20le%20finestre%20pop-up#w_che-cosa-sono-le-finestre-pop-up" target = "_blank">Istruzioni Firefox</a></li><li><a href = "https://support.microsoft.com/it-it/help/17479/windows-internet-explorer-11-change-security-privacy-settings" target = "_blank">Istruzioni IE</a></li></ul>
@@ -81,10 +75,10 @@ salva-conferma = Salva e Conferma
 salva-verifica = Salva e Verifica
 
 ## Soggetti ##
-
-## Parere Geologo ##
 add-soggetto = Aggiungi Soggetto
 edit-soggetto = Modifica Soggetto
+
+## Parere Geologo ##
 error-update-parere-geologo = "Errore durante l'inserimento del parere geologo"
 success-update-parere-geologo = "Parere geologo inserito con successo"
 view-soggetto = Visualizza Soggetto
@@ -112,4 +106,4 @@ error.geniocivilefe.pagamento.allegato.ext.valid=Tipo di file errato (solo pdf o
 error.geniocivilefe.pagamento.allegato.length.valid=Nome del file troppo lungo (max 200 caratteri)
 error.geniocivilefe.pagamento.allegato.is.request=Nessun allegato inviato
 
-avviso-destinazione=Le classi III e IV non sono selezionabili per le pratiche di tipo B o C, le stesse devono essere presentate quali pratiche di Tipo A - Autorizzazione.
\ No newline at end of file
+avviso-destinazione=Le classi III e IV non sono selezionabili per le pratiche di tipo B o C, le stesse devono essere presentate quali pratiche di Tipo A - Autorizzazione.
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/search/AdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/search/AdvancedSearch.java
index 4a2f24e5..3cfb6fee 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/search/AdvancedSearch.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/search/AdvancedSearch.java
@@ -2,45 +2,50 @@ package it.tref.liferay.portos.fe.search;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class AdvancedSearch implements Serializable {
 
-  private String field;
-  private int comparator;
-  private String value;
+	private String field;
+	private int comparator;
+	private String value;
 
-  public AdvancedSearch() {}
+	public AdvancedSearch() {}
 
-  public AdvancedSearch(String field, int comparator, String value) {
-    super();
-    this.field = field;
-    this.comparator = comparator;
-    this.value = value;
-  }
+	public AdvancedSearch(String field, int comparator, String value) {
 
-  public String getField() {
-    return field;
-  }
+		super();
+		this.field = field;
+		this.comparator = comparator;
+		this.value = value;
+	}
 
-  public void setField(String field) {
-    this.field = field;
-  }
+	public String getField() {
 
-  public int getComparator() {
-    return comparator;
-  }
+		return field;
+	}
 
-  public void setComparator(int comparator) {
-    this.comparator = comparator;
-  }
+	public void setField(String field) {
 
-  public String getValue() {
-    return value;
-  }
+		this.field = field;
+	}
 
-  public void setValue(String value) {
-    this.value = value;
-  }
+	public int getComparator() {
 
+		return comparator;
+	}
 
+	public void setComparator(int comparator) {
 
+		this.comparator = comparator;
+	}
+
+	public String getValue() {
+
+		return value;
+	}
+
+	public void setValue(String value) {
+
+		this.value = value;
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/Constants.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/Constants.java
deleted file mode 100644
index 01c3b19c..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/Constants.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package it.tref.liferay.portos.fe.util;
-
-public interface Constants extends com.liferay.portal.kernel.util.Constants {
-
-}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/PortletKeys.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/PortletKeys.java
deleted file mode 100644
index 10d25718..00000000
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/PortletKeys.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package it.tref.liferay.portos.fe.util;
-
-public class PortletKeys extends it.tref.liferay.portos.bo.shared.util.PortletKeys {
-
-//  public final static String FASCICOLOFE = "1_WAR_portosfeportlet";
-//  public final static String SOGGETTI = "3_WAR_portosfeportlet";
-//  public final static String ALLEGATI = "4_WAR_portosfeportlet";
-}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloBean.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloBean.java
index 852ac8ce..a097d8e3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloBean.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloBean.java
@@ -2,31 +2,25 @@ package it.tref.liferay.portos.fe.util;
 
 import java.io.Serializable;
 
-public class ReportFascicoloBean implements Serializable{
+@SuppressWarnings("serial")
+public class ReportFascicoloBean implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4921215218965971793L;
+	private String label;
+
+	public ReportFascicoloBean() {}
+
+	public ReportFascicoloBean(String label) {
 
-	public ReportFascicoloBean(){
-	}
-	
-	public ReportFascicoloBean(String label){
 		this.label = label;
 	}
-	
-	private String label;
 
 	public String getLabel() {
+
 		return label;
 	}
 
 	public void setLabel(String label) {
+
 		this.label = label;
 	}
-
-	
-	
-	
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java
index 9f375a3d..2ff76513 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java
@@ -24,11 +24,8 @@ import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
-import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
-import it.tref.liferay.portos.bo.shared.bean.FirmeDetail;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
-import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
 import it.tref.liferay.portos.bo.shared.util.PagamentoConstants;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
@@ -60,130 +57,94 @@ import com.liferay.portal.service.CompanyLocalServiceUtil;
 
 public class ReportFascicoloUtil {
 
-	public static Map<String, Object> generateParametersReportFascicolo(long intPraticaId, Locale locale,
-			long companyId) throws PortalException, SystemException {
+	public static Map<String, Object> generateParametersReportFascicolo(long intPraticaId, Locale locale, long companyId)
+			throws PortalException, SystemException {
 
 		Map<String, Object> parameters = new HashMap<String, Object>();
-
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
-
 		if (intPratica != null) {
-
 			// Intestazione
-
 			parameters.put("TITOLO_PRATICA", getTitlePratica(intPraticaId));
-
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-			Provincia provincia = ProvinciaLocalServiceUtil
-					.fetchByC_C(companyId, comune.getCodiceProvincia());
-
+			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
 			parameters.put("SEDE_GENIO_CIVILE", provincia.getProvincia());
-
 			// Dettagli principali
 			List<ReportFascicoloBean> listaDettagliPrincipali = new ArrayList<ReportFascicoloBean>();
-
-			// ADT:BUG ID = 3
-			// DettPratica lastDettPratica =
-			// DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-			DettPratica lastDettPratica = DettPraticaLocalServiceUtil
-					.getFirstCompletedByIntPratica(intPratica.getIntPraticaId());
-
+			DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getFirstCompletedByIntPratica(intPratica
+					.getIntPraticaId());
 			if (lastDettPratica != null) {
-
 				parameters.put(
 						"DESCRIZIONE_INTERVENTO",
 						"Descrizione Intervento: "
 								+ BeanPropertiesUtil.getString(lastDettPratica, "descLongIntervento"));
-
-				// ADT: BUD ID=3
 				String protocollo = lastDettPratica.getProtocollo();
 				Date dataProtocollo = lastDettPratica.getDtProtocollo();
 				Avviso avviso = AvvisoLocalServiceUtil.getAvvisoVidimazione(intPraticaId,
 						lastDettPratica.getDettPraticaId());
 				if (avviso != null) {
 					protocollo = avviso.getProtocollo() != null ? avviso.getProtocollo() : protocollo;
-					dataProtocollo = avviso.getDtProtocollo() != null ? avviso.getDtProtocollo()
-							: dataProtocollo;
+					dataProtocollo = avviso.getDtProtocollo() != null ? avviso.getDtProtocollo() : dataProtocollo;
 				}
-				// ADT BUG ID = 3
 				parameters.put("PROTOCOLLO", finalizzaProtocollazione(companyId, protocollo, dataProtocollo));
 				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr01Dep")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr01-dep"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr01-dep"));
 						listaDettagliPrincipali.add(bean);
 					}
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr02Dep")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr02-dep"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr02-dep"));
 						listaDettagliPrincipali.add(bean);
 					}
-
 				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr01Aut")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr01-aut"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr01-aut"));
 						listaDettagliPrincipali.add(bean);
 					}
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr02Aut")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr02-aut"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr02-aut"));
 						listaDettagliPrincipali.add(bean);
 					}
-
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm2018")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm2018"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm2018"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm01")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm01"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm01"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm02")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm02"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm02"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm03")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dm03"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm03"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDprg01")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dprg01"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dprg01"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDprg02")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dprg02"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dprg02"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normAnr")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-anr"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-anr"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normLavoriInProprio")) {
 					ReportFascicoloBean bean = new ReportFascicoloBean("- "
 							+ LanguageUtil.get(locale, "norm-lavori-in-proprio"));
@@ -210,8 +171,7 @@ public class ReportFascicoloUtil {
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normArt3com3")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "norm-art3com3"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "norm-art3com3"));
 					listaDettagliPrincipali.add(bean);
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- "
 							+ LanguageUtil.get(locale, "norm-art3com3_1"));
@@ -227,83 +187,67 @@ public class ReportFascicoloUtil {
 					listaDettagliPrincipali.add(bean4);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normArt3com4")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "norm-art3com4"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "norm-art3com4"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				parameters.put("VALUES_PRATICA_PRINCIPALE", listaDettagliPrincipali);
-
 				// Dettagli indirizzo
 				List<ReportFascicoloBean> listaIndirizzo = new ArrayList<ReportFascicoloBean>();
-
-				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: "
-						+ provincia.getProvincia());
+				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: " + provincia.getProvincia());
 				listaIndirizzo.add(beanProvincia);
-				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: "
-						+ comune.getDenominazione());
+				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: " + comune.getDenominazione());
 				listaIndirizzo.add(beanComune);
-
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Località: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "localita"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Indirizzo: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "via"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Foglio: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Particelle: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Allegato: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Estremi prat. catastale: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali"));
 					listaIndirizzo.add(bean1);
 				}
-
 				parameters.put("VALUES_PRATICA_INDIRIZZO", listaIndirizzo);
-
 				// VALORE SISMICO
 				String valoreSismico1 = "Zona Sismica: " + StringPool.TAB + StringPool.TAB
 						+ BeanPropertiesUtil.getString(territorio, "zona") + StringPool.TAB + StringPool.TAB
 						+ "Fascia Pericolosità: " + StringPool.TAB + StringPool.TAB
 						+ BeanPropertiesUtil.getString(territorio, "fascia");
-
 				parameters.put("VALORE_SISMICO_1", valoreSismico1);
-
 				String valoreSismico2 = "Range Ag: " + StringPool.TAB + StringPool.TAB
-						+ (Validator.isNotNull(territorio.getAgMin()) ? territorio.getAgMin() : "") + " - "
-						+ (Validator.isNotNull(territorio.getAgMax()) ? territorio.getAgMax() : "")
-						+ StringPool.TAB + StringPool.TAB + "Valore di Ag: " + StringPool.TAB
-						+ StringPool.TAB + BeanPropertiesUtil.getString(lastDettPratica, "ag");
-
+						+ (Validator.isNull(territorio.getAgMin()) ? StringPool.BLANK : territorio.getAgMin()) + " - "
+						+ (Validator.isNull(territorio.getAgMax()) ? StringPool.BLANK : territorio.getAgMax())
+						+ StringPool.TAB + StringPool.TAB + "Valore di Ag: " + StringPool.TAB + StringPool.TAB
+						+ BeanPropertiesUtil.getString(lastDettPratica, "ag");
 				parameters.put("VALORE_SISMICO_2", valoreSismico2);
-
 				// TIPOLOGIA INTERVENTO
 				StringBuilder sbTipInt = new StringBuilder();
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "tcNuovaCostruzione")) {
 					sbTipInt.append(LanguageUtil.get(locale, "tc-nuova-costruzione"));
 				}
-
 				boolean checked = BeanPropertiesUtil.getBoolean(lastDettPratica, "tcAdeguamentoSismico")
 						|| BeanPropertiesUtil.getBoolean(lastDettPratica, "tcMiglioramentoSismico")
 						|| BeanPropertiesUtil.getBoolean(lastDettPratica, "tcRiparazioneInterventoLocale");
-
 				if (checked) {
 					if (sbTipInt.length() > 0) {
 						sbTipInt.append(StringPool.TAB + StringPool.TAB);
@@ -319,12 +263,9 @@ public class ReportFascicoloUtil {
 						sbTipInt.append(LanguageUtil.get(locale, "tc-riparazione-intervento-locale"));
 					}
 				}
-
 				parameters.put("TIPOLOGIA_INTERVENTO", sbTipInt.toString());
-
 				// TIPOLOGIA COSTRUTTIVA
 				StringBuilder sbTipCos = new StringBuilder();
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "tcInCA")) {
 					sbTipCos.append(LanguageUtil.get(locale, "tc-in-ca"));
 				}
@@ -388,157 +329,103 @@ public class ReportFascicoloUtil {
 					}
 					sbTipCos.append(LanguageUtil.get(locale, "tc-altro"));
 				}
-
 				parameters.put("TIPOLOGIA_COSTRUTTIVA", sbTipCos.toString());
-
 				// Anagrafica Soggetti
 				List<ReportFascicoloBean> listaSoggetti = new ArrayList<ReportFascicoloBean>();
-				// ADT:BUG ID=3
-				// List<Soggetto> committenti =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.COMMITTENTE);
 				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.COMMITTENTE);
-
 				for (Soggetto soggetto : committenti) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Committente: "
-							+ soggetto.getNome() + " " + soggetto.getCognome());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Committente: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome());
 					listaSoggetti.add(bean1);
 				}
-				// ADT:BUG ID=3
-				// List<Soggetto> progettisti =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.PROGETTISTA);
 				List<Soggetto> progettisti = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.PROGETTISTA);
 
 				for (Soggetto soggetto : progettisti) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Progettista: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Progettista: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-				// ADT:BUG ID=3
-				// List<Soggetto> dirLavori =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.DIRETTORE_LAVORI);
 				List<Soggetto> dirLavori = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.DIRETTORE_LAVORI);
 
 				for (Soggetto soggetto : dirLavori) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Direttore Lavori: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Direttore Lavori: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-				// ADT:BUG ID=3
-				// List<Soggetto> ditta =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.DITTA);
 				List<Soggetto> ditta = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.DITTA);
-
 				for (Soggetto soggetto : ditta) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Ditta: "
-							+ soggetto.getDenominazione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Ditta: " + soggetto.getDenominazione());
 					listaSoggetti.add(bean1);
 				}
-				// ADT:BUG ID=3
-				// List<Soggetto> gelologi =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.GEOLOGO);
 				List<Soggetto> gelologi = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.GEOLOGO);
-
 				for (Soggetto soggetto : gelologi) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Geologo: " + soggetto.getNome()
-							+ " " + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
-							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo() + ")"
-							+ " - ambito: " + soggetto.getAmbitoProfessione());
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
-				// ADT:BUG ID=3
-				// List<Soggetto> collaudo =
-				// SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
-				// TipoSoggettoUtil.COLLAUDATORE);
 				List<Soggetto> collaudo = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto(
 						lastDettPratica.getDettPraticaId(), TipoSoggettoUtil.COLLAUDATORE);
-
 				for (Soggetto soggetto : collaudo) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Collaudatore: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Collaudatore: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
 				parameters.put("ANAGRAFICA_SOGGETTI", listaSoggetti);
-
 				// ALLEGATI GEOLOGI
 				List<String> tipologiaAllegati = DocumentiPraticaUtil.getDocGeologo();
-
 				List<ReportFascicoloBean> listaAllegatiGeo = new ArrayList<ReportFascicoloBean>();
-
 				for (String stringa : tipologiaAllegati) {
-
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_Tipologia(intPraticaId,
-									lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
-									QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(
+							intPraticaId, lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
+							QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
-						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " 
-								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
-								+ StringPool.TAB + "  - num. documenti presentati: " + docPraticas.size());
+						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
+								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB
+								+ "  - num. documenti presentati: " + docPraticas.size());
 						listaAllegatiGeo.add(bean1);
 					}
 				}
-
 				parameters.put("ALLEGATI_GEOLOGICI", listaAllegatiGeo);
-
 				// ALLEGATI DOMANDA
 				List<String> tipologiaAllegatiDomanda = DocumentiPraticaUtil.getDocDomanda();
-
 				List<ReportFascicoloBean> listaAllegatiDomanda = new ArrayList<ReportFascicoloBean>();
-
 				for (String stringa : tipologiaAllegatiDomanda) {
-
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_Tipologia(intPraticaId,
-									lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
-									QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(
+							intPraticaId, lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
+							QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
 						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
-								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
-								+ StringPool.TAB + "  - num. documenti presentati: " + docPraticas.size());
+								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB
+								+ "  - num. documenti presentati: " + docPraticas.size());
 						listaAllegatiDomanda.add(bean1);
 					}
 				}
-
 				parameters.put("ALLEGATI_DOMANDA", listaAllegatiDomanda);
 			}
-
 			// PAGAMENTI
-
 			List<ReportFascicoloBean> listaPagamenti = new ArrayList<ReportFascicoloBean>();
-
-			Pagamento pagamentoOneri = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica
-					.getPagamentoIdOneri());
+			Pagamento pagamentoOneri = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica.getPagamentoIdOneri());
 			if (pagamentoOneri != null) {
 				if (pagamentoOneri.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean(
-							"- Spese Istruttoria importo totale pagato: " + pagamentoOneri.getImportoString());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Spese Istruttoria importo totale pagato: "
+							+ pagamentoOneri.getImportoString());
 					listaPagamenti.add(bean1);
 				}
 			}
-
-			Pagamento pagamentoBolli = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica
-					.getPagamentoIdBolli());
+			Pagamento pagamentoBolli = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica.getPagamentoIdBolli());
 			if (pagamentoBolli != null) {
 				if (pagamentoBolli.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Bolli importo totale pagato: "
@@ -546,133 +433,99 @@ public class ReportFascicoloUtil {
 					listaPagamenti.add(bean1);
 				}
 			}
-
 			parameters.put("PAGAMENTI", listaPagamenti);
-
 		}
-
 		return parameters;
 	}
 
-	public static Map<String, Object> generateParametersReportFascicoloVariante(long intPraticaId,
-			long dettPraticaId, Locale locale, long companyId) throws PortalException, SystemException {
+	public static Map<String, Object> generateParametersReportFascicoloVariante(long intPraticaId, long dettPraticaId,
+			Locale locale, long companyId) throws PortalException, SystemException {
 
 		Map<String, Object> parameters = new HashMap<String, Object>();
-
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 		if (intPratica != null) {
-
 			DettPratica lastDettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId);
 			// Intestazione
-
-			parameters.put("TITOLO_PRATICA", getTitlePratica(intPraticaId) + " - Variante n."
-					+ (lastDettPratica.getVarianteNumero()));
-
+			parameters.put("TITOLO_PRATICA",
+					getTitlePratica(intPraticaId) + " - Variante n." + (lastDettPratica.getVarianteNumero()));
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-			Provincia provincia = ProvinciaLocalServiceUtil
-					.fetchByC_C(companyId, comune.getCodiceProvincia());
-
+			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
 			parameters.put("SEDE_GENIO_CIVILE", provincia.getProvincia());
-
 			// Dettagli principali
 			List<ReportFascicoloBean> listaDettagliPrincipali = new ArrayList<ReportFascicoloBean>();
-
 			if (lastDettPratica != null) {
-
 				parameters.put(
 						"DESCRIZIONE_INTERVENTO",
 						"Descrizione Intervento: "
 								+ BeanPropertiesUtil.getString(lastDettPratica, "descLongIntervento"));
-				// stampa varianti ---- ADT: BUD ID=3
 				String protocollo = lastDettPratica.getProtocollo();
 				Date dataProtocollo = lastDettPratica.getDtProtocollo();
 				Avviso avviso = AvvisoLocalServiceUtil.getAvvisoVidimazione(intPraticaId,
 						lastDettPratica.getDettPraticaId());
 				if (avviso != null) {
 					protocollo = avviso.getProtocollo() != null ? avviso.getProtocollo() : protocollo;
-					dataProtocollo = avviso.getDtProtocollo() != null ? avviso.getDtProtocollo()
-							: dataProtocollo;
+					dataProtocollo = avviso.getDtProtocollo() != null ? avviso.getDtProtocollo() : dataProtocollo;
 				}
-				// ADT BUG ID = 3
 				parameters.put("PROTOCOLLO", finalizzaProtocollazione(companyId, protocollo, dataProtocollo));
-
 				if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) {
-
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr01Dep")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr01-dep"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr01-dep"));
 						listaDettagliPrincipali.add(bean);
 					}
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr02Dep")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr02-dep"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr02-dep"));
 						listaDettagliPrincipali.add(bean);
 					}
-
 				} else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) {
-
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr01Aut")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr01-aut"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr01-aut"));
 						listaDettagliPrincipali.add(bean);
 					}
 					if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDpr02Aut")) {
-						ReportFascicoloBean bean = new ReportFascicoloBean("- "
-								+ LanguageUtil.get(locale, "dp-sensi") + " "
-								+ LanguageUtil.get(locale, "norm-dpr02-aut"));
+						ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-sensi")
+								+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dpr02-aut"));
 						listaDettagliPrincipali.add(bean);
 					}
-
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm2018")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm2018"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm2018"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm01")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm01"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm01"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm02")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-rispetto") + " "
-							+ LanguageUtil.get(locale, "norm-dm02"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-rispetto")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm02"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDm03")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dm03"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dm03"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDprg01")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dprg01"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dprg01"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normDprg02")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-dprg02"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-dprg02"));
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normAnr")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "dp-normativa") + " "
-							+ LanguageUtil.get(locale, "norm-anr"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "dp-normativa")
+							+ StringPool.SPACE + LanguageUtil.get(locale, "norm-anr"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normLavoriInProprio")) {
 					ReportFascicoloBean bean = new ReportFascicoloBean("- "
 							+ LanguageUtil.get(locale, "norm-lavori-in-proprio"));
@@ -699,8 +552,7 @@ public class ReportFascicoloUtil {
 					listaDettagliPrincipali.add(bean);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normArt3com3")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "norm-art3com3"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "norm-art3com3"));
 					listaDettagliPrincipali.add(bean);
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- "
 							+ LanguageUtil.get(locale, "norm-art3com3_1"));
@@ -716,83 +568,67 @@ public class ReportFascicoloUtil {
 					listaDettagliPrincipali.add(bean4);
 				}
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "normArt3com4")) {
-					ReportFascicoloBean bean = new ReportFascicoloBean("- "
-							+ LanguageUtil.get(locale, "norm-art3com4"));
+					ReportFascicoloBean bean = new ReportFascicoloBean("- " + LanguageUtil.get(locale, "norm-art3com4"));
 					listaDettagliPrincipali.add(bean);
 				}
-
 				parameters.put("VALUES_PRATICA_PRINCIPALE", listaDettagliPrincipali);
-
 				// Dettagli indirizzo
 				List<ReportFascicoloBean> listaIndirizzo = new ArrayList<ReportFascicoloBean>();
-
-				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: "
-						+ provincia.getProvincia());
+				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: " + provincia.getProvincia());
 				listaIndirizzo.add(beanProvincia);
-				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: "
-						+ comune.getDenominazione());
+				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: " + comune.getDenominazione());
 				listaIndirizzo.add(beanComune);
-
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Località: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "localita"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Indirizzo: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "via"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Foglio: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Particelle: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Allegato: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Estremi prat. catastale: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali"));
 					listaIndirizzo.add(bean1);
 				}
-
 				parameters.put("VALUES_PRATICA_INDIRIZZO", listaIndirizzo);
-
 				// VALORE SISMICO
 				String valoreSismico1 = "Zona Sismica: " + StringPool.TAB + StringPool.TAB
 						+ BeanPropertiesUtil.getString(territorio, "zona") + StringPool.TAB + StringPool.TAB
 						+ "Fascia Pericolosità: " + StringPool.TAB + StringPool.TAB
 						+ BeanPropertiesUtil.getString(territorio, "fascia");
-
 				parameters.put("VALORE_SISMICO_1", valoreSismico1);
-
 				String valoreSismico2 = "Range Ag: " + StringPool.TAB + StringPool.TAB
-						+ (Validator.isNotNull(territorio.getAgMin()) ? territorio.getAgMin() : "") + " - "
-						+ (Validator.isNotNull(territorio.getAgMax()) ? territorio.getAgMax() : "")
-						+ StringPool.TAB + StringPool.TAB + "Valore di Ag: " + StringPool.TAB
-						+ StringPool.TAB + BeanPropertiesUtil.getString(lastDettPratica, "ag");
-
+						+ (Validator.isNull(territorio.getAgMin()) ? StringPool.BLANK : territorio.getAgMin()) + " - "
+						+ (Validator.isNull(territorio.getAgMax()) ? StringPool.BLANK : territorio.getAgMax())
+						+ StringPool.TAB + StringPool.TAB + "Valore di Ag: " + StringPool.TAB + StringPool.TAB
+						+ BeanPropertiesUtil.getString(lastDettPratica, "ag");
 				parameters.put("VALORE_SISMICO_2", valoreSismico2);
-
 				// TIPOLOGIA INTERVENTO
 				StringBuilder sbTipInt = new StringBuilder();
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "tcNuovaCostruzione")) {
 					sbTipInt.append(LanguageUtil.get(locale, "tc-nuova-costruzione"));
 				}
-
 				boolean checked = BeanPropertiesUtil.getBoolean(lastDettPratica, "tcAdeguamentoSismico")
 						|| BeanPropertiesUtil.getBoolean(lastDettPratica, "tcMiglioramentoSismico")
 						|| BeanPropertiesUtil.getBoolean(lastDettPratica, "tcRiparazioneInterventoLocale");
-
 				if (checked) {
 					if (sbTipInt.length() > 0) {
 						sbTipInt.append(StringPool.TAB + StringPool.TAB);
@@ -808,12 +644,9 @@ public class ReportFascicoloUtil {
 						sbTipInt.append(LanguageUtil.get(locale, "tc-riparazione-intervento-locale"));
 					}
 				}
-
 				parameters.put("TIPOLOGIA_INTERVENTO", sbTipInt.toString());
-
 				// TIPOLOGIA COSTRUTTIVA
 				StringBuilder sbTipCos = new StringBuilder();
-
 				if (BeanPropertiesUtil.getBoolean(lastDettPratica, "tcInCA")) {
 					sbTipCos.append(LanguageUtil.get(locale, "tc-in-ca"));
 				}
@@ -877,132 +710,101 @@ public class ReportFascicoloUtil {
 					}
 					sbTipCos.append(LanguageUtil.get(locale, "tc-altro"));
 				}
-
 				parameters.put("TIPOLOGIA_COSTRUTTIVA", sbTipCos.toString());
-
 				// Anagrafica Soggetti
 				List<ReportFascicoloBean> listaSoggetti = new ArrayList<ReportFascicoloBean>();
-
-				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.COMMITTENTE);
+				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.COMMITTENTE);
 				for (Soggetto soggetto : committenti) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Committente: "
-							+ soggetto.getNome() + " " + soggetto.getCognome());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Committente: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome());
 					listaSoggetti.add(bean1);
 				}
-
-				List<Soggetto> progettisti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.PROGETTISTA);
+				List<Soggetto> progettisti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.PROGETTISTA);
 				for (Soggetto soggetto : progettisti) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Progettista: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Progettista: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
-				List<Soggetto> dirLavori = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI);
+				List<Soggetto> dirLavori = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.DIRETTORE_LAVORI);
 				for (Soggetto soggetto : dirLavori) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Direttore Lavori: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Direttore Lavori: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
-				List<Soggetto> ditta = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.DITTA);
+				List<Soggetto> ditta = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.DITTA);
 				for (Soggetto soggetto : ditta) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Ditta: "
-							+ soggetto.getDenominazione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Ditta: " + soggetto.getDenominazione());
 					listaSoggetti.add(bean1);
 				}
-
-				List<Soggetto> gelologi = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.GEOLOGO);
+				List<Soggetto> gelologi = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.GEOLOGO);
 				for (Soggetto soggetto : gelologi) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Geologo: " + soggetto.getNome()
-							+ " " + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
-							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo() + ")"
-							+ " - ambito: " + soggetto.getAmbitoProfessione());
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
-				List<Soggetto> collaudo = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.COLLAUDATORE);
+				List<Soggetto> collaudo = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.COLLAUDATORE);
 				for (Soggetto soggetto : collaudo) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Collaudatore: "
-							+ soggetto.getNome() + " " + soggetto.getCognome() + " - albo "
-							+ soggetto.getAlbo() + " di " + soggetto.getProvinciaAlbo() + " (iscr. num. "
-							+ soggetto.getNumIscrAlbo() + ")" + " - ambito: "
-							+ soggetto.getAmbitoProfessione());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Collaudatore: " + soggetto.getNome()
+							+ StringPool.SPACE + soggetto.getCognome() + " - albo " + soggetto.getAlbo() + " di "
+							+ soggetto.getProvinciaAlbo() + " (iscr. num. " + soggetto.getNumIscrAlbo()
+							+ ") - ambito: " + soggetto.getAmbitoProfessione());
 					listaSoggetti.add(bean1);
 				}
-
 				parameters.put("ANAGRAFICA_SOGGETTI", listaSoggetti);
-
 				// ALLEGATI GEOLOGI
 				List<String> tipologiaAllegati = DocumentiPraticaUtil.getDocGeologo();
-
 				List<ReportFascicoloBean> listaAllegatiGeo = new ArrayList<ReportFascicoloBean>();
-
 				for (String stringa : tipologiaAllegati) {
-
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_Tipologia(intPraticaId,
-									lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
-									QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(
+							intPraticaId, lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
+							QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
 						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
-								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
-								+ StringPool.TAB + "  - num. documenti presentati: " + docPraticas.size());
+								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB
+								+ "  - num. documenti presentati: " + docPraticas.size());
 						listaAllegatiGeo.add(bean1);
 					}
 				}
-
 				parameters.put("ALLEGATI_GEOLOGICI", listaAllegatiGeo);
-
 				// ALLEGATI DOMANDA
 				List<String> tipologiaAllegatiDomanda = DocumentiPraticaUtil.getDocDomanda();
-
 				List<ReportFascicoloBean> listaAllegatiDomanda = new ArrayList<ReportFascicoloBean>();
-
 				for (String stringa : tipologiaAllegatiDomanda) {
-
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_Tipologia(intPraticaId,
-									lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
-									QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(
+							intPraticaId, lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS,
+							QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
 						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
-								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
-								+ StringPool.TAB + "  - num. documenti presentati: " + docPraticas.size());
+								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB
+								+ "  - num. documenti presentati: " + docPraticas.size());
 						listaAllegatiDomanda.add(bean1);
 					}
 				}
-
 				parameters.put("ALLEGATI_DOMANDA", listaAllegatiDomanda);
 			}
-
 			// PAGAMENTI
-
 			List<ReportFascicoloBean> listaPagamenti = new ArrayList<ReportFascicoloBean>();
-
-			Pagamento pagamentoOneri = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica
-					.getPagamentoIdOneri());
+			Pagamento pagamentoOneri = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica.getPagamentoIdOneri());
 			if (pagamentoOneri != null) {
 				if (pagamentoOneri.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) {
-					ReportFascicoloBean bean1 = new ReportFascicoloBean(
-							"- Spese Istruttoria importo totale pagato: " + pagamentoOneri.getImportoString());
+					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Spese Istruttoria importo totale pagato: "
+							+ pagamentoOneri.getImportoString());
 					listaPagamenti.add(bean1);
 				}
 			}
-
-			Pagamento pagamentoBolli = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica
-					.getPagamentoIdBolli());
+			Pagamento pagamentoBolli = PagamentoLocalServiceUtil.fetchPagamento(lastDettPratica.getPagamentoIdBolli());
 			if (pagamentoBolli != null) {
 				if (pagamentoBolli.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Bolli importo totale pagato: "
@@ -1010,252 +812,192 @@ public class ReportFascicoloUtil {
 					listaPagamenti.add(bean1);
 				}
 			}
-
 			parameters.put("PAGAMENTI", listaPagamenti);
-
 		}
-
 		return parameters;
 	}
 
-	public static Map<String, Object> generateParametersReportFascicoloFineLavori(long intPraticaId,
-			long fineLavoriId, Locale locale, long companyId) throws PortalException, SystemException {
+	public static Map<String, Object> generateParametersReportFascicoloFineLavori(long intPraticaId, long fineLavoriId,
+			Locale locale, long companyId) throws PortalException, SystemException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
 		Map<String, Object> parameters = new HashMap<String, Object>();
-
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 		if (intPratica != null) {
-
 			// Intestazione
-
 			parameters.put("TITOLO_PRATICA", getTitlePratica(intPraticaId));
-
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-			Provincia provincia = ProvinciaLocalServiceUtil
-					.fetchByC_C(companyId, comune.getCodiceProvincia());
-
+			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
 			parameters.put("SEDE_GENIO_CIVILE", provincia.getProvincia());
-
-			// ADT BUG FE ID = 8
 			DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica
 					.getIntPraticaId());
 			if (lastDettPratica == null) {
 				lastDettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId);
 			}
-
 			Soggetto direttore = null;
 			List<Soggetto> direttori = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId,
 					lastDettPratica.getCodiceFiscaleDelegatoFineLavori());
 			if (!direttori.isEmpty()) {
 				direttore = direttori.get(0);
 			}
-			parameters.put("DICHIARAZIONE_FL_DL", MessageFormat.format(
-					LanguageUtil.get(Locale.ITALIAN, "fl-dichiaraz-direttore"), direttore.getNome(),
-					direttore.getCognome()));
+			parameters.put(
+					"DICHIARAZIONE_FL_DL",
+					MessageFormat.format(LanguageUtil.get(Locale.ITALIAN, "fl-dichiaraz-direttore"),
+							direttore.getNome(), direttore.getCognome()));
 
 			FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(fineLavoriId);
 			if (fineLavori != null) {
-
 				if (fineLavori.isParziale()) {
 					parameters.put("TIPO_FINE_LAVORI", "Parziale");
 				} else {
 					parameters.put("TIPO_FINE_LAVORI", "Totale");
 				}
-				// ADT BUG FE ID=8
-				parameters.put(
-						"PROTOCOLLO",
-						finalizzaProtocollazione(companyId, fineLavori.getProtocollo(),
-								fineLavori.getDtProtocollo()));
+				parameters.put("PROTOCOLLO",
+						finalizzaProtocollazione(companyId, fineLavori.getProtocollo(), fineLavori.getDtProtocollo()));
 				parameters.put("DICHIARAZIONE_DL", fineLavori.getComunicazioneDirettoreLavori());
 				parameters.put("DATA_INVIO_FINE_LAVORI", sdf.format(fineLavori.getDataEffettuazione()));
 				parameters.put("DATA_FINE_LAVORI", sdf.format(fineLavori.getDataFineLavori()));
 			}
-
 			if (lastDettPratica != null) {
-
 				parameters.put("PROVINCIA", provincia.getProvincia());
 				parameters.put("COMUNE", comune.getDenominazione());
-
 				parameters.put("ZONA_SISMICA", BeanPropertiesUtil.getString(territorio, "zona"));
 				parameters.put("RANGE_AG",
-						(Validator.isNotNull(territorio.getAgMin()) ? territorio.getAgMin() : "") + " - "
-								+ (Validator.isNotNull(territorio.getAgMax()) ? territorio.getAgMax() : ""));
+						(Validator.isNull(territorio.getAgMin()) ? StringPool.BLANK : territorio.getAgMin()) + " - "
+								+ (Validator.isNull(territorio.getAgMax()) ? StringPool.BLANK : territorio.getAgMax()));
 				parameters.put("FASCIA_PERICOLOSITA", BeanPropertiesUtil.getString(territorio, "fascia"));
-
 				parameters.put("DESCRIZIONE_INTERVENTO",
 						BeanPropertiesUtil.getString(lastDettPratica, "descLongIntervento"));
-
 				// Dettagli indirizzo
 				List<ReportFascicoloBean> listaIndirizzo = new ArrayList<ReportFascicoloBean>();
-
-				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: "
-						+ provincia.getProvincia());
+				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: " + provincia.getProvincia());
 				listaIndirizzo.add(beanProvincia);
-				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: "
-						+ comune.getDenominazione());
+				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: " + comune.getDenominazione());
 				listaIndirizzo.add(beanComune);
-
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Località: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "localita"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Indirizzo: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "via"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Foglio: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Particelle: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Allegato: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Estremi prat. catastale: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali"));
 					listaIndirizzo.add(bean1);
 				}
-
 				parameters.put("VALUES_PRATICA_INDIRIZZO", listaIndirizzo);
-
 				Soggetto direttoreLavori = null;
-				List<Soggetto> direttoriLavori = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(
-						intPraticaId, lastDettPratica.getCodiceFiscaleDelegatoFineLavori());
+				List<Soggetto> direttoriLavori = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId,
+						lastDettPratica.getCodiceFiscaleDelegatoFineLavori());
 				if (!direttoriLavori.isEmpty()) {
 					direttoreLavori = direttoriLavori.get(0);
 				}
-
 				StringBuilder sbLavori = new StringBuilder();
 				if (direttoreLavori != null) {
-					if (!direttoreLavori.getAlbo().equals("")
-							&& !direttoreLavori.getProvinciaAlbo().equals("")) {
+					if (!direttoreLavori.getAlbo().isEmpty() && !direttoreLavori.getProvinciaAlbo().isEmpty()) {
 						sbLavori.append(" - albo " + direttoreLavori.getAlbo());
 
-						if (!direttoreLavori.getProvinciaAlbo().equals("")) {
+						if (!direttoreLavori.getProvinciaAlbo().isEmpty()) {
 							sbLavori.append(" di " + direttoreLavori.getProvinciaAlbo());
 						}
 					}
-
-					if (!direttoreLavori.getNumIscrAlbo().equals("")) {
-						sbLavori.append(" (iscr. num. " + direttoreLavori.getNumIscrAlbo() + ")");
+					if (!direttoreLavori.getNumIscrAlbo().isEmpty()) {
+						sbLavori.append(" (iscr. num. " + direttoreLavori.getNumIscrAlbo()
+								+ StringPool.CLOSE_PARENTHESIS);
 					}
-
-					if (!direttoreLavori.getAmbitoProfessione().equals("")) {
+					if (!direttoreLavori.getAmbitoProfessione().isEmpty()) {
 						sbLavori.append(" - ambito: " + direttoreLavori.getAmbitoProfessione());
 					}
 				}
-
-				parameters.put("DIRETTORE_LAVORI",
-						direttoreLavori.getNome() + " " + direttoreLavori.getCognome() + sbLavori.toString());
-
+				parameters.put(
+						"DIRETTORE_LAVORI",
+						direttoreLavori.getNome() + StringPool.SPACE + direttoreLavori.getCognome()
+								+ sbLavori.toString());
 				StringBuilder sb = new StringBuilder();
-				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.COMMITTENTE);
+				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.COMMITTENTE);
 				if (!committenti.isEmpty()) {
 					for (Soggetto soggetto : committenti) {
 						if (sb.length() > 0) {
 							sb.append(" , ");
 						}
-						sb.append(soggetto.getNome() + " " + soggetto.getCognome());
+						sb.append(soggetto.getNome() + StringPool.SPACE + soggetto.getCognome());
 					}
 				}
-
 				parameters.put("COMMITTENTE", sb.toString());
-
-				parameters.put("TIPO_PRATICA",
-						LanguageUtil.get(locale, "tipo-pratica-" + intPratica.getTipoPratica()));
-
-				List<DettPratica> listasDett = DettPraticaLocalServiceUtil
-						.findCompletedByIntPraticaAndTipoPratica(
-								intPraticaId,
-								Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIANTE,
+				parameters.put("TIPO_PRATICA", LanguageUtil.get(locale, "tipo-pratica-" + intPratica.getTipoPratica()));
+				List<DettPratica> listasDett = DettPraticaLocalServiceUtil.findCompletedByIntPraticaAndTipoPratica(
+						intPraticaId, Arrays
+								.asList(new String[] { TipoIntegrazioneUtil.VARIANTE,
 										TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE,
 										TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO }));
-
 				List<ReportFascicoloBean> listaDettBeans = new ArrayList<ReportFascicoloBean>();
-
 				for (DettPratica dett : listasDett) {
 					if (dett.getDataEffettuazione() != null) {
-						ReportFascicoloBean bean1 = new ReportFascicoloBean(
-								"- "
-										+ sdf.format(dett.getDataEffettuazione())
-										+ " "
-										+ LanguageUtil.get(locale,
-												"label-integrazione-" + dett.getTipoIntegrazione()));
+						ReportFascicoloBean bean1 = new ReportFascicoloBean("- "
+								+ sdf.format(dett.getDataEffettuazione()) + StringPool.SPACE
+								+ LanguageUtil.get(locale, "label-integrazione-" + dett.getTipoIntegrazione()));
 						listaDettBeans.add(bean1);
 					}
 
 				}
-
 				parameters.put("INTEGRAZIONI_VARIANTI", listaDettBeans);
-
 				// ALLEGATI DOMANDA
 				List<String> tipologiaAllegatiDomanda = DocumentiPraticaUtil.getDocFineLavori();
-
-				parameters.put("FIRMA_DIRETTORE", MessageFormat.format(
-						LanguageUtil.get(Locale.ITALIAN, "fl-firma-direttore"), direttoreLavori.getNome(),
-						direttoreLavori.getCognome(), direttoreLavori.getCodiceFiscale()));
-
+				parameters.put(
+						"FIRMA_DIRETTORE",
+						MessageFormat.format(LanguageUtil.get(Locale.ITALIAN, "fl-firma-direttore"),
+								direttoreLavori.getNome(), direttoreLavori.getCognome(),
+								direttoreLavori.getCodiceFiscale()));
 				List<ReportFascicoloBean> listaAllegatiDomanda = new ArrayList<ReportFascicoloBean>();
-
-				// ADT BUG FE ID = 8
 				for (String stringa : tipologiaAllegatiDomanda) {
-
-					// ADT BUG FE ID = 13
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_TipologiaNew(intPraticaId, fineLavoriId, stringa,
-									QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_TipologiaNew(
+							intPraticaId, fineLavoriId, stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
 						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
 								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
 								+ "  -  documenti presentati: ");
 						listaAllegatiDomanda.add(bean1);
-
 						for (DocPratica docPratica : docPraticas) {
-							ReportFascicoloBean bean1desc = new ReportFascicoloBean("    - "
-									+ docPratica.getDescLong());
+							ReportFascicoloBean bean1desc = new ReportFascicoloBean("    - " + docPratica.getDescLong());
 							listaAllegatiDomanda.add(bean1desc);
-
 						}
-
 					}
 				}
-
 				parameters.put("ALLEGATI_DOMANDA", listaAllegatiDomanda);
-
 				List<ReportFascicoloBean> pagamentiList = new ArrayList<ReportFascicoloBean>();
-
-				// ADT BUG FE ID = 8
 				if (fineLavori.isNormEsenteBollo()) {
-
-					ReportFascicoloBean bean1 = new ReportFascicoloBean(LanguageUtil.get(locale,
-							"fl-esente-bollo"));
+					ReportFascicoloBean bean1 = new ReportFascicoloBean(LanguageUtil.get(locale, "fl-esente-bollo"));
 					pagamentiList.add(bean1);
-
 				} else {
-
 					ClassLoader classLoader = (ClassLoader) PortletBeanLocatorUtil.locate(
 							ClpSerializer.getServletContextName(), "portletClassLoader");
-
 					DynamicQuery query = DynamicQueryFactoryUtil.forClass(Pagamento.class, classLoader);
 					query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 					query.add(RestrictionsFactoryUtil.eq("classPk", fineLavoriId));
 					query.add(RestrictionsFactoryUtil.eq("className", FineLavori.class.getName()));
 					query.add(RestrictionsFactoryUtil.eq("utilizzata", "04"));
-
+					@SuppressWarnings("unchecked")
 					List<Pagamento> pagamenti = PagamentoLocalServiceUtil.dynamicQuery(query);
 					if (pagamenti != null) {
 						for (Pagamento pagamento : pagamenti) {
@@ -1265,246 +1007,186 @@ public class ReportFascicoloUtil {
 									+ " Mezzo di Pagamento: IRIS " + StringPool.TAB + " Importo Bolli: "
 									+ pagamento.getImportoString());
 							pagamentiList.add(bean1);
-
 						}
 					}
-
 				}
-
 				parameters.put("PAGAMENTI", pagamentiList);
 			}
-
 		}
-
 		return parameters;
 	}
 
-	public static Map<String, Object> generateParametersReportFascicoloCollaudo(long intPraticaId,
-			long collaudoId, Locale locale, long companyId) throws PortalException, SystemException {
+	public static Map<String, Object> generateParametersReportFascicoloCollaudo(long intPraticaId, long collaudoId,
+			Locale locale, long companyId) throws PortalException, SystemException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
 		Map<String, Object> parameters = new HashMap<String, Object>();
-
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 		if (intPratica != null) {
-
 			// Intestazione
-
 			parameters.put("TITOLO_PRATICA", getTitlePratica(intPraticaId));
-
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-			Provincia provincia = ProvinciaLocalServiceUtil
-					.fetchByC_C(companyId, comune.getCodiceProvincia());
-
+			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
 			parameters.put("SEDE_GENIO_CIVILE", provincia.getProvincia());
-
 			Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(collaudoId);
 			if (collaudo != null) {
-
 				if (collaudo.isParziale()) {
 					parameters.put("TIPO_FINE_LAVORI", "Parziale");
 				} else {
 					parameters.put("TIPO_FINE_LAVORI", "Totale");
 				}
-
 				parameters.put("DATA_FINE_LAVORI", sdf.format(collaudo.getDataEffettuazione()));
-				// ADT BUG FE ID = 19
 				parameters.put("DATA_EFFETTUAZIONE_COLLAUDO", sdf.format(collaudo.getDataCollaudo()));
-				parameters.put(
-						"PROTOCOLLO",
-						finalizzaProtocollazione(companyId, collaudo.getProtocollo(),
-								collaudo.getDtProtocollo()));
-
+				parameters.put("PROTOCOLLO",
+						finalizzaProtocollazione(companyId, collaudo.getProtocollo(), collaudo.getDtProtocollo()));
 			}
-
 			DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica
 					.getIntPraticaId());
-
 			if (lastDettPratica != null) {
-
 				parameters.put("PROVINCIA", provincia.getProvincia());
 				parameters.put("COMUNE", comune.getDenominazione());
-
 				parameters.put("ZONA_SISMICA", BeanPropertiesUtil.getString(territorio, "zona"));
 				parameters.put("RANGE_AG",
-						(Validator.isNotNull(territorio.getAgMin()) ? territorio.getAgMin() : "") + " - "
-								+ (Validator.isNotNull(territorio.getAgMax()) ? territorio.getAgMax() : ""));
+						(Validator.isNull(territorio.getAgMin()) ? StringPool.BLANK : territorio.getAgMin()) + " - "
+								+ (Validator.isNull(territorio.getAgMax()) ? StringPool.BLANK : territorio.getAgMax()));
 				parameters.put("FASCIA_PERICOLOSITA", BeanPropertiesUtil.getString(territorio, "fascia"));
-
 				parameters.put("DESCRIZIONE_INTERVENTO",
 						BeanPropertiesUtil.getString(lastDettPratica, "descLongIntervento"));
-
 				// Dettagli indirizzo
 				List<ReportFascicoloBean> listaIndirizzo = new ArrayList<ReportFascicoloBean>();
-
-				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: "
-						+ provincia.getProvincia());
+				ReportFascicoloBean beanProvincia = new ReportFascicoloBean("- Provincia: " + provincia.getProvincia());
 				listaIndirizzo.add(beanProvincia);
-				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: "
-						+ comune.getDenominazione());
+				ReportFascicoloBean beanComune = new ReportFascicoloBean("- Comune: " + comune.getDenominazione());
 				listaIndirizzo.add(beanComune);
-
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "localita").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Località: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "localita"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "via").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Indirizzo: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "via"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Foglio: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcFoglio"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Particelle: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcParticelle"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Allegato: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "dcAllegato"));
 					listaIndirizzo.add(bean1);
 				}
-				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").equals("")) {
+				if (!BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali").isEmpty()) {
 					ReportFascicoloBean bean1 = new ReportFascicoloBean("- Estremi prat. catastale: "
 							+ BeanPropertiesUtil.getString(lastDettPratica, "estremiCatastali"));
 					listaIndirizzo.add(bean1);
 				}
-
 				parameters.put("VALUES_PRATICA_INDIRIZZO", listaIndirizzo);
-
 				Soggetto direttoreLavori = null;
-				List<Soggetto> collaudatore = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(
-						intPraticaId, lastDettPratica.getCodiceFiscaleDelegatoCollaudo());
+				List<Soggetto> collaudatore = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId,
+						lastDettPratica.getCodiceFiscaleDelegatoCollaudo());
 				if (!collaudatore.isEmpty()) {
 					direttoreLavori = collaudatore.get(0);
 				}
-
 				StringBuilder sbLavori = new StringBuilder();
 				if (direttoreLavori != null) {
-					if (!direttoreLavori.getAlbo().equals("")
-							&& !direttoreLavori.getProvinciaAlbo().equals("")) {
+					if (!direttoreLavori.getAlbo().isEmpty() && !direttoreLavori.getProvinciaAlbo().isEmpty()) {
 						sbLavori.append(" - albo " + direttoreLavori.getAlbo());
-
-						if (!direttoreLavori.getProvinciaAlbo().equals("")) {
+						if (!direttoreLavori.getProvinciaAlbo().isEmpty()) {
 							sbLavori.append(" di " + direttoreLavori.getProvinciaAlbo());
 						}
 					}
-
-					if (!direttoreLavori.getNumIscrAlbo().equals("")) {
-						sbLavori.append(" (iscr. num. " + direttoreLavori.getNumIscrAlbo() + ")");
+					if (!direttoreLavori.getNumIscrAlbo().isEmpty()) {
+						sbLavori.append(" (iscr. num. " + direttoreLavori.getNumIscrAlbo()
+								+ StringPool.CLOSE_PARENTHESIS);
 					}
-
-					if (!direttoreLavori.getAmbitoProfessione().equals("")) {
+					if (!direttoreLavori.getAmbitoProfessione().isEmpty()) {
 						sbLavori.append(" - ambito: " + direttoreLavori.getAmbitoProfessione());
 					}
 				}
-
-				parameters.put("DIRETTORE_LAVORI",
-						direttoreLavori.getNome() + " " + direttoreLavori.getCognome() + sbLavori.toString());
-
+				parameters.put(
+						"DIRETTORE_LAVORI",
+						direttoreLavori.getNome() + StringPool.SPACE + direttoreLavori.getCognome()
+								+ sbLavori.toString());
 				StringBuilder sb = new StringBuilder();
-				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(
-						intPraticaId, TipoSoggettoUtil.COMMITTENTE);
+				List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPraticaId,
+						TipoSoggettoUtil.COMMITTENTE);
 				if (!committenti.isEmpty()) {
 					for (Soggetto soggetto : committenti) {
 						if (sb.length() > 0) {
 							sb.append(" , ");
 						}
-						sb.append(soggetto.getNome() + " " + soggetto.getCognome());
+						sb.append(soggetto.getNome() + StringPool.SPACE + soggetto.getCognome());
 					}
 				}
-
 				parameters.put("COMMITTENTE", sb.toString());
-
-				parameters.put("TIPO_PRATICA",
-						LanguageUtil.get(locale, "tipo-pratica-" + intPratica.getTipoPratica()));
-
-				List<DettPratica> listasDett = DettPraticaLocalServiceUtil
-						.findCompletedByIntPraticaAndTipoPratica(
-								intPraticaId,
-								Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIANTE,
+				parameters.put("TIPO_PRATICA", LanguageUtil.get(locale, "tipo-pratica-" + intPratica.getTipoPratica()));
+				List<DettPratica> listasDett = DettPraticaLocalServiceUtil.findCompletedByIntPraticaAndTipoPratica(
+						intPraticaId, Arrays
+								.asList(new String[] { TipoIntegrazioneUtil.VARIANTE,
 										TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE,
 										TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO }));
-
 				List<ReportFascicoloBean> listaDettBeans = new ArrayList<ReportFascicoloBean>();
-
 				for (DettPratica dett : listasDett) {
 					if (dett.getDataEffettuazione() != null) {
-						ReportFascicoloBean bean1 = new ReportFascicoloBean(
-								"- "
-										+ sdf.format(dett.getDataEffettuazione())
-										+ " "
-										+ LanguageUtil.get(locale,
-												"label-integrazione-" + dett.getTipoIntegrazione()));
+						ReportFascicoloBean bean1 = new ReportFascicoloBean("- "
+								+ sdf.format(dett.getDataEffettuazione()) + StringPool.SPACE
+								+ LanguageUtil.get(locale, "label-integrazione-" + dett.getTipoIntegrazione()));
 						listaDettBeans.add(bean1);
 					}
-
 				}
-
 				List<FineLavori> listaFine = FineLavoriLocalServiceUtil.findByIntPraticaId(intPraticaId,
 						QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 				for (FineLavori fineLavoriApp : listaFine) {
 					if (fineLavoriApp.getDataEffettuazione() != null) {
-						String stringaPlus = "";
+						String stringaPlus = StringPool.BLANK;
 						if (fineLavoriApp.isParziale()) {
 							stringaPlus = "Fine Lavori Parziale";
 						} else {
 							stringaPlus = "Fine Lavori Totale";
 						}
 						ReportFascicoloBean bean1 = new ReportFascicoloBean("- "
-								+ sdf.format(fineLavoriApp.getDataEffettuazione()) + " " + stringaPlus);
+								+ sdf.format(fineLavoriApp.getDataEffettuazione()) + StringPool.SPACE + stringaPlus);
 						listaDettBeans.add(bean1);
 					}
 				}
-
 				parameters.put("INTEGRAZIONI_VARIANTI", listaDettBeans);
-
 				// ALLEGATI DOMANDA
 				List<String> tipologiaAllegatiDomanda = DocumentiPraticaUtil.getDocCollaudo();
-
 				List<ReportFascicoloBean> listaAllegatiDomanda = new ArrayList<ReportFascicoloBean>();
-
 				for (String stringa : tipologiaAllegatiDomanda) {
 					// BUG ADDT FE: allegati al collaudo
-					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
-							.findByIntPratica_ClassPk_Tipologia(intPraticaId, collaudoId, stringa,
-									QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+					List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(
+							intPraticaId, collaudoId, stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 					if (docPraticas != null && !docPraticas.isEmpty()) {
 						ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - "
-								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa)
-								+ StringPool.TAB + "  - num. documenti presentati: " + docPraticas.size());
+								+ LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB
+								+ "  - num. documenti presentati: " + docPraticas.size());
 						listaAllegatiDomanda.add(bean1);
 					}
 				}
-
 				parameters.put("ALLEGATI_DOMANDA", listaAllegatiDomanda);
-
 				List<ReportFascicoloBean> pagamentiList = new ArrayList<ReportFascicoloBean>();
-
 				if (collaudo.isNormEsenteBollo()) {
-
-					ReportFascicoloBean bean1 = new ReportFascicoloBean(LanguageUtil.get(locale,
-							"fl-esente-bollo"));
+					ReportFascicoloBean bean1 = new ReportFascicoloBean(LanguageUtil.get(locale, "fl-esente-bollo"));
 					pagamentiList.add(bean1);
-
 				} else {
-
 					ClassLoader classLoader = (ClassLoader) PortletBeanLocatorUtil.locate(
 							ClpSerializer.getServletContextName(), "portletClassLoader");
-
 					DynamicQuery query = DynamicQueryFactoryUtil.forClass(Pagamento.class, classLoader);
 					query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 					query.add(RestrictionsFactoryUtil.eq("classPk", collaudoId));
 					query.add(RestrictionsFactoryUtil.eq("className", Collaudo.class.getName()));
 					query.add(RestrictionsFactoryUtil.eq("utilizzata", "04"));
-
+					@SuppressWarnings("unchecked")
 					List<Pagamento> pagamenti = PagamentoLocalServiceUtil.dynamicQuery(query);
 					if (pagamenti != null) {
 						for (Pagamento pagamento : pagamenti) {
@@ -1514,18 +1196,12 @@ public class ReportFascicoloUtil {
 									+ " Mezzo di Pagamento: IRIS " + StringPool.TAB + " Importo Bolli: "
 									+ pagamento.getImportoString());
 							pagamentiList.add(bean1);
-
 						}
 					}
-
 				}
-
 				parameters.put("PAGAMENTI", pagamentiList);
-
 			}
-
 		}
-
 		return parameters;
 	}
 
@@ -1541,29 +1217,21 @@ public class ReportFascicoloUtil {
 			sb.append("Autorizzazione ");
 		}
 		sb.append("n. ");
-
 		sb.append(intPratica.getNumeroProgetto());
-
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		// TODO da decidere che data, per adesso si mette quella di creazione il
-		// numero protocollo
-		// sbagliato dovrebbe essere il primo
+		// TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato dovrebbe
+		// essere il primo
 		sb.append(" del ");
 		sb.append(sdf.format(intPratica.getDtPratica()));
-
 		return sb.toString();
 	}
 
-	// ADT BUG ID = 3
 	private static String finalizzaProtocollazione(long companyId, String protocollo, Date dtProtocollo)
 			throws SystemException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
 		Company company = CompanyLocalServiceUtil.fetchCompany(companyId);
-
 		StringBuilder sb = new StringBuilder();
-
 		sb.append((String) company.getExpandoBridge().getAttribute(
 				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, false));
 		sb.append(StringPool.SLASH);
@@ -1571,12 +1239,9 @@ public class ReportFascicoloUtil {
 		sb.append(StringPool.SLASH);
 		sb.append((String) company.getExpandoBridge().getAttribute(
 				Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, false));
-
 		sb.append(" del ");
 		if (dtProtocollo != null)
 			sb.append(sdf.format(dtProtocollo));
-
 		return sb.toString();
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp
index 47fd2e79..d7ef5543 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp
@@ -24,36 +24,25 @@
 <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%>
 <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%>
 <%@page import="it.tref.liferay.portos.bo.service.DocPraticaServiceUtil"%>
-<%@page import="it.tref.liferay.portos.fe.util.PortletKeys"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
-<%@page import="com.liferay.portal.kernel.util.HttpUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
-<%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@page import="it.tref.liferay.portos.bo.service.persistence.SoggettoUtil"%>
-
 <%@page import="java.util.ArrayList"%>
 <%@ include file="/html/soggettipratica/init.jsp"%>
-
 <%
-String comingFrom = ParamUtil.getString(
-	request,
-	"comingFrom",
-	GetterUtil.getString(PortalUtil.getOriginalServletRequest(request).getParameter("comingFrom"), "page_allegati")
-);
+String comingFrom = ParamUtil.getString(request, "comingFrom", GetterUtil.getString(PortalUtil
+		.getOriginalServletRequest(request).getParameter("comingFrom"), "page_allegati"));
 boolean comingFromGeologica = comingFrom.equalsIgnoreCase("page_geologica");
 boolean comingFromAllegati = comingFrom.equalsIgnoreCase("page_allegati");
 boolean comingFromFineLavori = comingFrom.equalsIgnoreCase("page_fine_lavori");
 boolean comingFromCollaudo = comingFrom.equalsIgnoreCase("page_collaudo");
-		
 long classPk = ParamUtil.getLong(request, "classPk");
 String className = ParamUtil.getString(request, "className");
 boolean isDettPratica = DettPratica.class.getName().equalsIgnoreCase(className);
 boolean isFineLavori = FineLavori.class.getName().equalsIgnoreCase(className);
 boolean isCollaudo = Collaudo.class.getName().equalsIgnoreCase(className);
 long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
-
 boolean praticaIsEditable = false;
 if (isFineLavori) {
 	FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(classPk);
@@ -83,29 +72,27 @@ Map<String, String> cfNome = new HashMap<String, String>();
 for (Soggetto soggetto : SoggettoLocalServiceUtil.findByIntPratica(intPraticaId)) {
 	cfNome.put(soggetto.getCodiceFiscale(), soggetto.getNome() + StringPool.SPACE + soggetto.getCognome());
 }
-Map<Long, DettPratica> dettPraticas = new HashMap<Long, DettPratica>();	
-
+Map<Long, DettPratica> dettPraticas = new HashMap<Long, DettPratica>();
 boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
 boolean disabled = ParamUtil.getBoolean(request, "disabled");
-	
 IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
 Soggetto soggettoDelegato = null;
-
 boolean disabledInput = true;
 boolean canSignGeoDocs = false;
 if (Validator.isNotNull(request.getParameter("disabled"))) {
 	disabledInput = disabled;
 } else if (comingFromAllegati) {
-	Boolean hasDelegaCompilazioneDomanda = (Boolean) SessionUtil.getDettPraticaObject(request, classPk, "hasDelegaCompilazioneDomanda");
+	Boolean hasDelegaCompilazioneDomanda = (Boolean) SessionUtil.getDettPraticaObject(request, classPk,
+			"hasDelegaCompilazioneDomanda");
 	if (null == hasDelegaCompilazioneDomanda) {
-		hasDelegaCompilazioneDomanda = DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(),classPk);
+		hasDelegaCompilazioneDomanda = DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(), classPk);
 	}
 	disabledInput = !hasDelegaCompilazioneDomanda
-			&& !DelegheUtil.hasDelegaFirmaAllegati(user.getUserId(),classPk);		
-	soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(classPk);		
+			&& !DelegheUtil.hasDelegaFirmaAllegati(user.getUserId(), classPk);
+	soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(classPk);
 } else if (comingFromGeologica) {
-	disabledInput = !DelegheUtil.hasDelegaCompilazioneSezioneGeologica(user.getUserId(),classPk);
-	soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneSezioneGeologica(classPk);	   		
+	disabledInput = !DelegheUtil.hasDelegaCompilazioneSezioneGeologica(user.getUserId(), classPk);
+	soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneSezioneGeologica(classPk);
 	canSignGeoDocs = true;
 } else if (comingFromFineLavori) {
 	disabledInput = disabled;
@@ -113,7 +100,6 @@ if (Validator.isNotNull(request.getParameter("disabled"))) {
 	disabledInput = disabled;
 }
 %>
-
 <c:if test="<%= isDettPratica %>">
 	<liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%=application%>">
 		<liferay-util:param name="disabledInput" value="<%= String.valueOf(disabledInput) %>" />
@@ -122,7 +108,6 @@ if (Validator.isNotNull(request.getParameter("disabled"))) {
 		</c:if>
 	</liferay-util:include>
 </c:if>
-
 <liferay-portlet:renderURL var="addAllegato" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 	<liferay-portlet:param name="mvcPath" value="/html/allegatipratica/edit_allegato.jsp" />
 	<liferay-portlet:param name="backURL" value="<%= currentURL %>" />
@@ -140,7 +125,6 @@ String refresh = "Liferay.fire('allegati-" + comingFrom + "-open');Liferay.Portl
 	<liferay-portlet:param name="classPk" value="<%= String.valueOf(classPk) %>" />
 	<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
 </liferay-portlet:resourceURL>
-
 <div class="navbar-container header_allegati_table">
 	<c:if test="<%= !inBO %>">
 		<c:choose>
@@ -157,11 +141,13 @@ String refresh = "Liferay.fire('allegati-" + comingFrom + "-open');Liferay.Portl
 			cssClass="inline_toolbar">
 			<c:if test="<%= !inBO %>">
 				<c:if test="<%= !disabledInput %>">
-					<aui:button useDialog="true" value="add-allegato" id='<%= renderResponse.getNamespace() + "add-allegato" %>'
-						icon="fa fa-plus" href="<%= addAllegato %>" cssClass="btn btn-primary btn-action" />
+					<aui:button useDialog="true" value="add-allegato" id='<%= renderResponse.getNamespace()
+							+ "add-allegato" %>' icon="fa fa-plus" href="<%= addAllegato %>"
+							cssClass="btn btn-primary btn-action" />
 				</c:if>
 				<aui:button value="Aggiorna Dati" id='<%= renderResponse.getNamespace() + "aggiorna-allegato" %>'
-					icon="fa fa-refresh" type="button" onClick="<%= refresh %>" cssClass="btn btn-primary btn-action" />
+						icon="fa fa-refresh" type="button" onClick="<%= refresh %>"
+						cssClass="btn btn-primary btn-action" />
 			</c:if>
 			<span class="tooltip-info" title="Download Allegati"> <aui:button
 					id='<%= renderResponse.getNamespace() + "download_all" %>' icon="fa fa-download"
@@ -170,8 +156,7 @@ String refresh = "Liferay.fire('allegati-" + comingFrom + "-open');Liferay.Portl
 		</liferay-ui:icon-menu>
 	</div>
 </div>
-<div class='separator <%= inBO ? "hidden" : "" %>'></div>
-
+<div class='separator <%= inBO ? "hidden" : StringPool.BLANK %>'></div>
 <%
 List<String> tipologiaAllegati = new ArrayList<String>();
 if (comingFromGeologica) {
@@ -184,254 +169,249 @@ if (comingFromGeologica) {
 	tipologiaAllegati = DocumentiPraticaUtil.getDocCollaudo();
 }
 %>
-
 <div class="container-fluid clearfix " id="<portlet:namespace/>allegati-table">
-	<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 asseverazioni allegati_table">
-		<c:if test="<%=!inBO%>">
+	<div class="col-xs-12 asseverazioni allegati_table">
+		<c:if test="<%= !inBO %>">
 			<div class='row asseverazioni-header'>
-				<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 asserazioni-header-title">
+				<div class="col-xs-12 asserazioni-header-title">
 					<div class='row asseverazion-header-row' style="display: flex; align-items: center">
-						<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 txt-bold text-uppercase">Descrizione</div>
-						<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 txt-bold text-uppercase">Aggiunto da</div>
-						<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 txt-bold text-uppercase">Rimosso da</div>
-						<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 txt-bold text-center">
+						<div class="col-xs-4 txt-bold text-uppercase">Descrizione</div>
+						<div class="col-xs-2 txt-bold text-uppercase">Aggiunto da</div>
+						<div class="col-xs-2 txt-bold text-uppercase">Rimosso da</div>
+						<div class="col-xs-2 txt-bold text-center">
 							<span class="text-uppercase asseverazion-header-top-row">Firme</span>
 							<div class='row'>
-								<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">Presenti</div>
-								<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">Le tue firme</div>
+								<div class="col-xs-6">Presenti</div>
+								<div class="col-xs-6">Le tue firme</div>
 							</div>
 						</div>
-						<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 text-center text-uppercase txt-bold">Azioni</div>
+						<div class="col-xs-2 text-center text-uppercase txt-bold">Azioni</div>
 					</div>
 				</div>
 			</div>
 		</c:if>
-		<c:if test="<%=inBO%>">
+		<c:if test="<%= inBO %>">
 			<c:if test='<%= !comingFromGeologica %>'>
 				<div class='row asseverazioni-header'>
-					<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">Descrizione</div>
-					<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 asserazioni-header-title">Firme presenti</div>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">Azioni</div>
+					<div class="col-xs-6">Descrizione</div>
+					<div class="col-xs-4 asserazioni-header-title">Firme presenti</div>
+					<div class="col-xs-2">Azioni</div>
 				</div>
 			</c:if>
 			<c:if test='<%= comingFromGeologica %>'>
 				<div class='row asseverazioni-header'>
-					<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">Descrizione</div>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 asserazioni-header-title">Provenienza</div>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 asserazioni-header-title">Firme presenti</div>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">Azioni</div>
+					<div class="col-xs-6">Descrizione</div>
+					<div class="col-xs-2 asserazioni-header-title">Provenienza</div>
+					<div class="col-xs-2 asserazioni-header-title">Firme presenti</div>
+					<div class="col-xs-2">Azioni</div>
 				</div>
 			</c:if>
-
-
 		</c:if>
-
 <%
 for (String codiceDoc : tipologiaAllegati) {
 	List<DocPratica> docPraticas = null;
-
 	if (isFineLavori || isCollaudo) {
-		docPraticas = DocPraticaServiceUtil.findByClassPk_Tipologia(classPk, codiceDoc, QueryUtil.ALL_POS,QueryUtil.ALL_POS);
+		docPraticas = DocPraticaServiceUtil.findByClassPk_Tipologia(classPk, codiceDoc, QueryUtil.ALL_POS,
+				QueryUtil.ALL_POS);
 	} else {
-		docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId, classPk, codiceDoc, QueryUtil.ALL_POS,QueryUtil.ALL_POS);
+		docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId, classPk, codiceDoc,
+				QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 	}
 	String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc);
 %>
 		<div class="allegati_wrapper row">
 			<span class='num_allegati <%=docPraticas.size()>0 ? "green" : "orange"%>'><%=docPraticas.size()%></span>
-			<liferay-ui:panel extended="false" defaultState="close" collapsible="true"
-				title='<%= nomeAllegato %>' id='<%=codiceDoc+"_panel_allegati_"+comingFrom%>'
-				persistState="true">
+			<liferay-ui:panel extended="false" defaultState="close" collapsible="true" title='<%= nomeAllegato %>'
+					id='<%=codiceDoc+"_panel_allegati_"+comingFrom%>' persistState="true">
 				<%
-					if (docPraticas.isEmpty()) {
+				if (docPraticas.isEmpty()) {
 				%>
 				<div class="nome_file">
-					<div class="col-xs-8  col-sm-8 col-md-8 col-lg-8 nessun_allegato">Nessun allegato presente per la
+					<div class="col-xs-8 nessun_allegato">Nessun allegato presente per la
 						tipologia</div>
 				</div>
 				<%
-					} else {
-						for (DocPratica docPratica : docPraticas) {
- 							FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
-
-							StringBuilder title = new StringBuilder();
-							String cssIcon = StringPool.BLANK;
-							String cssColor = StringPool.BLANK;
-							String testoFirme = "Non ci sono firme sul file";
-							if (firme.getFirmeDigitali().size() > 0) { 
-								cssIcon = "fa-check";
-								cssColor = "txt-green";
-								testoFirme = StringPool.BLANK;
-							} else if (docPratica.getStatus() == 1) {
-								cssIcon= "fa-cog fa-spin";
-								cssColor = "txt-orange";
-								testoFirme = "Estrazione firme in corso";			
-							} else if (docPratica.getStatus() == 4) {
-								cssIcon= "fa-alert";
-								cssColor = "txt-red";
-								testoFirme = "Errore nell'estrazione delle firme";
-							} else {
-								cssIcon = "fa-close";
-								testoFirme = "Nessuna firma digitale rilevata";
-								if (firme.numeroFirme() > 0) {
-									cssColor= "txt-green";
-								}
-							}
+				} else {
+					for (DocPratica docPratica : docPraticas) {
+						FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
+						StringBuilder title = new StringBuilder();
+						String cssIcon = StringPool.BLANK;
+						String cssColor = StringPool.BLANK;
+						String testoFirme = "Non ci sono firme sul file";
+						if (firme.getFirmeDigitali().size() > 0) {
+							cssIcon = "fa-check";
+							cssColor = "txt-green";
+							testoFirme = StringPool.BLANK;
+						} else if (docPratica.getStatus() == WorkflowConstants.STATUS_PENDING) {
+							cssIcon= "fa-cog fa-spin";
+							cssColor = "txt-orange";
+							testoFirme = "Estrazione firme in corso";
+						} else if (docPratica.getStatus() == WorkflowConstants.STATUS_DENIED) {
+							cssIcon= "fa-alert";
+							cssColor = "txt-red";
+							testoFirme = "Errore nell'estrazione delle firme";
+						} else {
+							cssIcon = "fa-close";
+							testoFirme = "Nessuna firma digitale rilevata";
 							if (firme.numeroFirme() > 0) {
-								cssIcon = "fa-check";
+								cssColor= "txt-green";
 							}
-							title.append("Firma sul file:<ul>");
-							title.append("<li>" + testoFirme + "</li>");
-							if (!firme.getFirmeDigitali().isEmpty()) {
-								for (FirmeDetail firma: firme.getFirmeDigitali()) {
-									if (cfNome.containsKey(firma.getCfFirmatario())) {
-							    		title.append("<li>" + cfNome.get(firma.getCfFirmatario()) + "</li>");
-							    	}
-							       	title.append("<li>" + firma.getCfFirmatario());
-									if (Validator.isNotNull(firma.getDtFirma())) {
-										title.append(" del " + dateFormatDate.format(firma.getDtFirma()));  
-									}
-							       	title.append("</li>");
+						}
+						if (firme.numeroFirme() > 0) {
+							cssIcon = "fa-check";
+						}
+						title.append("Firma sul file:<ul><li>").append(testoFirme).append("</li>");
+						if (!firme.getFirmeDigitali().isEmpty()) {
+							for (FirmeDetail firma: firme.getFirmeDigitali()) {
+								if (cfNome.containsKey(firma.getCfFirmatario())) {
+									title.append("<li>").append(cfNome.get(firma.getCfFirmatario()))
+											.append("</li>");
+								}
+								title.append("<li>").append(firma.getCfFirmatario());
+								if (Validator.isNotNull(firma.getDtFirma())) {
+									title.append(" del ").append(dateFormatDate.format(firma.getDtFirma()));
 								}
+								title.append("</li>");
 							}
-							title.append("</ul>");
-							if (!firme.getFirmeApplicativo().isEmpty()) {
-								title.append("Firme da applicativo:<ul>");
-								for (FirmeDetail firma: firme.getFirmeApplicativo()) {
-									if (cfNome.containsKey(firma.getCfFirmatario())) {
-							    		title.append("<li>" + cfNome.get(firma.getCfFirmatario()) + "</li>");
-							    	}
-									title.append("<li>"+firma.getCfFirmatario());
-									if (Validator.isNotNull(firma.getDtFirma())) {
-										title.append(" del "+dateFormatDate.format(firma.getDtFirma()));  
-									}
-									title.append("</li>");
+						}
+						title.append("</ul>");
+						if (!firme.getFirmeApplicativo().isEmpty()) {
+							title.append("Firme da applicativo:<ul>");
+							for (FirmeDetail firma: firme.getFirmeApplicativo()) {
+								if (cfNome.containsKey(firma.getCfFirmatario())) {
+									title.append("<li>").append(cfNome.get(firma.getCfFirmatario()))
+											.append("</li>");
 								}
-								title.append("</ul>");
+								title.append("<li>").append(firma.getCfFirmatario());
+								if (Validator.isNotNull(firma.getDtFirma())) {
+									title.append(" del ").append(dateFormatDate.format(firma.getDtFirma()));
+								}
+								title.append("</li>");
 							}
-				%>
+							title.append("</ul>");
+						}
+					%>
 				<div class="nome_file">
 					<c:if test="<%=!inBO%>">
-						<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+						<div class="col-xs-4">
 					</c:if>
 					<c:if test="<%=inBO%>">
-						<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
+						<div class="col-xs-6">
 					</c:if>
 					<%
-						String color = "txt-red";
- 						if (Validator.isNull(docPratica.getDettPraticaIdRimozione())) {
-							color = "txt-green";
-						}
+					String color = "txt-red";
+					if (Validator.isNull(docPratica.getDettPraticaIdRimozione())) {
+						color = "txt-green";
+					}
 					%>
 					<i class="fa fa-circle file-icon <%= color %>" aria-hidden="true"></i>
 					<%= docPratica.getDescLong() %>
 				</div>
-
-				<div class='col-xs-2 col-sm-2 col-md-2 col-lg-2 <%=inBO ? "hidden" : ""%> asserazioni-body-title'>
+				<div class='col-xs-2 <%=inBO ? "hidden" : ""%> asserazioni-body-title'>
 					<%
- 						if (isFineLavori) {
-							FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica.getClassPk());
-							if (fineLavori != null) {
-								out.print(fineLavori.getFullDescription());
-							}
-						} else if (isCollaudo) {
-							Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk());
-							if (collaudo != null) {
-								out.print(collaudo.getFullDescription());
-							}
-						} else {
-							long pk = docPratica.getClassPk();
-							if (!dettPraticas.containsKey(pk)) {
-								dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
-							}
-							DettPratica dettPratica = dettPraticas.get(pk);
-							if (Validator.isNotNull(dettPratica)) {
-								out.print(dettPratica.getFullDescription());
-							}
+					if (isFineLavori) {
+						FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica.getClassPk());
+						if (fineLavori != null) {
+							out.print(fineLavori.getFullDescription());
+						}
+					} else if (isCollaudo) {
+						Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk());
+						if (collaudo != null) {
+							out.print(collaudo.getFullDescription());
+						}
+					} else {
+						long pk = docPratica.getClassPk();
+						if (!dettPraticas.containsKey(pk)) {
+							dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
+						}
+						DettPratica dettPratica = dettPraticas.get(pk);
+						if (Validator.isNotNull(dettPratica)) {
+							out.print(dettPratica.getFullDescription());
 						}
+					}
 					%>
 				</div>
-
-				<div class='col-xs-2 col-sm-2 col-md-2 col-lg-2 <%= inBO ? "hidden" : "" %> asserazioni-body-title'>
+				<div class='col-xs-2 <%= inBO ? "hidden" : "" %> asserazioni-body-title'>
 					<%
-						//Lasciato solo dettpratica perche' fine lavori e collaudo non possono rimuovere gli allegati
- 						long pk = docPratica.getDettPraticaIdRimozione();
-						if (0 != pk) {
-							if (!dettPraticas.containsKey(pk)) {
-								dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
-							}
-							DettPratica dettPratica = dettPraticas.get(pk);
-							if (Validator.isNotNull(dettPratica)) {
-								out.print(dettPratica.getFullDescription());
-							}
+					//Lasciato solo dettpratica perche' fine lavori e collaudo non possono rimuovere gli allegati
+					long pk = docPratica.getDettPraticaIdRimozione();
+					if (0 != pk) {
+						if (!dettPraticas.containsKey(pk)) {
+							dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
+						}
+						DettPratica dettPratica = dettPraticas.get(pk);
+						if (Validator.isNotNull(dettPratica)) {
+							out.print(dettPratica.getFullDescription());
 						}
+					}
 					%>
 				</div>
-
 				<c:if test='<%= inBO && comingFromGeologica %>'>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+					<div class="col-xs-2">
 						<span>
 						<%
-   							if (isDettPratica) {
-  								pk = docPratica.getClassPk();
-  								if (!dettPraticas.containsKey(pk)) {
-  									dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
-  								}
-  								DettPratica dett = dettPraticas.get(pk);
-								if (Validator.isNotNull(dett)) {
-									if (dett.getIntegrazione() == 0) {
-										out.print("Pratica Originale");
-									} else {
-										if (dett.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) {
-											out.print("Ric Integrazione # " + dett.getIntegrazione());
-										} else if (dett.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) {
-											out.print("Variante # " + dett.getVarianteNumero());
-										}
+						if (isDettPratica) {
+							pk = docPratica.getClassPk();
+							if (!dettPraticas.containsKey(pk)) {
+								dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk));
+							}
+							DettPratica dett = dettPraticas.get(pk);
+							if (Validator.isNotNull(dett)) {
+								if (dett.getIntegrazione() == 0) {
+									out.print("Pratica Originale");
+								} else {
+									if (dett.getTipoIntegrazione().equals(TipoIntegrazioneUtil
+											.RICHIESTA_INTEGRAZIONE)) {
+										out.print("Ric Integrazione # ");
+										out.print(dett.getIntegrazione());
+									} else if (dett.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) {
+										out.print("Variante # ");
+										out.print(dett.getVarianteNumero());
 									}
 								}
 							}
- 						%>
+						}
+						%>
 						</span>
 					</div>
 				</c:if>
-
 				<c:if test='<%= inBO %>'>
 					<c:choose>
 						<c:when test='<%= comingFromGeologica %>'>
-							<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 asserazioni-body-title text-center">
+							<div class="col-xs-2 asserazioni-body-title text-center">
 						</c:when>
 						<c:otherwise>
-							<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 asserazioni-body-title text-center">
+							<div class="col-xs-4 asserazioni-body-title text-center">
 						</c:otherwise>
 					</c:choose>
 				</c:if>
-
 				<c:if test='<%= !inBO %>'>
-					<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 asserazioni-body-title text-center">
+					<div class="col-xs-2 asserazioni-body-title text-center">
 				</c:if>
-
-				<div class='<%= inBO ? "col-xs-12 col-sm-12 col-md-12 col-lg-12" : "col-xs-6 col-sm-6 col-md-6 col-lg-6" %>'>
- 					<span class='<%="fa "+cssIcon+" asseverazioni-icon tooltip-info "+cssColor%>' title="<%=title%>">
- 						<c:if test="<%= firme.numeroFirme() > 0 %>">
+				<div class='<%= inBO ? "col-xs-12" : "col-xs-6" %>'>
+					<span class='<%="fa "+cssIcon+" asseverazioni-icon tooltip-info "+cssColor%>' title="<%=title%>">
+						<c:if test="<%= firme.numeroFirme() > 0 %>">
 							<sub class="txt-bold"><%= firme.numeroFirme() %></sub>
 						</c:if>
 					</span>
 				</div>
-				<div class='col-xs-6 col-sm-6 col-md-6 col-lg-6 <%=inBO ? "hidden" : ""%>'>
- 					<c:choose>
+				<div class='col-xs-6 <%=inBO ? "hidden" : ""%>'>
+					<c:choose>
 						<c:when test="<%= (firme.firmaIsPresent(user.getScreenName())) %>">
-							<span class="fa fa-check asseverazioni-icon tooltip-info txt-green" title="La tua firma è presente"></span>
+							<span class="fa fa-check asseverazioni-icon tooltip-info txt-green"
+									title="La tua firma è presente"></span>
 						</c:when>
 						<c:otherwise>
-							<span class="fa fa-close asseverazioni-icon tooltip-info txt-red" title="La tua firma non è presente"></span>
+							<span class="fa fa-close asseverazioni-icon tooltip-info txt-red"
+									title="La tua firma non è presente"></span>
 						</c:otherwise>
 					</c:choose>
 				</div>
 		</div>
-		<div class='col-xs-2 col-sm-2 col-md-2 col-lg-2 asserazioni-btn text-center'>
- 			<c:choose>
-				<c:when
-					test="<%= Validator.isNull(docPratica.getDlFileEntryId()) && Validator.isNotNull(docPratica.getOldDlFileEntryId()) %>">
+		<div class='col-xs-2 asserazioni-btn text-center'>
+			<c:choose>
+				<c:when test="<%= Validator.isNull(docPratica.getDlFileEntryId()) && Validator.isNotNull(docPratica
+						.getOldDlFileEntryId()) %>">
 					<liferay-util:include page="/html/common/import_window.jsp" servletContext="<%= application %>"
 						portletId="<%= PortletKeys.FASCICOLO %>">
 						<liferay-util:param name="classPK" value="<%= String.valueOf(docPratica.getDocPraticaId()) %>" />
@@ -440,64 +420,47 @@ for (String codiceDoc : tipologiaAllegati) {
 					</liferay-util:include>
 				</c:when>
 				<c:otherwise>
- 					<c:if test="<%= !inBO && !disabledInput || canSignGeoDocs %>">
- 						<%@ include file="/html/allegatipratica/allegati_action.jspf" %>
- 						<%-- <liferay-util:include page="/html/allegatipratica/allegati_action.jsp"
-							servletContext="<%= application %>">
-							<liferay-util:param name="backUrl" value="<%= currentURL %>" />
-							<liferay-util:param name="comingFrom" value="<%= comingFrom %>" />
-							<liferay-util:param name="classPk" value="<%= String.valueOf(classPk) %>" />
-							<liferay-util:param name="className" value="<%= className %>" />
-							<liferay-util:param name="docPraticaId" value="<%= String.valueOf(docPratica.getDocPraticaId()) %>" />
-							<liferay-util:param name="disabledInput" value="<%= String.valueOf(disabledInput) %>" />
-						</liferay-util:include> --%>
+					<c:if test="<%= !inBO && !disabledInput || canSignGeoDocs %>">
+						<%@ include file="/html/allegatipratica/allegati_action.jspf" %>
 					</c:if>
 					<c:if test="<%= inBO %>">
 						<liferay-portlet:renderURL var="previewURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 							<liferay-portlet:param name="fileEntryId" value="<%= String.valueOf(docPratica.getDlFileEntryId()) %>" />
 							<liferay-portlet:param name="mvcPath" value="/html/common/preview_file_entry.jsp" />
 						</liferay-portlet:renderURL>
-
-						<liferay-ui:icon id='<%="open_" + docPratica.getDocPraticaId() %>' linkCssClass="btn btn-action"
-							iconCssClass="fa fa-clipboard" message="Visualizza" url="<%= previewURL %>" useDialog="true" />
-						<liferay-ui:icon id='<%="download_"+ docPratica.getDocPraticaId() %>' linkCssClass="btn btn-action"
-							iconCssClass="fa fa-download" message="Download" url="<%= docPratica.getDownloadUrl(themeDisplay) %>" />
+						<liferay-ui:icon id='<%="open_" + docPratica.getDocPraticaId() %>'
+								linkCssClass="btn btn-action" iconCssClass="fa fa-clipboard" message="Visualizza"
+								url="<%= previewURL %>" useDialog="true" />
+						<liferay-ui:icon id='<%="download_"+ docPratica.getDocPraticaId() %>'
+								linkCssClass="btn btn-action" iconCssClass="fa fa-download" message="Download"
+								url="<%= docPratica.getDownloadUrl(themeDisplay) %>" />
 					</c:if>
 				</c:otherwise>
 			</c:choose>
 		</div>
 	</div>
-
 	<%
 		}
-			}
+	}
 	%>
 	</liferay-ui:panel>
 </div>
 <%
-	}
+}
 %>
 </div>
 </div>
-
-
 <script type="text/javascript">
-	YUI().use(
-		  'aui-tooltip',
-		  function(Y) {
-		    new Y.TooltipDelegate(
-		      {
-		    	  trigger: '.tooltip-info',
-			      position: 'top',
-			      cssClass: 'tooltip-help',
-			      html: true,
-			      opacity: 1
-		      }
-		    );
-		  }
-		);
+YUI().use('aui-tooltip', function(Y) {
+	new Y.TooltipDelegate({
+		trigger: '.tooltip-info',
+		position: 'top',
+		cssClass: 'tooltip-help',
+		html: true,
+		opacity: 1,
+	});
+});
 </script>
-
 <aui:script use="aui-base">
 	Liferay.fire('allegati-<%=comingFrom%>-ready');
-</aui:script>
\ No newline at end of file
+</aui:script>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp
index d4b9cd7b..c2d4284e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp
@@ -1,281 +1,259 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalService"%>
+<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%>
+<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
+<%@page import="it.tref.liferay.portos.bo.model.Collaudo"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.DocPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.FineLavori"%>
 <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
 <%@page import="it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.CollaudoServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.FineLavoriServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.Collaudo"%>
-<%@page import="it.tref.liferay.portos.bo.model.FineLavori"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.DocPraticaServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.DocPratica"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.FineLavoriServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%>
 <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeDetail"%>
-<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%>
-<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%>
-<%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil"%>
-<%@page import="java.text.DateFormat"%>
-<%@page import="javax.swing.text.html.parser.DocumentParser"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%>
-<%@page import="java.util.List"%>
-<%@page import="java.util.ArrayList"%>
-<%@page import="java.util.Comparator"%>
-<%@page import="java.util.Collections"%>
-<%@page import="javax.portlet.PortletURL"%>
-
-<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="java.util.ArrayList"%>
-<%@page import="java.io.Serializable"%>
-<%@page import="javax.portlet.PortletURL"%>
-<%@page import="java.util.LinkedHashMap"%>
-<%@page import="java.util.Map.Entry"%>
-
-<%@ include file="/html/allegatipratica/init.jsp"%>
-
-<%
-	String comingFrom = ParamUtil.getString(request,"comingFrom",
-	    GetterUtil.getString(
-	        	PortalUtil.getOriginalServletRequest(request).getParameter("page_allegati"),
-	        	"page_allegati")
-	    );
-    //ADT BUG BO ID = 17 commento riga comingFrom 
-	//comingFrom = "page_geologica";
-	long classPk = ParamUtil.getLong(request, "classPk");
-	String className = ParamUtil.getString(request, "className");
-	long intPraticaId= 0l;	
-	
-	if(FineLavori.class.getName().equalsIgnoreCase(className)){
-	  FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(classPk);
-	  intPraticaId = fineLavori.getIntPraticaId();
-	} else if(Collaudo.class.getName().equalsIgnoreCase(className)){
-	  Collaudo collaudo = CollaudoServiceUtil.getCollaudo(classPk);
-	  intPraticaId = collaudo.getIntPraticaId();
-	}else{
-	  DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPk);
-	  intPraticaId = dettPratica.getIntPraticaId();
-	}
-
-	String tipoAllegati = ParamUtil.getString(request,"tipoAllegati","allegati");
-	boolean fullVersion = ParamUtil.getBoolean(request,"full", false);
-
-	IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-%>
-
+<%@include file="/html/allegatipratica/init.jsp"%>
 <%
-	String type = StringPool.BLANK;
-	List<String> tipologiaAllegati ;
-	if("allegati_geologici".equals(tipoAllegati)){
-	  tipologiaAllegati = DocumentiPraticaUtil.getDocGeologo();
-	  type="ag";
-	}else if("allegati_fine_lavori".equals(tipoAllegati)){
-		tipologiaAllegati = DocumentiPraticaUtil.getDocFineLavori();
-		type="afl";
-	}else if("allegati_collaudo".equals(tipoAllegati)){
-		tipologiaAllegati = DocumentiPraticaUtil.getDocCollaudo();
-		type="acl";
-	}
-	else{
-	  tipologiaAllegati = DocumentiPraticaUtil.getDocDomanda();
-	  //BUG BO ID=9 (ANNULLA ISTANZA)
-	  tipologiaAllegati.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO);
-	  type="ad";
-	}
+String comingFrom = ParamUtil.getString(request, "comingFrom", GetterUtil.getString(PortalUtil
+		.getOriginalServletRequest(request).getParameter("page_allegati"), "page_allegati"));
+long classPk = ParamUtil.getLong(request, "classPk");
+String className = ParamUtil.getString(request, "className");
+long intPraticaId = 0;
+if (FineLavori.class.getName().equalsIgnoreCase(className)) {
+	FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(classPk);
+	intPraticaId = fineLavori.getIntPraticaId();
+} else if (Collaudo.class.getName().equalsIgnoreCase(className)) {
+	Collaudo collaudo = CollaudoServiceUtil.getCollaudo(classPk);
+	intPraticaId = collaudo.getIntPraticaId();
+} else {
+	DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPk);
+	intPraticaId = dettPratica.getIntPraticaId();
+}
+String tipoAllegati = ParamUtil.getString(request, "tipoAllegati", "allegati");
+boolean fullVersion = ParamUtil.getBoolean(request, "full", false);
+IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+String type = StringPool.BLANK;
+List<String> tipologiaAllegati;
+if ("allegati_geologici".equals(tipoAllegati)) {
+	tipologiaAllegati = DocumentiPraticaUtil.getDocGeologo();
+	type = "ag";
+} else if ("allegati_fine_lavori".equals(tipoAllegati)) {
+	tipologiaAllegati = DocumentiPraticaUtil.getDocFineLavori();
+	type = "afl";
+} else if ("allegati_collaudo".equals(tipoAllegati)) {
+	tipologiaAllegati = DocumentiPraticaUtil.getDocCollaudo();
+	type = "acl";
+} else {
+	tipologiaAllegati = new ArrayList<String>(DocumentiPraticaUtil.getDocDomanda());
+	tipologiaAllegati.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO);
+	type = "ad";
+}
 %>
 <liferay-portlet:resourceURL portletName="4_WAR_portosfeportlet" var="downloadAllURLs"
 	id="downloadAllDocPraticas">
-	<liferay-portlet:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId())%>" />
-	<liferay-portlet:param name="classPk" value="<%=String.valueOf(classPk)%>" />
-	<liferay-portlet:param name="comingFrom" value="<%=comingFrom%>" />
-	<liferay-portlet:param name="type" value="<%=type%>" />
+	<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
+	<liferay-portlet:param name="classPk" value="<%= String.valueOf(classPk) %>" />
+	<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
+	<liferay-portlet:param name="type" value="<%= type %>" />
 </liferay-portlet:resourceURL>
 
 <div class="container_btn_all_allegati padding_bottom">
-	<liferay-ui:icon-menu showWhenSingleIcon="<%=false%>" extended="false" showExpanded="true"
+	<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
 		cssClass="inline_toolbar">
 		<span class="tooltip-info" title="Download Allegati"> <aui:button
-				id='<%=renderResponse.getNamespace()+"download_all"%>' icon="fa fa-download"
-				cssClass="btn btn-primary btn-action" href="<%=downloadAllURLs%>" />
+				id='<%= renderResponse.getNamespace() + "download_all" %>' icon="fa fa-download"
+				cssClass="btn btn-primary btn-action" href="<%= downloadAllURLs %>" />
 		</span>
 	</liferay-ui:icon-menu>
 </div>
 <%
-	for(String codiceDoc:tipologiaAllegati){
-	  List<DocPratica> docPraticas;
-	  if(fullVersion){
-		/* docPraticas = DocPraticaServiceUtil.findByIntPratica_Tipologia(dettPratica.getIntPraticaId(),codiceDoc,QueryUtil.ALL_POS,QueryUtil.ALL_POS, null); */
-		docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId,classPk, codiceDoc,QueryUtil.ALL_POS,QueryUtil.ALL_POS);
-	  } else {
-	    docPraticas = DocPraticaServiceUtil.getValidUntilClassPkByIntPratica(intPraticaId, classPk, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
-	  }
-	  String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc);
+for (String codiceDoc:tipologiaAllegati) {
+	List<DocPratica> docPraticas;
+	if (fullVersion) {
+		docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId, classPk, codiceDoc,
+				QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+	} else {
+		docPraticas = DocPraticaServiceUtil.getValidUntilClassPkByIntPratica(intPraticaId, classPk, codiceDoc,
+				QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+	}
+	String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-" + codiceDoc);
 %>
-<div class="panel-group allegato-group">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<a class="collapse_a" data-toggle="collapse" href="#collapse-<%=codiceDoc%>_<%=type%>">
-				<h4 class="panel-title allegato-group__title">
-					<liferay-ui:message key='<%= nomeAllegato %>' />
-				</h4> <span class='num_allegati <%=docPraticas.size()>0 ? "green" : "red"%>'><%=docPraticas.size()%></span>
-			</a>
-		</div>
-		<div id="collapse-<%=codiceDoc%>_<%=type%>" class="panel-collapse collapse lfr-search-container">
-			<%
-				if(!docPraticas.isEmpty()){
-			%>
-
-			<table class="table table-striped allegati-tipologia-table"
-				id="<portlet:namespace/>allegati-table-<%=codiceDoc%>">
-				<thead class="table-columns allegato-group__head">
-					<tr>
-						<th class="text-center">STATO</th>
-						<th>ALLEGATO</th>
-						<th class="text-center">FIRME</th>
-						<%-- <% if(!comingFrom.equals("page_va_allegati") && !comingFrom.equals("page_in_allegati") ) { %> --%>
-						<th>AGGIUNTO DA</th>
-						<th>INVALIDATO DA</th>
-						<%-- <% } %> --%>
-						<th class="text-center">AZIONI</th>
-					</tr>
-				</thead>
-				<tbody class="allegato-group__body">
-					<%
-						for(DocPratica docPratica:docPraticas){
-									long docPraticaId = docPratica.getDocPraticaId();
-					%>
-					<tr>
-						<td class="text-center"><span
-							class='fa fa-circle <%=Validator.isNull(docPratica.getDtDataRimozione()) ? "txt-green" : "txt-red"%>'></span>
-						</td>
-						<td><%=docPratica.getFileName()%></td>
-						<td class="text-center">
-							<%
+	<div class="panel-group allegato-group">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<a class="collapse_a" data-toggle="collapse" href="#collapse-<%= codiceDoc %>_<%= type %>">
+					<h4 class="panel-title allegato-group__title">
+						<liferay-ui:message key='<%= nomeAllegato %>' />
+					</h4>
+					<span class='num_allegati <%= docPraticas.size() > 0 ? "green" : "red"%>'>
+						<%= docPraticas.size() %>
+					</span>
+				</a>
+			</div>
+			<div id="collapse-<%=codiceDoc%>_<%=type%>" class="panel-collapse collapse lfr-search-container">
+				<%
+				if (!docPraticas.isEmpty()) {
+				%>
+				<table class="table table-striped allegati-tipologia-table"
+						id="<portlet:namespace/>allegati-table-<%= codiceDoc %>">
+					<thead class="table-columns allegato-group__head">
+						<tr>
+							<th class="text-center">STATO</th>
+							<th>ALLEGATO</th>
+							<th class="text-center">FIRME</th>
+							<th>AGGIUNTO DA</th>
+							<th>INVALIDATO DA</th>
+							<th class="text-center">AZIONI</th>
+						</tr>
+					</thead>
+					<tbody class="allegato-group__body">
+						<%
+						for (DocPratica docPratica:docPraticas) {
+							long docPraticaId = docPratica.getDocPraticaId();
+						%>
+						<tr>
+							<td class="text-center"><span
+								class='fa fa-circle <%= Validator.isNull(docPratica.getDtDataRimozione()) ? "txt-green"
+										: "txt-red" %>'></span>
+							</td>
+							<td><%= docPratica.getFileName() %></td>
+							<td class="text-center">
+								<%
 								FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
-										      		StringBuilder title = new StringBuilder();
-												  	if(firme.numeroFirme()>0){
-												    	if(!firme.getFirmeDigitali().isEmpty()){
-													      title.append("Firma sul file:<ul>");
-													      for(FirmeDetail firma: firme.getFirmeDigitali()){
-													        title.append("<li>"+firma.getCfFirmatario());
-													        if(Validator.isNotNull(firma.getDtFirma())){
-													          title.append(" del "+dateFormatDate.format(firma.getDtFirma()));  
-													        }
-													        title.append("</li>");
-													      }
-													      title.append("</ul>");
-													    }
-													    if(!firme.getFirmeApplicativo().isEmpty()){
-													      title.append("Firme da applicativo:<ul>");
-													      for(FirmeDetail firma: firme.getFirmeApplicativo()){
-													        title.append("<li>"+firma.getCfFirmatario());
-													        if(Validator.isNotNull(firma.getDtFirma())){
-													          title.append(" del "+dateFormatDate.format(firma.getDtFirma()));  
-													        }
-													        title.append("</li>");
-													      }
-													      title.append("</ul>");
-													    }
-												  	}
-													if(firme.numeroFirme()>0){
-							%> <span class="fa fa-check icon-asseverazioni tooltip-info" title="<%=title.toString()%>"
-							style="color: green"> <sub style="font-weight: bold"><%=firme.numeroFirme()%></sub>
-						</span> <%
- 	}else{
- %> <span class="fa fa-close icon-asseverazioni tooltip-info" title="Non ci sono firme sul file"
-							style="color: red"></span> <%
- 	}
- %>
-						</td>
-						<%-- <% if(!comingFrom.equals("page_va_allegati") && !comingFrom.equals("page_in_allegati") ) { %> --%>
-						<td>
-							<%
-								String description = StringPool.BLANK;
-								
-											      		if(DettPratica.class.getName().equalsIgnoreCase(docPratica.getClassName())){
-											      			DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk());
-											      			if(adding!=null){
-											      				description = adding.getFullDescription() ;
-											      			}
-											      		}else if(FineLavori.class.getName().equalsIgnoreCase(docPratica.getClassName())){
-												      		FineLavori adding = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica.getClassPk());
-											      			if(adding!=null){
-											      				description = adding.getFullDescription() ;
-											      			}
-											      		}else if(Collaudo.class.getName().equalsIgnoreCase(docPratica.getClassName())){
-												      		Collaudo adding = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk());
-											      			if(adding!=null){
-											      				description = adding.getFullDescription() ;
-											      			}
-											      		}
-											      		
-										      			out.print(description);
-							%>
-						</td>
-						<td>
-							<%
-								DettPratica removing = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getDettPraticaIdRimozione());
-											      		if(removing != null){
-							%> <%=removing.getFullDescription()%> <%
- 	}
- %>
-						</td>
-						<%-- <%
-								}					      		
-							%> --%>
-
-
-						<td class="text-center action-col"><c:choose>
-								<c:when test="<%=Validator.isNotNull(docPratica.getDlFileEntryId())%>">
-									<liferay-portlet:renderURL var="previewURL" windowState="<%=LiferayWindowState.POP_UP.toString()%>">
-										<liferay-portlet:param name="fileEntryId"
-											value="<%=String.valueOf(docPratica.getDlFileEntryId())%>" />
-										<liferay-portlet:param name="mvcPath" value="/html/common/preview_file_entry.jsp" />
-									</liferay-portlet:renderURL>
-
-									<liferay-ui:icon id='<%="open_"+docPraticaId%>' linkCssClass="btn btn-action"
-										iconCssClass="fa fa-clipboard" message="Visualizza" url="<%=previewURL%>" useDialog="true" />
-									<liferay-ui:icon id='<%="download_"+docPraticaId%>' linkCssClass="btn btn-action"
-										iconCssClass="fa fa-download" message="Download" url="<%=docPratica.getDownloadUrl(themeDisplay)%>" />
-								</c:when>
-								<c:otherwise>
-									<liferay-util:include page="/html/common/import_window.jsp" servletContext="<%=application%>"
-										portletId="<%=PortletKeys.FASCICOLO%>">
-										<liferay-util:param name="classPK" value="<%=String.valueOf(docPratica.getDocPraticaId())%>" />
-										<liferay-util:param name="classNAME" value="<%=DocPratica.class.getName()%>" />
-										<liferay-util:param name="message" value="Download" />
-									</liferay-util:include>
-								</c:otherwise>
-							</c:choose></td>
-					</tr>
-					<%
+								StringBuilder title = new StringBuilder();
+								if (firme.numeroFirme() > 0) {
+									if (!firme.getFirmeDigitali().isEmpty()) {
+										title.append("Firma sul file:<ul>");
+										for (FirmeDetail firma: firme.getFirmeDigitali()) {
+											title.append("<li>").append(firma.getCfFirmatario());
+											if (Validator.isNotNull(firma.getDtFirma())) {
+												title.append(" del ").append(dateFormatDate.format(firma
+														.getDtFirma()));
+											}
+											title.append("</li>");
+										}
+										title.append("</ul>");
+									}
+									if (!firme.getFirmeApplicativo().isEmpty()) {
+										title.append("Firme da applicativo:<ul>");
+										for (FirmeDetail firma: firme.getFirmeApplicativo()) {
+											title.append("<li>").append(firma.getCfFirmatario());
+											if (Validator.isNotNull(firma.getDtFirma())) {
+												title.append(" del ").append(dateFormatDate.format(firma
+														.getDtFirma()));
+											}
+											title.append("</li>");
+										}
+										title.append("</ul>");
+									}
+								%>
+									<span class="fa fa-check icon-asseverazioni tooltip-info" style="color: green"
+											title="<%= title.toString() %>">
+										<sub style="font-weight: bold"><%= firme.numeroFirme() %></sub>
+									</span>
+								<%
+								} else {
+	 							%>
+	 								<span class="fa fa-close icon-asseverazioni tooltip-info" style="color: red"
+	 										title="Non ci sono firme sul file"></span>
+	 							<%
+								}
+	 							%>
+							</td>
+							<td>
+								<%
+								if (DettPratica.class.getName().equalsIgnoreCase(docPratica.getClassName())) {
+									DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica
+											.getClassPk());
+									if (adding != null) {
+										out.print(adding.getFullDescription());
+									}
+								} else if (FineLavori.class.getName().equalsIgnoreCase(docPratica.getClassName())) {
+									FineLavori adding = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica
+											.getClassPk());
+									if (adding != null) {
+										out.print(adding.getFullDescription());
+									}
+								}else if (Collaudo.class.getName().equalsIgnoreCase(docPratica.getClassName())) {
+									Collaudo adding = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk());
+									if (adding != null) {
+										out.print(adding.getFullDescription());
+									}
+								}
+								%>
+							</td>
+							<td>
+								<%
+								DettPratica removing = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica
+										.getDettPraticaIdRimozione());
+								if (removing != null) {
+								%>
+								<%= removing.getFullDescription() %>
+								<%
+								}
+	 							%>
+							</td>
+							<td class="text-center action-col">
+								<c:choose>
+									<c:when test="<%= Validator.isNotNull(docPratica.getDlFileEntryId()) %>">
+										<liferay-portlet:renderURL var="previewURL"
+												windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+											<liferay-portlet:param name="fileEntryId"
+													value="<%= String.valueOf(docPratica.getDlFileEntryId()) %>" />
+											<liferay-portlet:param name="mvcPath"
+													value="/html/common/preview_file_entry.jsp" />
+										</liferay-portlet:renderURL>
+										<liferay-ui:icon id='<%= "open_" + docPraticaId %>'
+												linkCssClass="btn btn-action" iconCssClass="fa fa-clipboard"
+												message="Visualizza" url="<%= previewURL %>" useDialog="true" />
+										<liferay-ui:icon id='<%= "download_" + docPraticaId %>'
+												linkCssClass="btn btn-action" iconCssClass="fa fa-download"
+												message="Download"
+												url="<%= docPratica.getDownloadUrl(themeDisplay) %>" />
+									</c:when>
+									<c:otherwise>
+										<liferay-util:include page="/html/common/import_window.jsp"
+												servletContext="<%= application %>"
+												portletId="<%=PortletKeys.FASCICOLO%>">
+											<liferay-util:param name="classPK"
+													value="<%= String.valueOf(docPratica.getDocPraticaId()) %>" />
+											<liferay-util:param name="classNAME"
+													value="<%= DocPratica.class.getName() %>" />
+											<liferay-util:param name="message" value="Download" />
+										</liferay-util:include>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+						<%
 						}
-					%>
-				</tbody>
-			</table>
-			<%
+						%>
+					</tbody>
+				</table>
+				<%
 				}
-			%>
+				%>
+			</div>
 		</div>
 	</div>
-</div>
 <%
-	}
+}
 %>
 <script type="text/javascript">
-	YUI().use('aui-tooltip', function(Y) {
-		new Y.TooltipDelegate({
-			trigger : '.allegati-tipologia-table .tooltip-info',
-			position : 'top',
-			cssClass : 'tooltip-help',
-			html : true,
-			opacity : 1
-		});
+YUI().use('aui-tooltip', function(Y) {
+	new Y.TooltipDelegate({
+		trigger : '.allegati-tipologia-table .tooltip-info',
+		position : 'top',
+		cssClass : 'tooltip-help',
+		html : true,
+		opacity : 1,
 	});
+});
 </script>
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf
index c7953334..b65256a9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf
@@ -132,7 +132,7 @@ boolean hasAsseverazioneAttiva = AsseverazioniUtil.hasAsseverazioneAttiva(user.g
 				boolean validated = true;
 				StringBuilder tooltipSection = new StringBuilder();
 				if (delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)) {
-					List<String> notCompleted = ValidazionePraticaUtil.hasDelegaGeologoCompleted(dettPraticaId);
+					List<String> notCompleted = ValidazionePraticaUtil.notCompletedSezioneGeologica(dettPraticaId);
 					if (!notCompleted.isEmpty()) {
 						validated = false;
 						tooltipSection.append("<ul class='list-body-modal'>");
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/action/StartUpAction.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/action/StartUpAction.java
index 806f1700..cf4b194e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/action/StartUpAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/action/StartUpAction.java
@@ -33,28 +33,23 @@ public class StartUpAction extends SimpleAction {
 		for (String id : companyIds) {
 			try {
 				long companyId = GetterUtil.getLong(id);
-
 				String[] defaultActions = { ActionKeys.VIEW, ActionKeys.UPDATE };
 				String[] guestActions = { ActionKeys.VIEW };
-
 				// Organization custom fields
 				addExpandoColumnIfNotExists(companyId, Company.class.getName(), "url_pdf_extractor",
 						ExpandoColumnConstants.STRING, true, false, defaultActions, guestActions);
-				addExpandoColumnIfNotExists(companyId, Company.class.getName(),
-						"url-bo-gestione-pratica-firma", ExpandoColumnConstants.STRING, true, false,
-						defaultActions, guestActions);
+				addExpandoColumnIfNotExists(companyId, Company.class.getName(), "url-bo-gestione-pratica-firma",
+						ExpandoColumnConstants.STRING, true, false, defaultActions, guestActions);
 			} catch (Exception e) {
 				_log.error("Errore nella procedura automatizzata di configurazione", e);
 			}
 		}
 	}
 
-	private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name,
-			int type, boolean indexed, boolean hidden, String[] defaultActions, String[] guestActions)
-			throws SystemException {
+	private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name, int type,
+			boolean indexed, boolean hidden, String[] defaultActions, String[] guestActions) throws SystemException {
 
 		long classNameId = PortalUtil.getClassNameId(className);
-
 		ExpandoTable expandoTable = null;
 		try {
 			expandoTable = ExpandoTableLocalServiceUtil.getTable(companyId, classNameId,
@@ -66,62 +61,41 @@ public class StartUpAction extends SimpleAction {
 			} catch (PortalException e1) {
 			}
 		}
-
-		ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil
-				.getColumn(expandoTable.getTableId(), name);
-
+		ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil.getColumn(expandoTable.getTableId(), name);
 		if (expandoColumn == null) {
-
 			try {
-				expandoColumn = ExpandoColumnLocalServiceUtil
-						.addColumn(expandoTable.getTableId(), name, type);
-
+				expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type);
 			} catch (PortalException e) {
 			}
 		}
-
 		try {
-
 			if (indexed) {
-
 				UnicodeProperties typeSettingsProperties = expandoColumn.getTypeSettingsProperties();
-
 				typeSettingsProperties.put(ExpandoColumnConstants.INDEX_TYPE,
 						String.valueOf(ExpandoColumnConstants.INDEX_TYPE_TEXT));
-
 				expandoColumn.setTypeSettingsProperties(typeSettingsProperties);
-
 				expandoColumn = ExpandoColumnLocalServiceUtil.updateExpandoColumn(expandoColumn);
 			}
-
 			if (hidden) {
-
 				UnicodeProperties typeSettingsProperties = expandoColumn.getTypeSettingsProperties();
-
 				typeSettingsProperties.put(ExpandoColumnConstants.PROPERTY_HIDDEN, String.valueOf(1));
-
 				expandoColumn.setTypeSettingsProperties(typeSettingsProperties);
-
 				expandoColumn = ExpandoColumnLocalServiceUtil.updateExpandoColumn(expandoColumn);
 			}
-
 			Role roleGuest = RoleLocalServiceUtil.getRole(companyId, RoleConstants.GUEST);
 			Role rolePowerUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.POWER_USER);
 			Role roleUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.USER);
-
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), roleGuest.getRoleId(), guestActions);
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), rolePowerUser.getRoleId(), defaultActions);
-			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId,
-					ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL,
-					String.valueOf(expandoColumn.getColumnId()), roleUser.getRoleId(), defaultActions);
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					roleGuest.getRoleId(), guestActions);
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					rolePowerUser.getRoleId(), defaultActions);
+			ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(),
+					ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()),
+					roleUser.getRoleId(), defaultActions);
 		} catch (PortalException e) {
 		}
-
 		return expandoColumn;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/portlet/FirmaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/portlet/FirmaPortlet.java
index 39a39e12..d740bf6d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/portlet/FirmaPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/portlet/FirmaPortlet.java
@@ -2,9 +2,6 @@ package it.tref.liferay.portos.firma.portlet;
 
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
-/**
- * Portlet implementation class FirmaPortlet
- */
 public class FirmaPortlet extends MVCPortlet {
 
     public static void main(String[] args) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java
index af4c8de1..f947ce3b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java
@@ -1,19 +1,5 @@
 package it.tref.liferay.portos.firma.servlet;
 
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.json.JSONDeserializer;
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
-import com.liferay.portal.kernel.json.JSONSerializer;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.servlet.ServletResponseUtil;
-import com.liferay.portal.kernel.util.StreamUtil;
-import com.liferay.portal.kernel.util.StringUtil;
-import com.liferay.portal.service.ServiceContext;
-import com.liferay.portal.service.ServiceContextFactory;
-
-import it.tref.firma.shared.Risposta;
 import it.tref.liferay.portos.firma.util.FirmaGetUtil;
 import it.tref.liferay.portos.firma.util.FirmaPostUtil;
 
@@ -27,9 +13,18 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- * Servlet implementation class FirmaServlet
- */
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.json.JSONDeserializer;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONSerializer;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+import com.liferay.portal.kernel.util.StreamUtil;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.ServiceContextFactory;
 
 public class FirmaServlet extends HttpServlet {
 
@@ -49,17 +44,10 @@ public class FirmaServlet extends HttpServlet {
 
 	private static final Log _log = LogFactoryUtil.getLog(FirmaServlet.class);
 
-	/**
-	 * @see HttpServlet#HttpServlet()
-	 */
 	public FirmaServlet() {
 		super();
 	}
 
-	/**
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
-	 *      response)
-	 */
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
 			IOException {
@@ -69,20 +57,16 @@ public class FirmaServlet extends HttpServlet {
 		FirmaGetUtil firmaGetUtil = new FirmaGetUtil();
 		String metodo = pathArray[0];
 		Risposta<?> risposta = new Risposta<>();
-
 		switch (metodo) {
 		case GET_CONFIGURATION:
 			risposta = firmaGetUtil.getConfiguration();
 			break;
-
 		case GET_TYPE:
 			risposta = firmaGetUtil.getType();
 			break;
-
 		case GET_TYPE_VERBALE:
 			risposta = firmaGetUtil.getTypeVerbale();
 			break;
-
 		case LOGIN:
 			if (pathArray.length == 2) {
 				String codiceFiscale = pathArray[1];
@@ -94,44 +78,32 @@ public class FirmaServlet extends HttpServlet {
 				risposta = firmaGetUtil.loginNomeCognome(nome, cognome);
 			}
 			break;
-
 		case VERSION:
 			risposta = firmaGetUtil.version();
 			break;
-
 		case GET_STILE:
 			risposta = firmaGetUtil.getStile();
 			break;
-
 		}
 		JSONSerializer jsonSerializer = JSONFactoryUtil.createJSONSerializer();
 		jsonSerializer.exclude("*.class");
 		String jsonResponse = jsonSerializer.serializeDeep(risposta);
-
 		response.setContentType("application/json; charset=UTF-8");
 		ServletResponseUtil.write(response, jsonResponse);
-
 	}
 
-	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
-	 *      response)
-	 */
 	@Override
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
 			IOException {
 
 		String pathInfo = request.getPathInfo().substring(1);
 		String[] pathArray = StringUtil.split(pathInfo, "/");
-
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 		StreamUtil.transfer(request.getInputStream(), outputStream);
 		String token = new String(outputStream.toByteArray(), StandardCharsets.UTF_8);
-
 		FirmaPostUtil firmaPostUtil = new FirmaPostUtil();
 		String metodo = pathArray[0];
 		Risposta<?> risposta = new Risposta<>();
-
 		switch (metodo) {
 		case GET_FILE:
 			if (pathArray.length == 3) {
@@ -140,18 +112,15 @@ public class FirmaServlet extends HttpServlet {
 				risposta = firmaPostUtil.getFile(token, tipo, id);
 			}
 			break;
-
 		case GET_FILE_LIST:
 			risposta = firmaPostUtil.getFileList(token);
 			break;
-
 		case OPEN_PRATICA:
 			if (pathArray.length == 2) {
 				String idFile = pathArray[1];
 				risposta = firmaPostUtil.openPratica(token, idFile);
 			}
 			break;
-
 		case RIFIUTA:
 			if (pathArray.length == 5) {
 				String idFile = pathArray[1];
@@ -161,7 +130,6 @@ public class FirmaServlet extends HttpServlet {
 				risposta = firmaPostUtil.rifiuta(token, idFile, messaggio, cambiaFase, assegna);
 			}
 			break;
-
 		case SET_FILE:
 			if (pathArray.length == 3) {
 				String tipo = pathArray[1];
@@ -176,17 +144,14 @@ public class FirmaServlet extends HttpServlet {
 				} catch (PortalException | SystemException e) {
 					_log.error(e.getMessage());
 				}
-
 				risposta = firmaPostUtil.setFile(map.get("token"), map.get("file"), tipo, idFile,
 						serviceContext);
 			}
 			break;
 		}
-
 		JSONSerializer jsonSerializer = JSONFactoryUtil.createJSONSerializer();
 		jsonSerializer.exclude("*.class");
 		String jsonResponse = jsonSerializer.serialize(risposta);
-
 		response.setContentType("application/json; charset=UTF-8");
 		ServletResponseUtil.write(response, jsonResponse);
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java
index 596e07ff..2c58a81f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java
@@ -1,27 +1,26 @@
 package it.tref.liferay.portos.firma.util;
 
-import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.Validator;
-
 import it.tref.firma.shared.Risposta;
 import it.tref.firma.shared.RispostaCostanti;
 import it.tref.firma.shared.Stile;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+
 @SuppressWarnings("serial")
 public class FirmaGetUtil {
-	private static final Map<String, String> configurazione = new HashMap<String, String>() {
+	private static final Map<String, String> configurazione = new HashMap<String, String>(54) {
 		{
 			put("MESSAGGIO_FIRMA_ERRORE_RECUPERO_FILE", "Errore durante il recupero del file");
 			put("MESSAGGIO_FIRMA_FILE_OK", "File caricato e salvato correttamente");
 			put("MESSAGGIO_EFFETTUARE_LOGIN", "Effettuare il login per continuare");
 			put("ERRORE_TOKEN_SCADUTO", "Effettuare il login, sessione scaduta");
-			put("MESSAGGIO_RIFIUTO_ERRORE",
-					"Si è verificato un errore durante il tentativo di rifiuto del file");
+			put("MESSAGGIO_RIFIUTO_ERRORE", "Si è verificato un errore durante il tentativo di rifiuto del file");
 			put("RIFIUTA", "true");
 			put("APRI_PRATICA_DISABILITATO_PER_DOCUMENTO", "v");
 			put("MESSAGGIO_FIRMA_ATTESA", "Attesa");
@@ -75,16 +74,14 @@ public class FirmaGetUtil {
 			put("RIFIUTA_DISABILITATO_PER_DOCUMENTO", "v");
 			put("MESSAGGIO_FIRMA_COPLETATA", "Procedura di firma completata con successo");
 			put("MESSAGGIO_RIFIUTO_COPLETATA", "Procedura di rifiuto completata con successo");
-			put("MESSAGGIO_FIRMA_ERRORE_BLOCCANTE",
-					"Attenzione errore imprevisto durante la procedura di firma");
-			put("MESSAGGIO_RIFIUTO_ERRORE_BLOCCANTE",
-					"Attenzione errore imprevisto durante la procedura di rifiuto");
+			put("MESSAGGIO_FIRMA_ERRORE_BLOCCANTE", "Attenzione errore imprevisto durante la procedura di firma");
+			put("MESSAGGIO_RIFIUTO_ERRORE_BLOCCANTE", "Attenzione errore imprevisto durante la procedura di rifiuto");
 			put("MESSAGGIO_FIRMA_IN_CORSO", "Firma dei file in corso...");
 			put("SELEZIONA_DOCUMENTO_SENZA_VISUALIZZAZIONE", "Documento senza visualizzazione");
 		}
 	};
 
-	private static final Map<String, String> mappa = new HashMap<String, String>() {
+	private static final Map<String, String> mappa = new HashMap<String, String>(9) {
 		{
 			put(StatoPraticaConstants.CONFORME, "CONFORMITÀ");
 			put(StatoPraticaConstants.AUTORIZZATA, "AUTORIZZAZIONE");
@@ -101,24 +98,14 @@ public class FirmaGetUtil {
 	private static final Stile stile = new Stile() {
 		{
 			setLogo("iVBORw0KGgoAAAANSUhEUgAAAUoAAAAyCAIAAAC1TQVKAAAi8UlEQVR42u2dCVxNW/vHd1zh4qrc6+W9RaFzqtOkIoRSlMgYIrpSyCxDyCVuKFFJA5EhJYmEyJWZUNKkaNag8Qwls2T4/87ZOvY9nXMq1y33/Z/nsz7ns/c+a6+99t7ru57nWXvtZxPW+lK+Qzp4t/2xJdOGth1CDh36JBGJtIhU6apWaqmyGHSWukqVCr1ajUw0XqJTfmkCy1WqNA6SCq1Smcai06rU6FWqdI5q/e6qvPSlBOqCQPncfVkMVQ6NzupLY6rQn65e0QInTuzZLPUirGOphlyJdLcWS/HtZCIkeEukpaRCncFUUuYoKnN6K7N60dgKyp9TL0oS2KKgzKlPVQrKrN68pIjduYmXhyyH1qAEmpACFXjH7Y064F86W5H2dIVjS+Ad6EV8KJeq8elU2kNOgrdE/ieFrU4H2GwlGpOhwqHToUI5NBrvV2iifVlAZl7+KmUkWhVvgaP8eWN9UZQFmrAtWFZjcPQHsZH667BAeO8WxPtTFfGhuE2Va5fSXyR4S+R/UFjqNE4vGlNN9dX1S3UF+XWP8+sKHn9JjylbyAX+lvqFdwX577i/nxN133eUJFgyL70jS3hSXPuk+OW5M0x1LXaflsUb6X1OG/aqriWdJXhL5H9N4C3DNubQVeoKC5u148ePH9+9e1ddXV1YWJienp6SkpKampqZmVlaWvrixYv3798jQ7MKfHM/gampxeml/KyF8f7EId6l/MC0lin5sUmIFkp3y5eWK5TgLZHvXqrVuP4wjOS6woImUg16Hz58FBYWtmzpUsNhwwbq6fXX0tbR1sZvfy2twfr6ZqamLi6bzp8/X1RcXFv7rul4sxmawLumpfHmEf72unSFqWxJ+0b4zJCW3auguHzMmD19lQG5BG+JfPd403h4FzYKNofDiY4+ZzvbdtBAfVU63XqG9e+/b/D09PT399+7N3DPnj2+vr4e2z1Wrlw1zmJcP6U+xkZG69atS0pKevXqVeN4JwFvrarerYI3Ept4fal9ma6cKMKfSHdLk5bdpK4ZdepUUVFR1MmTkTTVJxK8JfKv0N5F4vAGn5cuXbKxsVFTUZliOSVwb2B6ekZNTc3b2toPHz7wzXB0ATDLX79+w2azb8XF/bF580gTEz0d3dWrVmdlZ9fV1X3HeFcRH5nEi/COZWrCdXKqtKyLKuNIcPDr16+xP07eZ/Hi/PYSvCXyL8YbxJaVlW/atEmDwZg0ceKZM2eALpBuSuFwzgsKCn18dg/WHzR86LDjx4+LUeNvWx1vLuElUjUBnUp7CertuPZyLoaGMefPk2xDcAkO+PrekO1B5imW7pYsLZshLfdEgrdEvkfjvEAo2w8epM+0ngm/2tt7V0VFRXMHzCBQ2unp6UuXLtVQY2zZsoXJYgnNVsvDm92rVfHmPioraFO1qUvJL1/YvtJeduMcu7t37uJMYJxUV1eTdkhebm64hhbJc1I72Tlt2m9s27FIgrdEviO86Z/xbqC9QXJi4v0x5mOMjUbAMq+trf3qo6CoqurqAP8ALXUNBweHsrIyoXhzvge8kepy2rKX/FTSmcv2xR+7rbW3z87OBtiZmZknT55cu3YtuiucEuzzAFvbHJ7GDvyhc982bY1VVC50kG0i3tD/8+bNI3jSpUsXHR0dFxeXrKysrzgZGEWamppTp05FJf+Ji1VYWLht27ZBgwahnqht9+7dcSkaPSg1A2TYsGE4x7dv3/7TtZVIo8Y5Wm9qaupos9GTJ026f/9+E61x8YI7GxYWBkNgwYIFbDZHuPZW+A7w5j4qS/uh8jeZ6x1k182fn5OdjfN//Pixm5vblClTGGpqDx8+xAVCh3ciOPhBO9l86W5O/5UfOGCAOoPh3a5TYfPx5ouamlppael3hXdVVRXAplYSeONqSPD+9+JdWlo2Y8aMkSYmYPsrDHJRAiJCQ0N1tft7eOx48+bN94o3nHA2kR7efsPMqVDUH3iSnJx85MiRgZqay5cvf/bsGVnKnbi4+B69LrfrOqpfPyNDw2FDh1p1lU1rJ9t0vPv06cNkMrEKrx7dB+A5c+YMVtlstqenJ7gyMzM7fPgwf9ACDhKygRMDA4NJkyaBmd27dwsAgwKxrwFPvLy8UBQfNiMjIx8fH/xOmzYtPj6eLFPUsUhJSkpCrbZu3SqwXeCgqJirqyu2oBCo+pcvXzYFbzSI8PDwZcuWGRsbI8P+/fvJZiGqtqLyS6QRvCm+N67thg0btDW1rl69+k30NlVwOzw8PDQZ6mfPnqUW3mp4f2ATBalEYSpRW1HPNofISpBa62gYf/cumiBqibZ74sSJuQYGszvLnD9/nl/v+4mJYVo6f0rLjNLWBkvq6uoWv3RP/Sq8Ibdu3QJIAAy+/cKFC6kKMyAgAL0suoDp06cLKPxdu3ZRgXn37p2AUYCiUCCZh7odsD19+lTUsfhXCqYKbHKUCccBhQvFG9vt7e2pNgh6wKbg3bBW165d4xfesLai8ktEJN4KymzaF7xxZy9evAj8fHf7Uu/mNxRoi7n2c4cPHVZQUCDoe7c83rWVxJqlHaZM1A7eY3rljFrSNaWTh2lrVlpev34duuLJkyfhYWEb5s3z+qXnvXYyK3UHwJ7hl5KRkeE5wji5nawtjT5x4sT+WlpLu8o+qp/uUizdLVda7mJ3+RM9FG60l30sFm+y20N7RfcB0xcGsLe3N27A8+fPoaUHDBiADLm5uSBt/fr1WMa1w74bN27EDaMCk5+fj33h/7x48QKM2draYhWZyTzm5ua4+th9zZo1KAroijoWdWjU39+f9LrBGNRpXl6eAN4oH4XY2dlVV1ejPmBYoFai8Cb7LBwaV+P27dtk78YvvGFtReWXSBO1N4vFmjplqtU0q8rKSoEBcPxVU1PTXFu9YX5suXv3rp6Ozvbt2/k9SKvh/Z5FXD0ttchhYmJi4tUrsRf/PHfpUmxxcRF0RVxc3JIFEyLW/vdRT1lyLupGq+kAnl8Klt2mzyiQllvfRXachcVvAwZGSnfN4eFdJN0tqusvWxcuPLx//xJ7++2yv2RLyzXqe8MQ5XA4qElDnxz1yc7OFsAbihflUIFJSEhA/mPHjpFHQevHKgoUsKUjIiKwHZlFHUvgepWUlMDcwuFQAZAMTU4tEJ5LQ9Ka6HvDMoIGPnnyJOx/FB4UFNTQ8ufXVlR+iYjBG9r7HQ9vgBcZeUpdjRETEyOAZXZ2zoTx43fs2NH0eaZoeEVFRcHBwdA6AsMo0IuurlsGDRiYlZXdyngjvaskzhztsmLZrIAAvzt37qByaEAHDx5c42iaHidVm9+maluX0u7dEtvJbl60GArqTb1AVW6ysgL5nj90Gqav70NXdW7b8Va7rpekZQLke2/ftBm68cb16ztGjUrnMS8ebzTWtLQ0/NUQORIMOLRQaNTtqKQADELxhsUhAExUVBS2o5cVdSxRFw5OCvKcOnWKWiDpn38F3riA6KTQoUA/r1y5UhTe/NqKyi8R4Xir/mVoDdbctKlTrWdYow0L5Lx8+bIqnW5vZ9eUGaboGp7W1KDPNR89up+ikpGhYUhICNQStct4kJ4+QFcPth55B0nfm9VaQ2sgPC+JOH6grcvaoX/++WdqauqWP5ziYzvCM+e9VdaWtfSn2B+7mtNo8H4nT548bdo0LMydO9emV2+oZbcucv169TLt0Mnyxy7LpTuvdHCIPHkSpk5mZqaLqdmDenNdjHF+9OhRtGAoJSyTRjhsG9JIRk7+Y8nw8HD8haZvbGy8Z88emNMCMJDG+fz580njfPbs2VTjvCEwYo5FCvJXVVXhX9LqhmeOHWNjY6kFkhY+HAGofZTQdOMcnghKO336NPZCH4GawBEQg7eo/BIRob3pVLxTUlL1dPUOHw4WUN3vP3xAW1JW6jNYX58/EiTmARhuxAIHB3QH8LHPno1etmyZlrrGTOuZV69e5bt1WFi8aLHVtGlkV/KW90pJK4+cf+QQZY8Ij009F9gPv3K6/Ztyoo7JTbUVxNWAtvYMutXUqePGjVNRUdHT0zMwMFBUVNSTl3ft0MWiq6y8vLxKz56BHX7a0/6noH37yCa+z8/vTOcmDa3BzkcJY8eOhW+JS4OWTdWo8KV5s38/wiLlP52aMGECdBcwpsIAJ2rRokXUfZcuXcofWmsIjKhj8a9UeXk5KknNMGjQINRZYAAc/chXDK3BViK9er7gL/QmomorKr+E5EbwLizAPd2/P4hBV8nJyeErYdI3xk1xdnbuq6ikokx7lJkppkDcjoCAPZoM9dFmZlBFuPIoBPf6/PmYCeMnaDAY3t7epOlHOgLoMu4nJbU+3q9KieIHRH4SUZRGpN+Wclwov9OVcfxgn5OH+54K0QwOaGdh1l1bWxuoqKurjx49Gmxv3Lixf//+aIIqffuq0Gijhg934znYme1kF5iMLC4uxhkGeXllUl4sE4M3Vp2cnNB2SQ8Tu6N8cIIDrVq1Kjo6mnzSvmXLFhqNBhOd38phLQvAgIsOo4h8MObr60t2n6KAEXUs6nNvWN1LlizB7uAT/Ush7/UjgQJLS0vJQszMzFDJJj4YQ+cC9YvVWbNmQScfOnRo1KhRqLCYzkhofgnJjeKNK/+bzW/z5s7DranvuCuio8+h4YFPi7FjgWI/JSX+k4hnz5+XlZXxM5OC7mDZ0qXGRsYwS6k6AMuwEGGlL1q4iG/eox8ZamAAu4DbdJMSWK1lnL9jEnf+lLKeIjfGTG/S2B5Oy3qbjNA1MBiiqalhbj56pIkJlCqUNmgcPnw48O7bt6+cnJyWlhaAR1OTkZFRlpf3UlDMrh9UOyTbPSYmBk0z0Ns7Xlr2W01KTUlJAdUHDhwggbly5QpWYS1L2rFEGsUbWgS2N7wwcko1uN28efOSxUtAY1FRESxteNEgHK0LNALXsLBjo0xGXr585a941y1fvtxirAWngcWEnnechQXUAP+9DA6natLEiehQoJbqn3v3a2m8YZCnxxETzOUsLMYaGRlBw0D/rFphO22inOkow1kzp4aGhvr5+f36668whoG3qakptAocbzAPM1VBQaFfv34456NeXsmdu5MYX+rUbdeOHejqwkJDg3sqfCu88/LyYJMLTCBLTk6WtGOJCJUqNRpL4fPIOfStjpb2jh07ampqnj59CkMdSGsyGOnpGQkJ92h9+5mZjVZXVVu/fn0tIK6rc3V17afUB/mpo+LYzsN7rHC8x1osWrSYr71hLzg4ONjNsaupeQbjnMXQZLU83nlJhLNjW10djfHjx8P7hXk5bIhybGS7fbuIc8ekvNwnpaamrl27tmvXrpMmTfL09MQqejuYIvHx8Y6OjjDUsQsuCnSp/3BDckbqrU4/+7m741rk5+d7DzZ4/I3wRrd648aNZcuW4YiwGtatWwd9LmnEEhElHFUu3kw67d3j/Dt37mppaA7WHzRr5szpVlZaDHV1NTUAvHq107p1zgP1Bty4edNhPpfG58+fA9GpllOgz7GFap/XvX/vuNxxDG8+ggi8vxjnaK6lpTDwywDCGx7elfItiDf0dnUBsX8Xoa3xH3V1VS1NTSWlXiZGvQJ2tHlZwvXGk69JWU7Uh3cHnOAkQ7c7OzsD6cTERHi8K1asgLepqqoqKysLcx3Lq2xsEjt+xtvffTs5oLVx/vykevtc8saYRFoUb572ZtFobx89uHT5ysIFC9B6V61ctXLFCuiGu3fjZ8+erUqjI8EDhfXu7e090pi7ACZ1tLWB96CB+nDRSe+aHCuB9h47ZgyLxRZqnM+fNw+mAezWWtgA9cJ95nI/gdnCQ2vA+2kBER9L7HYnfLd3DPZvs8+buHuRANvsXOJYEN1muta0adNGjBgB1a2oqDhw4ECcP5xwLy8vWOm6uro2NjYaGhowkuGKW1tbr12x4mT3X4Hxza7/ORUWRo5jnzp58krHz++BS/CWSEsKG3j3UmbTucY5+CTfaOYLqDt7Nhr+NtIc2zlva2tPnYqCPs/MzEpNTdNQYwBvrN5LTHzx4oWHx47ff/995cqVcODHmI9p+PwMpjjwZqiowmM3G2U62tTMzNTU3Mz8N5vfkJk0zlvB9/7A4T70RqpjcsfYaiuJnMQ2m5wtwsPD7O3tYWwMHToUfgj0NoPBuHjxYmRk5O3bt2GNx8bGRkREYOO8efNmzpwJ+FevWuXdU/6xtNxN2R6xZ8+STktGRoa3KqNQgrdEWsv35uEN7VpeXi7wlKGkpAR6GwwHBQWBfxjwQD0uLi429hJAHTxoML2fckhISEbGQzW6yvBhw6xnzJg1c9bSJUtZDcI2AG8nJyewAGrm2tvb2dnZzraFCzB+3HgmiwW8Oa3+xth7FpF0rf1qR8u0tDS4tXPnzt22bRv4RO8FZxsAu7u7Z2ZmhoaGXrp0KS8vz8XFZdiwYbdu3YIxk5CQgNVp5uY+fZVjOv8ctGsX+VAR13SLvf3jBrPWJCKRf1qq6/Gu4w6tZY01H3PwwEHqU0800Q2/b1Cl069eu4btubm5sMZXrXJavtxRXVXNbfsOED5p4qRly5ZrMtRv3Lj5nCfAoeGrZtj9JU/wL/kL/3zG9OlI/KG11gzn8J5NJF9vv2GdXX5+Pt/TqK2tJS8HDAwbm1l6errwsYH9mjVr0FeZmpqGh4eTYwnkc2k4Hmeiopx1dFeMG0e+MYOignx8ktpL8JZIy+P9ZdZaZSUT6LrzRnypeSoqKrKzs8npj2jkFmMteDGPtYcOGVJaWoZ2Dn2uokwbOsSgsrEJbYK2Q3W15eTJ8+fN5z4Ya91pLfDDn6R3cN1oS32LjYQWkKelpQb47zjk3/ewv9S4sUPhkMP20NLSgivOf/eb2iNGRUUZqDG8PD3RjaGEY6GhJ3ooNMSbGq3F2NjYzc2NP6PoH4158D8ZUOGfOCnqbJx/40nx3xgjjfOpU6aiyYmZVf7q9WvrGdZwuWl9+61e7YSO4MyZM6RzDmXW3BdI8/LyDQYP8fPz4w+tMVve9yZt8txEmb2+jmCb1NU4MfRkWE1MTNzuvtnHXT/jTgf458+KiJ1/dFdSUgLhk8f393HX3hPgVVxcLNAj4lLCRd/h4UG+enXzxo0AhsYT0Xg3jNbybRsrTgrdtry8PPm6WwvgLXDE/w94/xOn/DdPqkqVO7TGqR9aCwzcBwUO6kTlR54NGzZwR9QUlYKCDmA1PT1duU9f4B0REdGsd0WROTr6HPa9dy/xE29SKrNVnntDb+ckSru5LiS5ApmxsbG+vrsdHObPmDbCz6NnZjz3ORm/Izgd0r1z5849e/Z0mN2ZlUM8vNPed8fkY2HBT54U8y35T7x34sgZueQAhrOx8cO/vhBK4s2flArriHzfG9a+wH0ll9HOdu7caWBgMH/+fFz0T6JDl5D5LS0t0Tdt3boVphf53hh/kjaOKFC4kZHRrl27ULitre3ly5cDAwPJUDAhISH8nktoUBdRYVUEjghPTGgMGYF2TK3zpxYMWSPqSgrgLT6sTcNTFlN/oZFtGlas0ZA4os70s/b+6xtjSUlJOlrauKdiQIXh2U+JO33twoULyEaa67r9dZo7wwKXdPmy5VMsp5BvBPAmpWqyevVrhXAOntsm5ubmkudcXV0Nk3vd2pV2dnMmTxzuvKJb5l2ptxVfVP2lU1I///yzjIwMQ1U+OqxNHZN4W04kXvnloL/JvoDtaWlpgJk/L48UrG5duSpRWlYM3pBHjx7BSt+8ebPA61YNQ5QMGDCA/96F+FAnKDAzM7NRvAkRgt3BG2nOCA3qIiqsisARcVWFxpARwJta55YMWSPqSlLxbjSsTcNTFppfTGQbURUTExJH1JkK4s1737umhvtCqI2NTcP3+flyLzFRuU8fHW3tBw8e8JruG19fv/Xr1wuEf2hUHj58OEBXD/eFrAxvUqomuxXwriACfFZTo7ejUwQ86ClhnMfFxTmvXXTisNLzYq6eR/4b0VKajF9kZWX09PTsbPTDg9oUpnIjOqGcwoQfLlgruFlaBrhvDw8NvXH9Oux2NMe8vDwnK6vkxvAuLCzs3r27o6OjQIQGfugSEmmYT7iLd+7cER/qBF3A1atXcVc+8kSUcc4vnMPhoDSYBqDr3r17uCvnzp1DmcHBwdhFVFAXMWFVqEcUFUNGAG9qnVsyZI2oK0nFu9GwNgKnLCq/mMg2DSvWaEgc8Re2WpVOxZv3FlekCo0eE3NBlALPy89nqKoaDjcsKirieyh1dc1zDXDKuBRwBDIePvz82Ox+K71SUsciTh3p7b/bJf5uHJoOqKZqFdzvmpqa06cjPVzNk69JV2ZJvSkjLp4gls3/6T/dZfooyS+Z1/VyVBt2LneW2ycO8Tq+XfFomUft5c516xnE0PA3NNo2duy64YYRXbjfHhSPN3n/VqxYIRRvvoUGAPgRF5sS6kS87y2QGRoG5ZC2cU5ODpZ9fX0/CYswQQZ1ERVWReCIomLIiHEyWzJkjagrScW70bA2AqcsKn+jkW2oFWs0JI74C/slznl9MKbKSubkSZOhw0V9b4DN5syYPgNHRLP/arqSkpIH6ult2bKFHzvgs3HeKiPnsL1LMtpk3+t0KkTN3XXOwQN+0dGnoUvJHh23jZw9fuzY0Y3rJgZ604MD9KLDfnCw7Tx48KDQkEM73RzWOtLcNkjdPEfUlhGvznUo05fjfwUhW1ruobTwWWsCeMOwR8OCVynUOOffe/jGZEiDJoY6aRbeKIG0jfkqF/bVJ9EBZES9udkUvKlR65qC9z8XskbUlRSPt8CQW6N4k/kbjWxDrVijIXHEX1iBcA5kJWNiYjQZ6oGBgUJHwnEgWE+VTOZXB0iGcbHAwWGEoRGU5ZdJL7wHY6xWGTn/8gEDFlcJ5ye3jT2lcOzAcI+tNocOBuI+QUugVaErAlp+fn7o5gO9+1yIkBpv3tV2tpWZmRmDwfjvf3vq67Y7e5SofSL1IqxjmYZco18poeINw3vdunUkt0IJhHWHCqDHcXFxIY3zJoY6IW/qzp07wSqplr8Cb1FBXcTgTT2iqBgyYvBuyZA1oq4kFe9Gw9oInLKo/I1GthGFt9AdxV9YoXHO0ZKdnZ2hXW/cuPENg5zzR9T8/fy1NbWOH4+gjvZ/9r2/kzjn5Ig6K0cq937by1Fd3DcP9/XZBqsYLYmccH9kj2r1Y+L2BWK3e3vlfr/S6XSA2qNHj9EmHWOOE++KpGq8OpXKN463QAc/aNAg6hivqNEvAwMD9JFNDHVCChnsidQh2Le5eIsK6iImSgT1iGh8QmPIiMG7JUPWiLqSVLwbDWsjcMqAUGj+RiPbiMJb6I6izlQM3p94oYGmWFqONBmZkpLyDQnHcSMjT+loa8N1EogD0ZqhFMWnD2yu9f44uU2gN2O3jwfYAIH7fdRfl3EnugHyVYu76vRnKMj/2qtXr27duk0ZR+QkEu+L2lRt6FLStUl4k9NaPDw8Cuu/w9wQb1h9yIObCiVPmj1NDHVS73RVwqtHIUJHzhvF+5OIoC5i8KYekRytbBhDRvwD3hYLWSPqSgo8GBMf1qbhKYvKLz6yjSi8he4o6kxFGed8QwNgjzYzgx8OP/mbfMyAnAMzWF/fbo5dWXk5VmFpov7k0+IPz57dCQo6umDB68f5X1E4Wiz8jqZH3SL2enUnR8Kbnl6XQlf3vHAhBnivWWlVlc9X8sTlKMJrC2Fh+sME87ZOS4gHt7gD6XW5bVgrupb89Be8jzd/Uqrkqz1UkYSsaeasNeFfCAVyCQn3TEeZjjQxgVla+/c+aQDrCfhBb8+xtS0qKiovL4dWMDI0NBg8ZN3atWfPngXkkZGRWBZ4ZtxEycnJsZ4xA+5JU/H297J5WtA8vJEqsoilCy2h1pYtsWbn/UXD11YSrFwCKh2qHqsfyW+VpfzAnClTUv8Z8Lh2MqcjIiR4/x2RhKxpDt502MNiPgCcmpo2cfwEuMp+fn7MrxpOe//hQ15evtNqJ02GOiyXktJS6G3f3b6D9PXv37//8OHDgwcPwrb6wM2Why3gnPxi371799IfPADtWM3KzEROVAAZsBHGFPoLLKckJ5NzgTgcDhwo0m9F+dnZ2dgdNiY5OojM2VncLRkZGaSdRYSF+Bc9aDbe0MlHAuQPHAgK9KaB5MZ3gWF/o12FuSxJ+FWZ/9zjPYaR4P13prtKQtY0Q3sr0KgfIWp4MUtKSjb8vgFwWk6eHBMTw59q2TjY79/DWYDSNjE2Hqint39/EPn+BZBzdXXV0e6flJSELfx3y0OOhNjOnv38+fPbcXEmI4wXL15MfjgBzdvdzc189Gj8O3fuXC0Nzd27d2/bunX+vHkoBBm4nxB/8GCAnl5qaioKh6UGo2D58uVmpqZ79+7lRkzhveWFArEdPQvyEwkJ8fev9mmufc6btdZm9nSlwrQ2Td2FTbw6275MR65QuluI+diiwkJJs5NICxrnIrU3VX9cuHDByspKja4yY/r04OAjWVlZ4JB8KkzNSY7Yk0/vd+7cOXbMGA0GA10tVqmP2aCKZ1rPBJw2s2bt37ePxWLx8a6pqQGT2F5aUlpZWVnO89KB9/Chw4qLuJ8GWr1qNUhGlw2dvGfPHhwCWp2PNxZQ7Pnz51HnEp6gSszKysLCQuwOtsE8VgnsExSwiD+ZvOkJLndRGtGsfuEjk3gR3jFXRXa/mzsqLWl2Emk541zY0JpQNQ7TNyoqarqV1QBdPXBuO9v2jz/+8PHxgWl97tx5+M8hISHeXt7r16+fNnWaslIfALlo4aKbt241fGkSyAFUmMoHDhyANnZ0dIQRztfeT4qLwbC9nZ2npyesdO4UNzc3uOVkB+Ht7Q3dTmJy+fLlUSYjy8rK+HjHnI+BS0/9SPbLly/R0cAzRwLbyF9RUUFwP3R2J+70UYMm2dh/O9UWSoVvHJjYfMtcIhL5erwZNFZvelV/nbonxU10fJ49ew6HHFjOnGE9dIjBAF1deOZI/bW4v3o6utgIqiMiTuTk5AgdJ4N3DQihPsmICSAZ1MHm5+ONv8AkzFhY4A4ODugdgPd6Z2cq3uRDgYZ4x8fHYyEhIQE9CIqqrq6GCwA/n/zOWURExGe8P/HCx1y5fOH4QWNOXpc65j/I9tty4s6ffU5HhX7dsKFEJPJ1wlSjs/rQOfqD60pLmrUjaYQzmazsnJzk5JSEhHuQ1LQ0KFsQ1dBopwpInv3bb9CxcJt37doFGv18fcEeiTf+3e7ujoX9+/fD93ZxcQHJTccbWt3JyQk+9r7AfVDXmzZtevToEemKc+MgWlh8wZschXv06GHwQc+z4RMy47sXpHC/VSIqMbO/fAOc/2WypwVcc11o4uQRJRlE5t0uJ45Ynzt3SmKWS6SFhQXfW4nG1BvwJjGhrrzsPTWVlYpJdQIL5dxUJyybsI0lz3Ozbx05tGvqRKS7YaEv8vNqiwoveXoGTrZ8lpWFDgKuvr+/f2RkJDQw+ak5+AXkbJyLFy/CXX/Lm+oHqoOCgjgcDlQ9PHZyNh60PawD7H769Gly6A6ef0BAQGxs7P3795Ef5RPUqwClWlxcnJR0P/bimeizYcLTmdCT4btC9lneuUh7VcqNpnojmhZ+cPrJY1uuXw6+dT3s1rWjf57bE3F0y/FQVzJFhu+IPhNy6+a1kpISgXgPEpFICwhbVQXGOVtRmTlsaLXJiGpjSjIyFJOq6n+r6pc5SIafV9lGw6kZ2PV5hCa2sWGVoSFz4EC2IncYv4VmrQl1PMj5jKIExgM6htiL5w/6mYUGzbp06QIsDXga1Ay1fxVs/CZTgiQika8xzlVV2ErK7N40Di+Bc3ZvZe6vIu+73yISi5eY9Qvs+uWKXv0EtlAXRCZFGkuRVqnEnWDDVGo9vJsoIDYlJSUrM1PyFFoi37lw+qty6HS2Kp2jQquii0l0XuIvf/mL8znRq1Tof/lXhf55LxWBfT+vcviFKPMSuYsK/emqFS1w4v8HAP08pG3KN4QAAAAASUVORK5CYII=");
-			setListNumrodlfProperty(new ArrayList<String>() {
-				{
-					add("nimrodlf.p1=#CE0006");
-					add("nimrodlf.p2=#D80010");
-					add("nimrodlf.p3=#E2001A");
-					add("nimrodlf.s1=#D6D6D6");
-					add("nimrodlf.s2=#E0E0E0");
-					add("nimrodlf.s3=#EAEAEA");
-					add("nimrodlf.w=#FFFFFF");
-					add("nimrodlf.b=#000000");
-					add("nimrodlf.menuOpacity=195");
-					add("nimrodlf.frameOpacity=180");
-				}
-			});
+			setListNumrodlfProperty(Arrays.asList("nimrodlf.p1=#CE0006", "nimrodlf.p2=#D80010", "nimrodlf.p3=#E2001A",
+					"nimrodlf.s1=#D6D6D6", "nimrodlf.s2=#E0E0E0", "nimrodlf.s3=#EAEAEA", "nimrodlf.w=#FFFFFF",
+					"nimrodlf.b=#000000", "nimrodlf.menuOpacity=195", "nimrodlf.frameOpacity=180"));
 		}
 	};
 
 	public Risposta<Map<String, String>> getConfiguration() {
+
 		Risposta<Map<String, String>> risposta = new Risposta<>();
 		risposta.setRisposta(RispostaCostanti.OK);
 		risposta.setObj(configurazione);
@@ -126,6 +113,7 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<Map<String, String>> getType() {
+
 		Risposta<Map<String, String>> risposta = new Risposta<>();
 		risposta.setRisposta(RispostaCostanti.OK);
 		risposta.setObj(mappa);
@@ -133,6 +121,7 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<Map<String, String>> getTypeVerbale() {
+
 		Risposta<Map<String, String>> risposta = new Risposta<>();
 		Map<String, String> mappa = new HashMap<>();
 		risposta.setRisposta(RispostaCostanti.OK);
@@ -141,9 +130,9 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<String> loginCodiceFiscale(String codiceFiscale) {
+
 		javax.portlet.PortletPreferences jxPortletPreferences = FirmaUtil.getPortletPreferences();
 		String codiceFiscaleTest = jxPortletPreferences.getValue("codiceFiscaleTest", StringPool.BLANK);
-
 		Risposta<String> risposta = new Risposta<>();
 		if (codiceFiscale.equals(codiceFiscaleTest)) {
 			String tokenTest = jxPortletPreferences.getValue("tokenTest", StringPool.BLANK);
@@ -158,6 +147,7 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<String> loginNomeCognome(String nome, String cognome) {
+
 		javax.portlet.PortletPreferences jxPortletPreferences = FirmaUtil.getPortletPreferences();
 		String nomeTest = jxPortletPreferences.getValue("nomeTest", StringPool.BLANK);
 		String cognomeTest = jxPortletPreferences.getValue("cognomeTest", StringPool.BLANK);
@@ -173,6 +163,7 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<String> version() {
+
 		javax.portlet.PortletPreferences jxPortletPreferences = FirmaUtil.getPortletPreferences();
 		String versione = jxPortletPreferences.getValue("versione", StringPool.BLANK);
 		Risposta<String> risposta = new Risposta<>();
@@ -184,9 +175,10 @@ public class FirmaGetUtil {
 	}
 
 	public Risposta<Stile> getStile() {
+
 		Risposta<Stile> risposta = new Risposta<>();
 		risposta.setRisposta(RispostaCostanti.OK);
 		risposta.setObj(stile);
 		return risposta;
 	}
-}
\ No newline at end of file
+}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaPostUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaPostUtil.java
index fb99e891..f9e3c3d6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaPostUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaPostUtil.java
@@ -1,5 +1,23 @@
 package it.tref.liferay.portos.firma.util;
 
+import it.tref.firma.shared.RestFile;
+import it.tref.firma.shared.Risposta;
+import it.tref.firma.shared.RispostaCostanti;
+import it.tref.liferay.portos.bo.model.Avviso;
+import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.io.IOUtils;
+
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.language.LanguageUtil;
@@ -20,24 +38,6 @@ import com.liferay.portal.util.PortalUtil;
 import com.liferay.portlet.documentlibrary.model.DLFileEntry;
 import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil;
 
-import it.tref.firma.shared.RestFile;
-import it.tref.firma.shared.Risposta;
-import it.tref.firma.shared.RispostaCostanti;
-import it.tref.liferay.portos.bo.model.Avviso;
-import it.tref.liferay.portos.bo.model.IntPratica;
-import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.commons.io.IOUtils;
-
 public class FirmaPostUtil {
 
 	private static final Log _log = LogFactoryUtil.getLog(FirmaPostUtil.class);
@@ -45,76 +45,59 @@ public class FirmaPostUtil {
 	public Risposta<List<RestFile>> getFileList(String token) {
 
 		/**
-		 * Verificare che il token sia il codice fiscale altrimenti c e un
-		 * metodo che estre il cod fisc dal token userCodiceFiscalePrimaFirma =
-		 * al cod fisc di Avviso...tipoAvviso = S && fileEntryIdInvio = 0 &&
-		 * fileEntryIdBase != 0 && !rifiutato ( aggiungere campo al service e
-		 * anche campo dtRifiuto) con il fileEntryIdBase prendo il file e uso
-		 * per riempire lista di ritorno
-		 * 
-		 * NEL RITORNO "tipoDocumento" è documenttype con intPraticaId faccio
-		 * fetch su tabella intPratica e prendo campo tipopratica
-		 * 
+		 * Verificare che il token sia il codice fiscale altrimenti c'è un metodo che estrae il cod fisc dal token
+		 * userCodiceFiscalePrimaFirma = al cod fisc di Avviso...tipoAvviso = S && fileEntryIdInvio = 0 &&
+		 * fileEntryIdBase != 0 && !rifiutato (aggiungere campo al service e anche campo dtRifiuto) con il
+		 * fileEntryIdBase prendo il file e uso per riempire lista di ritorno
+		 *
+		 * NEL RITORNO "tipoDocumento" è documenttype con intPraticaId faccio fetch su tabella intPratica e prendo campo
+		 * tipopratica
 		 */
 		long[] companyIds = PortalUtil.getCompanyIds();
 		Risposta<List<RestFile>> risposta = new Risposta<List<RestFile>>();
 		for (long companyId : companyIds) {
-
 			Company company = null;
 			try {
 				company = CompanyLocalServiceUtil.getCompany(companyId);
 			} catch (Exception e) {
 				_log.error(e, e);
 			}
-			String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute("url_pdf_extractor",
-					false);
+			String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute("url_pdf_extractor", false);
 			if (Validator.isNotNull(urlPdfExtractor)) {
 				byte[] fileArray = Base64.decode(token);
-
 				List<String> listaCodiciFiscali = FirmaUtil.getCodiceFiscale(fileArray, urlPdfExtractor);
 				String cf = listaCodiciFiscali.get(0);
-
 				List<RestFile> listaFile = new ArrayList<RestFile>();
-
 				try {
 					List<Avviso> listaAvvisi = AvvisoLocalServiceUtil.getListaAvvisiPerApplet(cf);
 					if (Validator.isNotNull(listaAvvisi) && listaAvvisi.size() > 0) {
-
 						for (Avviso avviso : listaAvvisi) {
-
 							if (Validator.isNotNull(avviso.getFileEntryIdBase())) {
 								DLFileEntry fileEntry = DLFileEntryLocalServiceUtil.fetchDLFileEntry(avviso
 										.getFileEntryIdBase());
 								IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso
 										.getIntPraticaId());
 								if (Validator.isNotNull(fileEntry)) {
-
 									RestFile restFile = new RestFile();
 									restFile.setIdFile(GetterUtil.getInteger(avviso.getAvvisoId()));
 									restFile.setDataInvio(new Date());
-
 									String tipoDocumento = avviso.translateTipoDocumento();
-
 									restFile.setDocumentiType(avviso.getTipoDocumento()); // TO-VERIFY
 									restFile.setNomeFile(LanguageUtil.get(Locale.ITALIAN, tipoDocumento)
 											+ StringPool.SPACE + StringPool.DASH + StringPool.SPACE
 											+ intPratica.getTitle(Locale.ITALIAN, true));
-									restFile.setFile("");
-
+									restFile.setFile(StringPool.BLANK);
 									Group group = GroupLocalServiceUtil.getGroup(avviso.getGroupId());
-									Organization organization = OrganizationLocalServiceUtil
-											.getOrganization(group.getOrganizationId());
+									Organization organization = OrganizationLocalServiceUtil.getOrganization(group
+											.getOrganizationId());
 									restFile.setTipoPratica(organization.getName());
-
 									listaFile.add(restFile);
 								}
 							}
 						}
 					}
-
 					risposta.setObj(listaFile);
 					risposta.setRisposta(RispostaCostanti.OK);
-
 				} catch (Exception e) {
 					_log.error(e.getMessage(), e);
 					risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
@@ -126,125 +109,90 @@ public class FirmaPostUtil {
 
 	public Risposta<RestFile> getFile(String token, String tipo, String id) {
 
-		/*
-		 * verra passato l avviso id facciamo query per riprendere file entry e
-		 * ritorniamo quel file con il contenuto
+		/**
+		 * verra passato l avviso id facciamo query per riprendere file entry e ritorniamo quel file con il contenuto
 		 */
-
 		Risposta<RestFile> risposta = new Risposta<RestFile>();
-
 		try {
-
 			Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(GetterUtil.getLong(id));
 			if (Validator.isNotNull(avviso)) {
-
 				if (Validator.isNotNull(avviso.getFileEntryIdBase())) {
-					DLFileEntry fileEntry = DLFileEntryLocalServiceUtil.fetchDLFileEntry(avviso
-							.getFileEntryIdBase());
+					DLFileEntry fileEntry = DLFileEntryLocalServiceUtil.fetchDLFileEntry(avviso.getFileEntryIdBase());
 					if (Validator.isNotNull(fileEntry)) {
-
 						RestFile restFile = new RestFile();
 						restFile.setIdFile(GetterUtil.getInteger(avviso.getAvvisoId()));
 						restFile.setDataInvio(new Date());
 						restFile.setDocumentiType(avviso.getTipoDocumento()); // TO-VERIFY
-						restFile.setNomeFile(fileEntry.getTitle() + StringPool.PERIOD
-								+ fileEntry.getExtension());
+						restFile.setNomeFile(fileEntry.getTitle() + StringPool.PERIOD + fileEntry.getExtension());
 						restFile.setTipoPratica(StringPool.BLANK);
-
 						// Inserisco il contenuto del file in Base64
 						InputStream fileInputStream = DLFileEntryLocalServiceUtil.getFileAsStream(
 								fileEntry.getFileEntryId(), fileEntry.getVersion());
 						ByteArrayOutputStream bao = new ByteArrayOutputStream();
 						IOUtils.copy(fileInputStream, bao);
 						restFile.setFile(Base64.encode(bao.toByteArray()));
-
 						risposta.setRisposta(RispostaCostanti.OK);
 						risposta.setObj(restFile);
-
 					}
 				}
 			}
-
 		} catch (SystemException | PortalException | IOException e) {
 			_log.error(e.getMessage(), e);
 			risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
 		}
-
 		return risposta;
 	}
 
 	public Risposta<String> openPratica(String token, String idFile) {
 
 		/**
-		 * mi arriva l'avviso id e mi recupero l intpraticaid bisogna ritornare
-		 * ad una pagina privata di bo con la view sistemata per gestire
-		 * direttamente la pratica portos-bo-portlet fascicolo portlet .....
-		 * intpraticaid
+		 * mi arriva l'avviso id e mi recupero l'intpraticaid bisogna ritornare ad una pagina privata di bo con la view
+		 * sistemata per gestire direttamente la pratica portos-bo-portlet fascicolo portlet ..... intpraticaid
 		 */
 		Risposta<String> risposta = new Risposta<String>();
-
 		try {
-
 			Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(GetterUtil.getLong(idFile));
 			if (Validator.isNotNull(avviso)) {
-
 				// Prendo la url della pagina da ritornare settata nel expando
 				// custom field della company
 				// di riferimento e ci aggiungo nella url l attributo relativo
 				// all id della intPratica
 				Company company = CompanyLocalServiceUtil.fetchCompany(avviso.getCompanyId());
 				if (Validator.isNotNull(company)) {
-
 					String urlToBack = GetterUtil.getString(company.getExpandoBridge().getAttribute(
 							"url-bo-gestione-pratica-firma", false));
-
-					urlToBack = urlToBack + "&_1_WAR_portosboportlet_intPraticaId="
-							+ avviso.getIntPraticaId();
+					urlToBack = urlToBack + "&_1_WAR_portosboportlet_intPraticaId=" + avviso.getIntPraticaId();
 					risposta.setObj(urlToBack);
 					risposta.setRisposta(RispostaCostanti.OK);
 				}
-
 			}
-
 		} catch (SystemException e) {
 			_log.error(e.getMessage(), e);
 			risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
 		}
-
 		return risposta;
-
 	}
 
-	public Risposta<Boolean> rifiuta(String token, String idFile, String messaggio, String cambiaFase,
-			String assegna) {
+	public Risposta<Boolean> rifiuta(String token, String idFile, String messaggio, String cambiaFase, String assegna) {
 
 		/**
-		 * mi arriva l'avviso id lo recupero e setto rifiutato e dtRifiuto e
-		 * aggiorno
-		 * 
-		 * 
+		 * mi arriva l'avviso id lo recupero e setto rifiutato e dtRifiuto e aggiorno
 		 */
 		Risposta<Boolean> risposta = new Risposta<Boolean>();
-
 		try {
-
 			Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(GetterUtil.getLong(idFile));
 			if (Validator.isNotNull(avviso)) {
 				avviso.setRifiutato(true);
 				avviso.setDtRifiuto(new Date());
 				avviso.setCommentoRifiuto(Validator.isNotNull(messaggio) ? messaggio : StringPool.BLANK);
-
 				AvvisoLocalServiceUtil.updateAvviso(avviso);
 				risposta.setObj(true);
 				risposta.setRisposta(RispostaCostanti.OK);
-
 			}
-
 		} catch (SystemException e) {
 			_log.error(e.getMessage(), e);
 			risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
 		}
-
 		return risposta;
 	}
 
@@ -252,27 +200,19 @@ public class FirmaPostUtil {
 			ServiceContext serviceContext) {
 
 		/**
-		 * Mi arriverà l avviso id e il contenuto e creero un file entry e
-		 * aggiornero l avviso con il fileEntryIdInvio
-		 * 
-		 * per la creazione del fileentry devo vedere SchedulerGeneraDocumento
-		 * per creare il filename e la folder
-		 * 
+		 * Mi arriverà l avviso id e il contenuto e creerò un file entry e aggiornerò l'avviso con il fileEntryIdInvio
+		 * per la creazione del fileentry devo vedere SchedulerGeneraDocumento per creare il filename e la folder
 		 */
 		Risposta<Boolean> risposta = new Risposta<Boolean>();
-
 		try {
 			Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(GetterUtil.getLong(idFile));
 			if (Validator.isNotNull(avviso)) {
-
 				// CREO IL FILE
 				serviceContext.setCompanyId(avviso.getCompanyId());
 				serviceContext.setScopeGroupId(avviso.getGroupId());
 				serviceContext.setUserId(avviso.getUserId());
-
-				avviso = AvvisoLocalServiceUtil.addFileFirmato(avviso.getAvvisoId(), avviso.getClassPk(),
-						fileToSave, serviceContext);
-
+				avviso = AvvisoLocalServiceUtil.addFileFirmato(avviso.getAvvisoId(), avviso.getClassPk(), fileToSave,
+						serviceContext);
 				risposta.setObj(true);
 				risposta.setRisposta(RispostaCostanti.OK);
 			}
@@ -281,7 +221,6 @@ public class FirmaPostUtil {
 			risposta.setObj(false);
 			risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
 		}
-
 		return risposta;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaUtil.java
index 73b4db92..bf9b3966 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaUtil.java
@@ -39,11 +39,11 @@ public class FirmaUtil {
 		} catch (SystemException e) {
 			_log.error(e.getMessage());
 		}
-
 		return jxPortletPreferences;
 	}
 
 	public static List<String> getCodiceFiscale(byte[] fileArray, String urlPdfExtractor) {
+
 		List<String> listaCodiciFiscali = null;
 		HttpClient client = null;
 		try {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java
index 28d02bce..95c932ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java
@@ -151,7 +151,8 @@ public interface EmailAttachmentPersistence extends BasePersistence<EmailAttachm
 	* @throws SystemException if a system exception occurred
 	*/
 	public it.tref.liferay.portos.mailmanager.model.EmailAttachment[] findByEmailId_PrevAndNext(
-		EmailAttachmentPK emailAttachmentPK, long emailId,
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK,
+		long emailId,
 		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException;
@@ -256,7 +257,7 @@ public interface EmailAttachmentPersistence extends BasePersistence<EmailAttachm
 	* @return the new email attachment
 	*/
 	public it.tref.liferay.portos.mailmanager.model.EmailAttachment create(
-		EmailAttachmentPK emailAttachmentPK);
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK);
 
 	/**
 	* Removes the email attachment with the primary key from the database. Also notifies the appropriate model listeners.
@@ -267,7 +268,7 @@ public interface EmailAttachmentPersistence extends BasePersistence<EmailAttachm
 	* @throws SystemException if a system exception occurred
 	*/
 	public it.tref.liferay.portos.mailmanager.model.EmailAttachment remove(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException;
 
@@ -284,7 +285,7 @@ public interface EmailAttachmentPersistence extends BasePersistence<EmailAttachm
 	* @throws SystemException if a system exception occurred
 	*/
 	public it.tref.liferay.portos.mailmanager.model.EmailAttachment findByPrimaryKey(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException;
 
@@ -296,7 +297,7 @@ public interface EmailAttachmentPersistence extends BasePersistence<EmailAttachm
 	* @throws SystemException if a system exception occurred
 	*/
 	public it.tref.liferay.portos.mailmanager.model.EmailAttachment fetchByPrimaryKey(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException;
 
 	/**
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentUtil.java
index 18ca38f8..b7605552 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentUtil.java
@@ -239,7 +239,8 @@ public class EmailAttachmentUtil {
 	* @throws SystemException if a system exception occurred
 	*/
 	public static it.tref.liferay.portos.mailmanager.model.EmailAttachment[] findByEmailId_PrevAndNext(
-		EmailAttachmentPK emailAttachmentPK, long emailId,
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK,
+		long emailId,
 		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException {
@@ -367,7 +368,7 @@ public class EmailAttachmentUtil {
 	* @return the new email attachment
 	*/
 	public static it.tref.liferay.portos.mailmanager.model.EmailAttachment create(
-		EmailAttachmentPK emailAttachmentPK) {
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK) {
 		return getPersistence().create(emailAttachmentPK);
 	}
 
@@ -380,7 +381,7 @@ public class EmailAttachmentUtil {
 	* @throws SystemException if a system exception occurred
 	*/
 	public static it.tref.liferay.portos.mailmanager.model.EmailAttachment remove(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException {
 		return getPersistence().remove(emailAttachmentPK);
@@ -401,7 +402,7 @@ public class EmailAttachmentUtil {
 	* @throws SystemException if a system exception occurred
 	*/
 	public static it.tref.liferay.portos.mailmanager.model.EmailAttachment findByPrimaryKey(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException,
 			it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException {
 		return getPersistence().findByPrimaryKey(emailAttachmentPK);
@@ -415,7 +416,7 @@ public class EmailAttachmentUtil {
 	* @throws SystemException if a system exception occurred
 	*/
 	public static it.tref.liferay.portos.mailmanager.model.EmailAttachment fetchByPrimaryKey(
-		EmailAttachmentPK emailAttachmentPK)
+		it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPK emailAttachmentPK)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		return getPersistence().fetchByPrimaryKey(emailAttachmentPK);
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
index 726dbdd2..de8191d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_Mail
-    build.number=80
-    build.date=1629721086258
+    build.number=82
+    build.date=1630328607960
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenancePreServletControl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenancePreServletControl.java
index f4f93fec..36b22ef4 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenancePreServletControl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenancePreServletControl.java
@@ -1,5 +1,16 @@
 package it.tref.liferay.portos.maintenance.action;
 
+import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
+import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
+import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceStatus;
+import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceType;
+
+import java.util.List;
+
+import javax.portlet.WindowState;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import com.liferay.portal.kernel.events.Action;
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.log.Log;
@@ -14,78 +25,46 @@ import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.portal.util.PortletKeys;
 
-import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
-import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
-import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceStatus;
-import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceType;
-
-import java.util.List;
-
-import javax.portlet.WindowState;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 public class MaintenancePreServletControl extends Action {
 
 	private static final Log _log = LogFactoryUtil.getLog(MaintenancePreServletControl.class);
-
 	private static final String[] allowedPortlets = new String[] { PortletKeys.LOGIN };
-
 	private static String loginUrlRedirect = null;
 
 	@Override
 	public void run(HttpServletRequest request, HttpServletResponse response) throws ActionException {
 
-		// _log.info("INZIO MaintenancePreServletControl --------------->");
-
 		try {
-
 			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
-
 			List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil
 					.findByStatus(MaintenanceStatus.IN_PROGRESS.getCode());
-
 			if (!maintenanceSchedules.isEmpty()) {
-
-				MaintenanceType maintenanceType = MaintenanceType
-						.parse(maintenanceSchedules.get(0).getType());
-
+				MaintenanceType maintenanceType = MaintenanceType.parse(maintenanceSchedules.get(0).getType());
 				if (maintenanceType == MaintenanceType.FULL) {
-
 					response.sendRedirect("/html/portal/maintenance.jsp");
 					throw new ActionException("Maintenance mode active");
-
 				} else if (maintenanceType == MaintenanceType.USER) {
-
 					User user = UserLocalServiceUtil.fetchUser(serviceContext.getUserId());
-
 					// Se request per portlet non consentite (LOGIN)
 					if (!ArrayUtil.contains(allowedPortlets, ParamUtil.getString(request, "p_p_id"))) {
 						if (user.isDefaultUser()) {// Se non loggato
 							response.sendRedirect(getLoginUrlRedirect(request));
 							throw new ActionException("Maintenance mode active");
-						} else if (!PortalUtil.isCompanyAdmin(user)) {// Se non
-																		// admin
+						} else if (!PortalUtil.isCompanyAdmin(user)) {// Se non admin
 							response.sendRedirect("/html/portal/maintenance.jsp");
 							throw new ActionException("Maintenance mode active");
 						}
 					} else {
-						if (!user.isDefaultUser() && !PortalUtil.isCompanyAdmin(user)) {// Se
-																						// loggato
-																						// non
-																						// admin
+						if (!user.isDefaultUser() && !PortalUtil.isCompanyAdmin(user)) {// Se loggato non admin
 							response.sendRedirect("/html/portal/maintenance.jsp");
 							throw new ActionException("Maintenance mode active");
 						}
 					}
 				}
-
 			}
-
 		} catch (Exception e) {
 			_log.error(e);
 		}
-
 	}
 
 	private String getLoginUrlRedirect(HttpServletRequest request) {
@@ -93,11 +72,9 @@ public class MaintenancePreServletControl extends Action {
 		if (loginUrlRedirect == null) {
 			loginUrlRedirect = PortalUtil.getPortalURL(request);
 			loginUrlRedirect = HttpUtil.addParameter(loginUrlRedirect, "p_p_id", PortletKeys.LOGIN);
-			loginUrlRedirect = HttpUtil.addParameter(loginUrlRedirect, "p_p_state",
-					WindowState.MAXIMIZED.toString());
+			loginUrlRedirect = HttpUtil.addParameter(loginUrlRedirect, "p_p_state", WindowState.MAXIMIZED.toString());
 			loginUrlRedirect = HttpUtil.addParameter(loginUrlRedirect, "p_p_lifecycle", "0");
 		}
-
 		return loginUrlRedirect;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenanceStartAction.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenanceStartAction.java
index b8b7d0ec..a667f47f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenanceStartAction.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/action/MaintenanceStartAction.java
@@ -1,10 +1,5 @@
 package it.tref.liferay.portos.maintenance.action;
 
-import com.liferay.portal.kernel.events.ActionException;
-import com.liferay.portal.kernel.events.SimpleAction;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
-
 import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
 import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
 import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceOnReboot;
@@ -12,6 +7,11 @@ import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceS
 
 import java.util.List;
 
+import com.liferay.portal.kernel.events.ActionException;
+import com.liferay.portal.kernel.events.SimpleAction;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+
 public class MaintenanceStartAction extends SimpleAction {
 
 	private static final Log _log = LogFactoryUtil.getLog(MaintenanceStartAction.class);
@@ -20,19 +20,15 @@ public class MaintenanceStartAction extends SimpleAction {
 	public void run(String[] ids) throws ActionException {
 
 		try {
-
 			List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil
 					.findByCompleted_Onreboot(Boolean.FALSE, MaintenanceOnReboot.TERMINATE.getCode());
-
 			for (MaintenanceSchedule maintenanceSchedule : maintenanceSchedules) {
 				MaintenanceScheduleLocalServiceUtil.updateStatus(
 						maintenanceSchedule.getMaintenanceScheduleId(),
 						MaintenanceStatus.FORCE_ENDED.getCode(), "Ended for server reboot.");
 			}
-
 		} catch (Exception e) {
 			_log.error("Error updating maintenance settings after reboot.", e);
 		}
-
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/control/MantenanceControlPanelEntry.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/control/MantenanceControlPanelEntry.java
index ec11e98d..92bab6cb 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/control/MantenanceControlPanelEntry.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/control/MantenanceControlPanelEntry.java
@@ -8,17 +8,14 @@ import com.liferay.portlet.BaseControlPanelEntry;
 
 public class MantenanceControlPanelEntry extends BaseControlPanelEntry {
 
+	@Override
 	public boolean hasAccessPermission(PermissionChecker permissionChecker, Group group, Portlet portlet)
 			throws Exception {
 
 		long companyId = PortalUtil.getDefaultCompanyId();
-
 		if (companyId == permissionChecker.getCompanyId()) {
 			return true;
 		}
-
 		return false;
-
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/messaging/MaintenanceScheduleMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/messaging/MaintenanceScheduleMessageListener.java
index 117bb159..cdec371c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/messaging/MaintenanceScheduleMessageListener.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/messaging/MaintenanceScheduleMessageListener.java
@@ -1,5 +1,14 @@
 package it.tref.liferay.portos.maintenance.messaging;
 
+import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
+import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
+import it.tref.liferay.portos.maintenance.service.persistence.MaintenanceScheduleActionableDynamicQuery;
+import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceStatus;
+import it.tref.liferay.portos.maintenance.util.MaintenanceDateUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
 import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil;
@@ -13,15 +22,6 @@ import com.liferay.portal.kernel.messaging.MessageListenerException;
 import com.liferay.portal.kernel.util.DateUtil;
 import com.liferay.portal.kernel.util.Validator;
 
-import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
-import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
-import it.tref.liferay.portos.maintenance.service.persistence.MaintenanceScheduleActionableDynamicQuery;
-import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceStatus;
-import it.tref.liferay.portos.maintenance.util.MaintenanceDateUtil;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class MaintenanceScheduleMessageListener implements MessageListener {
 
 	private static final Log _log = LogFactoryUtil.getLog(MaintenanceScheduleMessageListener.class);
@@ -32,9 +32,7 @@ public class MaintenanceScheduleMessageListener implements MessageListener {
 		if (_log.isDebugEnabled()) {
 			_log.debug("Inizio metodo receive. Begin: " + new SimpleDateFormat("hh:mm:ss").format(new Date()));
 		}
-
 		try {
-
 			ActionableDynamicQuery actionableDynamicQuery = new MaintenanceScheduleActionableDynamicQuery() {
 
 				@Override
@@ -47,66 +45,48 @@ public class MaintenanceScheduleMessageListener implements MessageListener {
 
 					MaintenanceSchedule maintenanceSchedule = (MaintenanceSchedule) obj;
 					try {
-
 						MaintenanceStatus status = MaintenanceStatus.parse(maintenanceSchedule.getStatus());
-
 						if (status == MaintenanceStatus.NEW) {
-
 							if (!MaintenanceScheduleLocalServiceUtil.findByStatus(
 									MaintenanceStatus.IN_PROGRESS.getCode()).isEmpty()) {
 								throw new SystemException("Concurrent maintenance scheduled.");
 							}
-
 							if (Validator.isNotNull(maintenanceSchedule.getAfter())
 									&& maintenanceSchedule.getAfter() > 0l) {
-
 								Date maintenanceStartDate = MaintenanceDateUtil
 										.getStartDate(maintenanceSchedule);
-
 								if (DateUtil.newDate().after(maintenanceStartDate)) {
 									MaintenanceScheduleLocalServiceUtil.updateStatus(
 											maintenanceSchedule.getMaintenanceScheduleId(),
 											MaintenanceStatus.IN_PROGRESS.getCode());
 								}
-
 							} else {
-
 								MaintenanceScheduleLocalServiceUtil.updateStatus(
 										maintenanceSchedule.getMaintenanceScheduleId(),
 										MaintenanceStatus.IN_PROGRESS.getCode());
 							}
-
 						} else if (status == MaintenanceStatus.IN_PROGRESS) {
-
 							if (Validator.isNotNull(maintenanceSchedule.getEnd())
 									&& DateUtil.newDate().after(maintenanceSchedule.getEnd())) {
-
 								MaintenanceScheduleLocalServiceUtil.updateStatus(
 										maintenanceSchedule.getMaintenanceScheduleId(),
 										MaintenanceStatus.ENDED.getCode());
 							}
-
 						}
-
 					} catch (Exception e) {
 						_log.error("MaintenaceMode error", e);
-
 						MaintenanceScheduleLocalServiceUtil.updateStatus(
 								maintenanceSchedule.getMaintenanceScheduleId(),
 								MaintenanceStatus.ERROR.getCode(), e.getMessage());
 					}
 				}
 			};
-
 			long count = actionableDynamicQuery.performCount();
-
 			if (count > 0) {
 				actionableDynamicQuery.performActions();
 			}
-
 		} catch (Exception e) {
 			_log.error(e, e);
 		}
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/model/impl/MaintenanceScheduleImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/model/impl/MaintenanceScheduleImpl.java
index 7ae747aa..acab11db 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/model/impl/MaintenanceScheduleImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/model/impl/MaintenanceScheduleImpl.java
@@ -15,19 +15,23 @@
 package it.tref.liferay.portos.maintenance.model.impl;
 
 /**
- * The extended model implementation for the MaintenanceSchedule service. Represents a row in the &quot;portos_maintenance_MaintenanceSchedule&quot; database table, with each column mapped to a property of this class.
+ * The extended model implementation for the MaintenanceSchedule service. Represents a row in the
+ * &quot;portos_maintenance_MaintenanceSchedule&quot; database table, with each column mapped to a property of this
+ * class.
  *
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.maintenance.model.MaintenanceSchedule} interface.
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * ServiceBuilder to copy their definitions into the
+ * {@link it.tref.liferay.portos.maintenance.model.MaintenanceSchedule} interface.
  * </p>
  *
  * @author
  */
+@SuppressWarnings("serial")
 public class MaintenanceScheduleImpl extends MaintenanceScheduleBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 *
-	 * Never reference this class directly. All methods that expect a maintenance schedule model instance should use the {@link it.tref.liferay.portos.maintenance.model.MaintenanceSchedule} interface instead.
+	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a maintenance schedule model
+	 * instance should use the {@link it.tref.liferay.portos.maintenance.model.MaintenanceSchedule} interface instead.
 	 */
 	public MaintenanceScheduleImpl() {
 	}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java
index 62b296f8..8d4498d0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java
@@ -1,5 +1,14 @@
 package it.tref.liferay.portos.maintenance.portlet;
 
+import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
+import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleServiceUtil;
+
+import java.util.Calendar;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletSession;
+
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
@@ -17,15 +26,6 @@ import com.liferay.portal.service.ServiceContextFactory;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
-import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
-import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleServiceUtil;
-
-import java.util.Calendar;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletSession;
-
 /**
  * Portlet implementation class AdminMaintenancePortlet
  */
@@ -36,45 +36,33 @@ public class AdminMaintenancePortlet extends MVCPortlet {
 	public void maintain(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
 
 		PortletSession portletSession = actionRequest.getPortletSession();
-
 		String message = ParamUtil.getString(actionRequest, "message");
-
 		String className = LanguageUtil
 				.get(LocaleUtil.getDefault(),
 						"the-sign-in-process-is-temporarily-disabled-because-the-portal-is-undergoing-a-routine-maintenance-upgrade");
-
 		if (Validator.isNotNull(message)) {
 			className = message;
 		}
-
 		Class<?> clazz = ClassResolverUtil.resolve("com.liferay.portal.util.MaintenanceUtil",
 				PortalClassLoaderUtil.getClassLoader());
 		ReflectionUtil.getDeclaredMethod(clazz, "maintain", String.class, String.class).invoke(null,
 				portletSession.getId(), className);
-
 		_log.info("Maintenance session id: " + portletSession.getId());
-
 	}
 
-	public void deleteMaintenanceSchedule(ActionRequest actionRequest, ActionResponse actionResponse)
-			throws Exception {
-		_log.info("deleteMaintenanceSchedule - Inizio metodo");
+	public void deleteMaintenanceSchedule(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
 
+		_log.info("deleteMaintenanceSchedule - Inizio metodo");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
 		long maintenanceScheduleId = ParamUtil.getLong(actionRequest, "maintenanceScheduleId");
-
 		MaintenanceScheduleServiceUtil.deleteMaintenanceSchedule(maintenanceScheduleId, serviceContext);
-
 	}
 
-	public void editMaintenanceSchedule(ActionRequest actionRequest, ActionResponse actionResponse)
-			throws Exception {
-		_log.info("editMaintenanceSchedule - Inizio metodo");
+	public void editMaintenanceSchedule(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
 
+		_log.info("editMaintenanceSchedule - Inizio metodo");
 		String cmd = ParamUtil.getString(actionRequest, Constants.CMD);
-
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-
 		long maintenanceScheduleId = ParamUtil.getLong(actionRequest, "maintenanceScheduleId");
 		String type = ParamUtil.getString(actionRequest, "type");
 		String reason = ParamUtil.getString(actionRequest, "reason");
@@ -83,32 +71,24 @@ public class AdminMaintenancePortlet extends MVCPortlet {
 		String onreboot = ParamUtil.getString(actionRequest, "onreboot");
 		String status = ParamUtil.getString(actionRequest, "status");
 		String statusMessage = ParamUtil.getString(actionRequest, "statusMessage");
-
 		Calendar calendarEnd = Calendar.getInstance();
 		calendarEnd.set(ParamUtil.getInteger(actionRequest, "endYear"),
-				ParamUtil.getInteger(actionRequest, "endMonth") + 1,
-				ParamUtil.getInteger(actionRequest, "endDay"),
-				ParamUtil.getInteger(actionRequest, "endHour"),
-				ParamUtil.getInteger(actionRequest, "endMinute"));
-
+				ParamUtil.getInteger(actionRequest, "endMonth") + 1, ParamUtil.getInteger(actionRequest, "endDay"),
+				ParamUtil.getInteger(actionRequest, "endHour"), ParamUtil.getInteger(actionRequest, "endMinute"));
 		MaintenanceSchedule maintenanceSchedule = null;
-
 		try {
-
 			if (cmd.equals(Constants.ADD)) {
 				maintenanceSchedule = MaintenanceScheduleServiceUtil.addMaintenanceSchedule(type, reason,
 						portalMessage, after, calendarEnd.getTime(), onreboot, serviceContext);
 			} else if (cmd.equals(Constants.UPDATE)) {
-				maintenanceSchedule = MaintenanceScheduleServiceUtil.updateMaintenanceSchedule(
-						maintenanceScheduleId, type, reason, portalMessage, after, calendarEnd.getTime(),
-						onreboot, status, statusMessage, serviceContext);
+				maintenanceSchedule = MaintenanceScheduleServiceUtil.updateMaintenanceSchedule(maintenanceScheduleId,
+						type, reason, portalMessage, after, calendarEnd.getTime(), onreboot, status, statusMessage,
+						serviceContext);
 			}
-
 		} catch (PortalException e) {
 			_log.error(e);
 			SessionErrors.add(actionRequest, e.getClass());
 		}
-
 		if (SessionErrors.isEmpty(actionRequest)) {
 			actionResponse.setRenderParameter("maintenanceScheduleId",
 					String.valueOf(maintenanceSchedule.getMaintenanceScheduleId()));
@@ -117,6 +97,5 @@ public class AdminMaintenancePortlet extends MVCPortlet {
 			actionResponse.setRenderParameter("mvcPath", "/html/admin_maintenance/edit.jsp");
 			PortalUtil.copyRequestParameters(actionRequest, actionResponse);
 		}
-
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/MaintenancePollerPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/MaintenancePollerPortlet.java
index b0d4c3f3..d5749804 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/MaintenancePollerPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/MaintenancePollerPortlet.java
@@ -1,12 +1,5 @@
 package it.tref.liferay.portos.maintenance.portlet;
 
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
-import com.liferay.portal.kernel.json.JSONObject;
-import com.liferay.portal.kernel.util.DateUtil;
-import com.liferay.portal.kernel.util.GetterUtil;
-import com.liferay.util.bridges.mvc.MVCPortlet;
-
 import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
 import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
 import it.tref.liferay.portos.maintenance.util.DateTimeUtil;
@@ -22,55 +15,46 @@ import javax.portlet.PortletException;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
-/**
- * Portlet implementation class MaintenancePollerPortlet
- */
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.util.DateUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.util.bridges.mvc.MVCPortlet;
+
 public class MaintenancePollerPortlet extends MVCPortlet {
 
 	private static final long ONE_HOUR = 3600000;// ms
 
 	@Override
-	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse)
-			throws IOException, PortletException {
+	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException,
+			PortletException {
 
 		String resourceID = GetterUtil.getString(resourceRequest.getResourceID());
-
 		if ("maintenancePoller".equals(resourceID)) {
-
 			try {
-
 				JSONObject responseData = JSONFactoryUtil.createJSONObject();
 				responseData.put("maintenanceExpected", false);
-
 				List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil
 						.findByStatus(MaintenanceStatus.NEW.getCode());
-
 				for (MaintenanceSchedule maintenanceSchedule : maintenanceSchedules) {
-
 					Date maintenanceStartDate = DateTimeUtil.scaleToNextMinute(MaintenanceDateUtil
 							.getStartDate(maintenanceSchedule));
-
 					long timeDiff = maintenanceStartDate.getTime() - DateUtil.newDate().getTime();
-
 					if (timeDiff < ONE_HOUR) {
 						responseData.put("maintenanceExpected", true);
 						responseData.put("startFrom", timeDiff);
-						responseData.put("maintenanceScheduleId",
-								maintenanceSchedule.getMaintenanceScheduleId());
+						responseData.put("maintenanceScheduleId", maintenanceSchedule.getMaintenanceScheduleId());
 						break;
 					}
 				}
-
 				PrintWriter out = resourceResponse.getWriter();
 				out.println(responseData.toString());
 				out.flush();
-
 			} catch (SystemException e) {
 				e.printStackTrace();
 			}
-
 		}
-
 		super.serveResource(resourceRequest, resourceResponse);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleLocalServiceImpl.java
index 69777e24..f2919692 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleLocalServiceImpl.java
@@ -12,14 +12,6 @@
 
 package it.tref.liferay.portos.maintenance.service.impl;
 
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.util.DateUtil;
-import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portal.model.User;
-import com.liferay.portal.service.ServiceContext;
-
 import it.tref.liferay.portos.maintenance.MaintenanceOnRebootException;
 import it.tref.liferay.portos.maintenance.MaintenanceStatusException;
 import it.tref.liferay.portos.maintenance.MaintenanceTypeException;
@@ -37,19 +29,25 @@ import it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceT
 import java.util.Date;
 import java.util.List;
 
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.DateUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.User;
+import com.liferay.portal.service.ServiceContext;
+
 /**
  * The implementation of the maintenance schedule local service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are
- * added, rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalService}
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalService}
  * interface.
  *
  * <p>
- * This is a local service. Methods of this service will not have security
- * checks based on the propagated JAAS credentials because this service can only
- * be accessed from within the same VM.
+ * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
+ * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
  * @author
@@ -58,73 +56,58 @@ import java.util.List;
  */
 public class MaintenanceScheduleLocalServiceImpl extends MaintenanceScheduleLocalServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 * 
-	 * Never reference this interface directly. Always use {@link
-	 * it.tref.liferay
-	 * .portos.maintenance.service.MaintenanceScheduleLocalServiceUtil} to
-	 * access the maintenance schedule local service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil} to access the maintenance
+	 * schedule local service.
 	 */
 
 	@Override
-	public MaintenanceSchedule addMaintenanceSchedule(String type, String reason, String portalMessage,
-			long after, Date end, String onreboot, ServiceContext serviceContext) throws SystemException,
-			PortalException {
+	public MaintenanceSchedule addMaintenanceSchedule(String type, String reason, String portalMessage, long after,
+			Date end, String onreboot, ServiceContext serviceContext) throws SystemException, PortalException {
 
 		MaintenanceSchedule maintenanceSchedule = MaintenanceScheduleUtil.create(counterLocalService
 				.increment(MaintenanceSchedule.class.getName()));
-
 		validate(type, reason, after, end, onreboot);
-
 		maintenanceSchedule.setCompanyId(serviceContext.getCompanyId());
 		maintenanceSchedule.setUserId(serviceContext.getUserId());
 		User user = userLocalService.fetchUser(serviceContext.getUserId());
 		maintenanceSchedule.setUserName(Validator.isNotNull(user) ? user.getScreenName() : StringPool.BLANK);
 		maintenanceSchedule.setCreateDate(DateUtil.newDate());
 		maintenanceSchedule.setModifiedDate(DateUtil.newDate());
-
 		maintenanceSchedule.setType(type);
 		maintenanceSchedule.setReason(reason);
 		maintenanceSchedule.setPortalMessage(portalMessage != null ? portalMessage : StringPool.BLANK);
 		maintenanceSchedule.setAfter(after);
 		maintenanceSchedule.setEnd(end != null ? DateTimeUtil.scaleToNextMinute(end) : null);
 		maintenanceSchedule.setOnreboot(onreboot);
-
 		maintenanceSchedule.setStatus(MaintenanceStatus.NEW.getCode());
 		maintenanceSchedule.setCompleted(Boolean.FALSE);
-
 		return addMaintenanceSchedule(maintenanceSchedule);
 	}
 
 	@Override
-	public MaintenanceSchedule updateMaintenanceSchedule(long maintenanceScheduleId, String type,
-			String reason, String portalMessage, long after, Date end, String onreboot, String status,
-			String statusMessage, ServiceContext serviceContext) throws SystemException, PortalException {
+	public MaintenanceSchedule updateMaintenanceSchedule(long maintenanceScheduleId, String type, String reason,
+			String portalMessage, long after, Date end, String onreboot, String status, String statusMessage,
+			ServiceContext serviceContext) throws SystemException, PortalException {
 
 		MaintenanceSchedule maintenanceSchedule = getMaintenanceSchedule(maintenanceScheduleId);
-
 		validate(type, reason, after, end, onreboot);
-
 		if (Validator.isNotNull(status)) {
-			maintenanceSchedule = updateStatus(maintenanceSchedule.getMaintenanceScheduleId(), status,
-					statusMessage);
+			maintenanceSchedule = updateStatus(maintenanceSchedule.getMaintenanceScheduleId(), status, statusMessage);
 		}
-
 		maintenanceSchedule.setModifiedDate(DateUtil.newDate());
-
 		maintenanceSchedule.setType(type);
 		maintenanceSchedule.setReason(reason);
 		maintenanceSchedule.setPortalMessage(portalMessage != null ? portalMessage : StringPool.BLANK);
 		maintenanceSchedule.setAfter(after);
 		maintenanceSchedule.setEnd(end != null ? DateTimeUtil.scaleToNextMinute(end) : null);
 		maintenanceSchedule.setOnreboot(onreboot);
-
 		return updateMaintenanceSchedule(maintenanceSchedule);
 	}
 
 	@Override
-	public MaintenanceSchedule updateStatus(long maintenanceScheduleId, String status)
-			throws PortalException, SystemException {
+	public MaintenanceSchedule updateStatus(long maintenanceScheduleId, String status) throws PortalException,
+			SystemException {
 
 		return updateStatus(maintenanceScheduleId, status, null);
 	}
@@ -139,19 +122,15 @@ public class MaintenanceScheduleLocalServiceImpl extends MaintenanceScheduleLoca
 		} catch (IllegalArgumentException e) {
 			throw new MaintenanceStatusException(status);
 		}
-
 		MaintenanceSchedule maintenanceSchedule = getMaintenanceSchedule(maintenanceScheduleId);
 		maintenanceSchedule.setStatus(maintenanceStatus.getCode());
 		maintenanceSchedule.setStatusMessage(statusMessage);
-
-		if (maintenanceStatus == MaintenanceStatus.ENDED
-				|| maintenanceStatus == MaintenanceStatus.FORCE_ENDED
+		if (maintenanceStatus == MaintenanceStatus.ENDED || maintenanceStatus == MaintenanceStatus.FORCE_ENDED
 				|| maintenanceStatus == MaintenanceStatus.ERROR) {
 			maintenanceSchedule.setCompleted(Boolean.TRUE);
 		} else {
 			maintenanceSchedule.setCompleted(Boolean.FALSE);
 		}
-
 		return updateMaintenanceSchedule(maintenanceSchedule);
 	}
 
@@ -160,44 +139,37 @@ public class MaintenanceScheduleLocalServiceImpl extends MaintenanceScheduleLoca
 		return maintenanceSchedulePersistence.findByStatus(status);
 	}
 
-	private void validate(String type, String reason, long after, Date end, String onreboot)
-			throws PortalException {
-
+	private void validate(String type, String reason, long after, Date end, String onreboot) throws PortalException {
 		if (Validator.isNull(type)) {
 			throw new RequiredMaintenanceTypeException();
 		}
-
 		try {
 			MaintenanceType.parse(type);
 		} catch (IllegalArgumentException e) {
 			throw new MaintenanceTypeException(type);
 		}
-
 		if (Validator.isNull(onreboot)) {
 			throw new RequiredMaintenanceOnRebootException();
 		}
-
 		try {
 			MaintenanceOnReboot.parse(onreboot);
 		} catch (IllegalArgumentException e) {
 			throw new MaintenanceOnRebootException(onreboot);
 		}
-
 		if (Validator.isNull(reason)) {
 			throw new RequiredMaintenanceReasonException();
 		}
-
 	}
 
 	@Override
-	public List<MaintenanceSchedule> findByC_Completed(long companyId, boolean completed)
-			throws SystemException {
+	public List<MaintenanceSchedule> findByC_Completed(long companyId, boolean completed) throws SystemException {
 		return maintenanceSchedulePersistence.findByC_Completed(companyId, completed);
 	}
 
 	@Override
 	public List<MaintenanceSchedule> findByCompleted_Onreboot(boolean completed, String onreboot)
 			throws SystemException {
+
 		return maintenanceSchedulePersistence.findByCompleted_Onreboot(completed, onreboot);
 	}
 
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleServiceImpl.java
index bfebc7c7..cdeda63f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/impl/MaintenanceScheduleServiceImpl.java
@@ -12,28 +12,25 @@
 
 package it.tref.liferay.portos.maintenance.service.impl;
 
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.service.ServiceContext;
-import com.liferay.portal.util.PortalUtil;
-
 import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
 import it.tref.liferay.portos.maintenance.service.base.MaintenanceScheduleServiceBaseImpl;
 
 import java.util.Date;
 
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.util.PortalUtil;
+
 /**
  * The implementation of the maintenance schedule remote service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are
- * added, rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.maintenance.service.MaintenanceScheduleService}
- * interface.
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.tref.liferay.portos.maintenance.service.MaintenanceScheduleService} interface.
  *
  * <p>
- * This is a remote service. Methods of this service are expected to have
- * security checks based on the propagated JAAS credentials because this service
- * can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * credentials because this service can be accessed remotely.
  * </p>
  *
  * @author
@@ -42,45 +39,41 @@ import java.util.Date;
  */
 public class MaintenanceScheduleServiceImpl extends MaintenanceScheduleServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
-	 * 
-	 * Never reference this interface directly. Always use {@link
-	 * it.tref.liferay
-	 * .portos.maintenance.service.MaintenanceScheduleServiceUtil} to access the
-	 * maintenance schedule remote service.
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.tref.liferay.portos.maintenance.service.MaintenanceScheduleServiceUtil} to access the maintenance schedule
+	 * remote service.
 	 */
 
-	public MaintenanceSchedule addMaintenanceSchedule(String type, String reason, String portalMessage,
-			long after, Date end, String onreboot, ServiceContext serviceContext) throws Exception {
+	@Override
+	public MaintenanceSchedule addMaintenanceSchedule(String type, String reason, String portalMessage, long after,
+			Date end, String onreboot, ServiceContext serviceContext) throws Exception {
 
 		if (!PortalUtil.isCompanyAdmin(getUser())) {
 			throw new PortalException("Access denied!");
 		}
-
-		return maintenanceScheduleLocalService.addMaintenanceSchedule(type, reason, portalMessage, after,
-				end, onreboot, serviceContext);
+		return maintenanceScheduleLocalService.addMaintenanceSchedule(type, reason, portalMessage, after, end,
+				onreboot, serviceContext);
 	}
 
-	public MaintenanceSchedule updateMaintenanceSchedule(long maintenanceScheduleId, String type,
-			String reason, String portalMessage, long after, Date end, String onreboot, String status,
-			String statusMessage, ServiceContext serviceContext) throws Exception {
+	@Override
+	public MaintenanceSchedule updateMaintenanceSchedule(long maintenanceScheduleId, String type, String reason,
+			String portalMessage, long after, Date end, String onreboot, String status, String statusMessage,
+			ServiceContext serviceContext) throws Exception {
 
 		if (!PortalUtil.isCompanyAdmin(getUser())) {
 			throw new PortalException("Access denied!");
 		}
-
 		return maintenanceScheduleLocalService.updateMaintenanceSchedule(maintenanceScheduleId, type, reason,
 				portalMessage, after, end, onreboot, status, statusMessage, serviceContext);
 	}
 
-	public MaintenanceSchedule deleteMaintenanceSchedule(long maintenanceScheduleId,
-			ServiceContext serviceContext) throws Exception {
+	@Override
+	public MaintenanceSchedule deleteMaintenanceSchedule(long maintenanceScheduleId, ServiceContext serviceContext)
+			throws Exception {
 
 		if (!PortalUtil.isCompanyAdmin(getUser())) {
 			throw new PortalException("Access denied!");
 		}
-
 		return maintenanceScheduleLocalService.deleteMaintenanceSchedule(maintenanceScheduleId);
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/servlet/MaintenanceServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/servlet/MaintenanceServlet.java
index e8b061d2..7bdc802b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/servlet/MaintenanceServlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/servlet/MaintenanceServlet.java
@@ -1,16 +1,5 @@
 package it.tref.liferay.portos.maintenance.servlet;
 
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
-import com.liferay.portal.kernel.json.JSONObject;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.servlet.ServletResponseUtil;
-import com.liferay.portal.kernel.util.DateUtil;
-import com.liferay.portal.kernel.util.PropsUtil;
-import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portal.service.ServiceContext;
-import com.liferay.portal.service.ServiceContextFactory;
-
 import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule;
 import it.tref.liferay.portos.maintenance.service.MaintenanceScheduleLocalServiceUtil;
 import it.tref.liferay.portos.maintenance.util.DateTimeUtil;
@@ -36,6 +25,17 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
 
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+import com.liferay.portal.kernel.util.DateUtil;
+import com.liferay.portal.kernel.util.PropsUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.ServiceContextFactory;
+
 public class MaintenanceServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 4568712977896061068L;
@@ -69,17 +69,12 @@ public class MaintenanceServlet extends HttpServlet {
 			IOException {
 
 		JSONObject jsonResponse = JSONFactoryUtil.createJSONObject();
-
 		response.setContentType(CONTENT_TYPE_APPLICATION_JSON);
-
 		try {
-
 			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 			String pathInfo = request.getPathInfo();
 			Map<String, String[]> params = request.getParameterMap();
-
 			checkIpAddress(request);
-
 			if (START_PATH.equals(pathInfo)) {
 				MaintenanceSchedule maintenanceSchedule = startMaintenance(params, serviceContext);
 				if (Validator.isNotNull(maintenanceSchedule)) {
@@ -96,11 +91,9 @@ public class MaintenanceServlet extends HttpServlet {
 			} else {
 				throw new UnsupportedOperationException();
 			}
-
 			jsonResponse.put("success", "true");
 			response.setStatus(HttpServletResponse.SC_OK);
 			ServletResponseUtil.write(response, jsonResponse.toString());
-
 		} catch (IllegalAccessException e) {
 			sendErrorResponse(response, HttpServletResponse.SC_FORBIDDEN, e.getMessage());
 		} catch (UnsupportedOperationException e) {
@@ -112,17 +105,14 @@ public class MaintenanceServlet extends HttpServlet {
 			_log.error(e);
 			sendErrorResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
 		}
-
 	}
 
 	private MaintenanceSchedule stopMaintenance(Map<String, String[]> params) throws IllegalAccessException,
 			IllegalArgumentException, InvocationTargetException, Exception {
 
 		MaintenanceSchedule result = null;
-
 		boolean force = params.get(FORCE_PARAM) != null && params.get(FORCE_PARAM).length > 0 ? Boolean
 				.valueOf(params.get(FORCE_PARAM)[0]) : false;
-
 		if (force) {
 			PortalMaintenanceUtil.stopMaintenaceMode();
 			List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil
@@ -135,36 +125,26 @@ public class MaintenanceServlet extends HttpServlet {
 			}
 			return null;
 		}
-
 		int stopAfter = params.get(STOP_AFTER_PARAM) != null && params.get(STOP_AFTER_PARAM).length > 0 ? Integer
 				.valueOf(params.get(STOP_AFTER_PARAM)[0]) : 0;
-
 		List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil
 				.findByStatus(MaintenanceStatus.IN_PROGRESS.getCode());
-
 		if (!maintenanceSchedules.isEmpty()) {
-
 			if (maintenanceSchedules.size() > 1) {
 				_log.warn("Multiple maintenance in progress...");
 			}
-
 			Date end = DateUtil.newDate();
-
 			if (stopAfter > 0) {
 				Calendar calendar = Calendar.getInstance();
 				calendar.add(Calendar.MINUTE, stopAfter);
 				end = calendar.getTime();
 			}
-
 			for (MaintenanceSchedule maintenanceSchedule : maintenanceSchedules) {
 				maintenanceSchedule.setEnd(DateTimeUtil.scaleToNextMinute(end));
 				result = MaintenanceScheduleLocalServiceUtil.updateMaintenanceSchedule(maintenanceSchedule);
 			}
-
 		}
-
 		return result;
-
 	}
 
 	private MaintenanceSchedule startMaintenance(Map<String, String[]> params, ServiceContext serviceContext)
@@ -172,18 +152,15 @@ public class MaintenanceServlet extends HttpServlet {
 
 		boolean force = params.get(FORCE_PARAM) != null && params.get(FORCE_PARAM).length > 0 ? Boolean
 				.valueOf(params.get(FORCE_PARAM)[0]) : false;
-
 		if (force) {
 			PortalMaintenanceUtil.startMaintenaceMode(UUID.randomUUID().toString(), FORCED_MESSAGE);
 			return null;
 		}
-
 		Date end = null;
 		String[] endParam = params.get(END_PARAM);
 		if (endParam != null && endParam.length > 0) {
 			end = sdf.parse(endParam[0]);
 		}
-
 		String type = params.get(TYPE_PARAM) != null && params.get(TYPE_PARAM).length > 0 ? params
 				.get(TYPE_PARAM)[0] : null;
 		String reason = params.get(REASON_PARAM) != null && params.get(REASON_PARAM).length > 0 ? params
@@ -194,10 +171,8 @@ public class MaintenanceServlet extends HttpServlet {
 				.get(ONREBOOT_PARAM)[0] : null;
 		String message = params.get(MESSAGE_PARAM) != null && params.get(MESSAGE_PARAM).length > 0 ? params
 				.get(MESSAGE_PARAM)[0] : null;
-
 		return MaintenanceScheduleLocalServiceUtil.addMaintenanceSchedule(type, reason, message, after, end,
 				onreboot, serviceContext);
-
 	}
 
 	private void checkIpAddress(HttpServletRequest request) throws IllegalAccessException {
@@ -206,10 +181,8 @@ public class MaintenanceServlet extends HttpServlet {
 		if (Validator.isNull(clientIpAddress)) {
 			clientIpAddress = request.getRemoteAddr();
 		}
-
 		boolean found = false;
 		for (String ipAddress : allowedIpAddresses) {
-
 			if (ipAddress.contains("/")) {
 				SubnetUtils subnetUtils = new SubnetUtils(ipAddress);
 				SubnetInfo subnetInfo = subnetUtils.getInfo();
@@ -222,20 +195,18 @@ public class MaintenanceServlet extends HttpServlet {
 				break;
 			}
 		}
-
 		if (!found) {
 			throw new IllegalAccessException("Your IP address '" + clientIpAddress + "' is not authorized");
 		}
-
 	}
 
 	private void sendErrorResponse(HttpServletResponse response, int scInternalServerError, String message)
 			throws IOException {
+
 		JSONObject jsonResponse = JSONFactoryUtil.createJSONObject();
 		response.setStatus(scInternalServerError);
 		jsonResponse.put("success", false);
 		jsonResponse.put("message", message);
 		ServletResponseUtil.write(response, jsonResponse.toString());
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/DateTimeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/DateTimeUtil.java
index 3fd21345..390a3613 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/DateTimeUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/DateTimeUtil.java
@@ -7,7 +7,7 @@ public class DateTimeUtil {
 
 	/**
 	 * This method remove seconds and milliseconds to the input date.
-	 * 
+	 *
 	 * @param input
 	 * @return the input with seconds and milliseconds equal to 0
 	 */
@@ -22,7 +22,7 @@ public class DateTimeUtil {
 	/**
 	 * This method add a minute , remove seconds and milliseconds to the input
 	 * date. If seconds and milliseconds are equal to 0, return the input.
-	 * 
+	 *
 	 * @param input
 	 * @return the date scaled or the input if doesn't require scaling.
 	 */
@@ -37,5 +37,4 @@ public class DateTimeUtil {
 		}
 		return input;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceConstants.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceConstants.java
index 993e0601..b346ed44 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceConstants.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceConstants.java
@@ -37,10 +37,8 @@ public class MaintenanceConstants {
 					return maintenanceType;
 				}
 			}
-
 			throw new IllegalArgumentException("Invalid MaintenanceType code: " + code);
 		}
-
 	}
 
 	public enum MaintenanceOnReboot {
@@ -78,7 +76,6 @@ public class MaintenanceConstants {
 					return maintenanceOnReboot;
 				}
 			}
-
 			throw new IllegalArgumentException("Invalid MaintenanceOnReboot code: " + code);
 		}
 
@@ -120,10 +117,7 @@ public class MaintenanceConstants {
 					return maintenanceStatus;
 				}
 			}
-
 			throw new IllegalArgumentException("Invalid MaintenanceStatus code: " + code);
 		}
-
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceDateUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceDateUtil.java
index 7b4fa06a..725b69b1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceDateUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/MaintenanceDateUtil.java
@@ -11,16 +11,13 @@ public class MaintenanceDateUtil {
 
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(createDate);
-
 		if (after > 0) {
 			calendar.add(Calendar.MINUTE, after);
 		}
-
 		return calendar.getTime();
 	}
 
 	public static Date getStartDate(MaintenanceSchedule maintenanceSchedule) {
 		return getStartDate(maintenanceSchedule.getCreateDate(), (int) maintenanceSchedule.getAfter());
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/PortalMaintenanceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/PortalMaintenanceUtil.java
index a0eed203..1e0a29f8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/PortalMaintenanceUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/util/PortalMaintenanceUtil.java
@@ -1,5 +1,7 @@
 package it.tref.liferay.portos.maintenance.util;
 
+import java.lang.reflect.InvocationTargetException;
+
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.util.ClassResolverUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
@@ -7,8 +9,6 @@ import com.liferay.portal.kernel.util.PortalClassLoaderUtil;
 import com.liferay.portal.kernel.util.ReflectionUtil;
 import com.liferay.portal.kernel.util.Validator;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class PortalMaintenanceUtil {
 
 	public static void startMaintenaceMode(String sessionId, String classNameParam)
@@ -17,11 +17,9 @@ public class PortalMaintenanceUtil {
 		String className = LanguageUtil
 				.get(LocaleUtil.getDefault(),
 						"the-sign-in-process-is-temporarily-disabled-because-the-portal-is-undergoing-a-routine-maintenance-upgrade");
-
 		if (Validator.isNotNull(classNameParam)) {
 			className = classNameParam;
 		}
-
 		Class<?> clazz = ClassResolverUtil.resolve("com.liferay.portal.util.MaintenanceUtil",
 				PortalClassLoaderUtil.getClassLoader());
 		ReflectionUtil.getDeclaredMethod(clazz, "maintain", String.class, String.class).invoke(null,
@@ -36,5 +34,4 @@ public class PortalMaintenanceUtil {
 		ReflectionUtil.getDeclaredMethod(clazz, "cancel", new Class<?>[0]).invoke(null, new Object[0]);
 
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties
index df8d6518..2fdd466a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_maintenance
-    build.number=44
-    build.date=1605008600382
+    build.number=46
+    build.date=1629983422591
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp
index e6211f90..0a81415e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp
@@ -2,75 +2,74 @@
 <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceType"%>
 <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceOnReboot"%>
 <%@include file="/html/admin_maintenance/init.jsp"%>
-
 <%
-	long maintenanceScheduleId = ParamUtil.getLong(request,"maintenanceScheduleId");
-
-	MaintenanceSchedule maintenanceSchedule = null;
-	if(Validator.isNotNull(maintenanceScheduleId)){
-	  maintenanceSchedule = MaintenanceScheduleLocalServiceUtil.getMaintenanceSchedule(maintenanceScheduleId);
-	}
+long maintenanceScheduleId = ParamUtil.getLong(request,"maintenanceScheduleId");
+MaintenanceSchedule maintenanceSchedule = null;
+if (Validator.isNotNull(maintenanceScheduleId)) {
+	maintenanceSchedule = MaintenanceScheduleLocalServiceUtil.getMaintenanceSchedule(maintenanceScheduleId);
+}
 %>
-
-<liferay-ui:error exception="<%= RequiredMaintenanceTypeException.class %>" message="please-enter-type-maintenance-schedule" />
-<liferay-ui:error exception="<%= RequiredMaintenanceReasonException.class %>" message="please-enter-reason-maintenance-schedule" />
-<liferay-ui:error exception="<%= MaintenanceTypeException.class %>" message="please-enter-valid-type-maintenance-schedule" />
-<liferay-ui:error exception="<%= MaintenanceStatusException.class %>" message="please-enter-valid-status-maintenance-schedule" />
-<liferay-ui:error exception="<%= MaintenanceAfterException.class %>" message="please-enter-valid-after-maintenance-schedule" />
-<liferay-ui:error exception="<%= MaintenanceEndException.class %>" message="please-enter-valid-end-maintenance-schedule" />
-
-
+<liferay-ui:error exception="<%= RequiredMaintenanceTypeException.class %>"
+		message="please-enter-type-maintenance-schedule" />
+<liferay-ui:error exception="<%= RequiredMaintenanceReasonException.class %>"
+		message="please-enter-reason-maintenance-schedule" />
+<liferay-ui:error exception="<%= MaintenanceTypeException.class %>"
+		message="please-enter-valid-type-maintenance-schedule" />
+<liferay-ui:error exception="<%= MaintenanceStatusException.class %>"
+		message="please-enter-valid-status-maintenance-schedule" />
+<liferay-ui:error exception="<%= MaintenanceAfterException.class %>"
+		message="please-enter-valid-after-maintenance-schedule" />
+<liferay-ui:error exception="<%= MaintenanceEndException.class %>"
+		message="please-enter-valid-end-maintenance-schedule" />
 <liferay-portlet:actionURL name="editMaintenanceSchedule" var="editMaintenanceScheduleURL" />
-
 <aui:form name="fm" method="post" action="<%= editMaintenanceScheduleURL.toString() %>">
-
-	<aui:input type="hidden" name="maintenanceScheduleId" 
-		value="<%= (maintenanceSchedule == null ? 0 : maintenanceSchedule.getMaintenanceScheduleId()) %>" />
-		
-	<aui:input type="hidden" name="<%= Constants.CMD %>" 
-		value="<%= (maintenanceSchedule == null ? Constants.ADD : Constants.UPDATE) %>" />
-		
+	<aui:input type="hidden" name="maintenanceScheduleId"
+			value="<%= (maintenanceSchedule == null ? 0 : maintenanceSchedule.getMaintenanceScheduleId()) %>" />
+	<aui:input type="hidden" name="<%= Constants.CMD %>"
+			value="<%= (maintenanceSchedule == null ? Constants.ADD : Constants.UPDATE) %>" />
 	<aui:model-context bean="<%= maintenanceSchedule %>" model="<%= MaintenanceSchedule.class %>" />
-	
-	<aui:select name="type" label="maintenance-schedule-type" required="<%= true %>">
-		<% for(MaintenanceType maintenanceType : MaintenanceType.values()){ %>
-			<aui:option value="<%=maintenanceType.getCode() %>"><%=maintenanceType.getDescription() %></aui:option>
-		<%} %>
+	<aui:select name="type" label="maintenance-schedule-type" required="true">
+		<%
+		for (MaintenanceType maintenanceType : MaintenanceType.values()) {
+		%>
+			<aui:option value="<%= maintenanceType.getCode() %>"><%= maintenanceType.getDescription() %></aui:option>
+		<%
+		}
+		%>
 	</aui:select>
-	
-	<aui:input name="reason" label="maintenance-schedule-reason" type="textarea"
-		required="<%= true %>" showRequiredLabel="<%= false %>" />
-
+	<aui:input name="reason" label="maintenance-schedule-reason" type="textarea" required="true"
+			showRequiredLabel="false" />
 	<aui:input name="portalMessage" label="maintenance-schedule-portal-message" cssClass="input-xxlarge" />
-	
 	<aui:input name="after" label="maintenance-schedule-after" cssClass="input-xxlarge" />
-	
 	<aui:input name="end" label="maintenance-schedule-end" cssClass="input-xxlarge" />
-	
-	<aui:select name="onreboot" label="maintenance-schedule-onreboot" required="<%= true %>">
-		<% for(MaintenanceOnReboot maintenanceOnReboot : MaintenanceOnReboot.values()){ %>
-			<aui:option value="<%=maintenanceOnReboot.getCode() %>"><%=maintenanceOnReboot.getDescription() %></aui:option>
-		<%} %>
+	<aui:select name="onreboot" label="maintenance-schedule-onreboot" required="true">
+		<%
+		for (MaintenanceOnReboot maintenanceOnReboot : MaintenanceOnReboot.values()) {
+		%>
+			<aui:option value="<%= maintenanceOnReboot.getCode() %>">
+				<%= maintenanceOnReboot.getDescription() %>
+			</aui:option>
+		<%
+		}
+		%>
 	</aui:select>
-	
-	<aui:select name="status" label="maintenance-schedule-status" required="<%= true %>">
-		<% for(MaintenanceStatus maintenanceStatus : MaintenanceStatus.values()){ %>
-			<aui:option value="<%=maintenanceStatus.getCode() %>"><%=maintenanceStatus.getDescription() %></aui:option>
-		<%} %>
+	<aui:select name="status" label="maintenance-schedule-status" required="true">
+		<%
+		for (MaintenanceStatus maintenanceStatus : MaintenanceStatus.values()) {
+		%>
+			<aui:option value="<%= maintenanceStatus.getCode() %>">
+				<%= maintenanceStatus.getDescription() %>
+			</aui:option>
+		<%
+		}
+		%>
 	</aui:select>
-	
 	<aui:input name="statusMessage" label="maintenance-schedule-status-message" cssClass="input-xxlarge" />
-	
 	<aui:button-row>
-
-		<aui:button primary="<%= true %>" type="submit" value="save" />
-		
-		<liferay-portlet:renderURL var="cancelURL" copyCurrentRenderParameters="<%= false %>">
+		<aui:button primary="true" type="submit" value="save" />
+		<liferay-portlet:renderURL var="cancelURL" copyCurrentRenderParameters="false">
 			<liferay-portlet:param name="mvcPath" value="/html/admin_maintenance/view.jsp" />
 		</liferay-portlet:renderURL>
-		
 		<aui:button type="cancel" value="cancel" href="<%= cancelURL %>" />
 	</aui:button-row>
-	
 </aui:form>
-
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp
index 03471ada..70869955 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp
@@ -1,28 +1,18 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/admin_maintenance/init.jsp" %>
-
 <% 
-	boolean isMaintenanceMode = false;
-	List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil.findByStatus(MaintenanceStatus.IN_PROGRESS.getCode()); 
-    if(!maintenanceSchedules.isEmpty()){
-      isMaintenanceMode = true;
-    }
+List<MaintenanceSchedule> maintenanceSchedules = MaintenanceScheduleLocalServiceUtil.findByStatus(MaintenanceStatus
+		.IN_PROGRESS.getCode()); 
+boolean isMaintenanceMode = !maintenanceSchedules.isEmpty();
 %>
-
 <c:if test="<%=isMaintenanceMode%>">
-	
 	<aui:script use="aui-base">
-		
 		console.log("weeeeeeeeeeeee");
-		new Liferay.Notice(
-			{
-				closeText: false,
-				toggleText: false,
-				content: Liferay.Language.get('warning-the-portal-is-in-maintenance-mode-only-admin'),
-				noticeClass: 'popup-alert-notice'
-			}
-		).show();
-	
+		new Liferay.Notice({
+			closeText: false,
+			toggleText: false,
+			content: Liferay.Language.get('warning-the-portal-is-in-maintenance-mode-only-admin'),
+			noticeClass: 'popup-alert-notice',
+		}).show();
 	</aui:script>
-	
 </c:if>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp
index de935915..785eec74 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp
@@ -1,38 +1,24 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="/html/admin_maintenance/init.jsp"%>
-
 <%
 SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer");
-
 String redirect = searchContainer.getIteratorURL().toString();
-
 ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
-
 MaintenanceSchedule entry = (MaintenanceSchedule) row.getObject();
 %>
-
-<liferay-ui:icon-menu showWhenSingleIcon="<%= true %>">
-
-		<c:if test="<%=PortalUtil.isCompanyAdmin(user) %>">
-		
-			<portlet:renderURL var="viewEntryURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
-				<portlet:param name="mvcPath" value="/html/admin_maintenance/edit.jsp" />
-				<portlet:param name="maintenanceScheduleId" value="<%= String.valueOf(entry.getMaintenanceScheduleId()) %>" />
-			</portlet:renderURL>
-	
-			<liferay-ui:icon
-				image="edit"
-				useDialog="<%= true %>"
-				url="<%= viewEntryURL %>"
-			/>
-			
-			<portlet:actionURL name="deleteMaintenanceSchedule" var="deleteEntryURL">
-				<portlet:param name="redirect" value="<%= redirect %>" />
-				<portlet:param name="maintenanceScheduleId" value="<%= String.valueOf(entry.getMaintenanceScheduleId()) %>" />
-			</portlet:actionURL>
-	
-			<liferay-ui:icon-delete url="<%= deleteEntryURL %>" />
-
-		</c:if>
-		
-</liferay-ui:icon-menu>
\ No newline at end of file
+<liferay-ui:icon-menu showWhenSingleIcon="true">
+	<c:if test="<%=PortalUtil.isCompanyAdmin(user) %>">
+		<portlet:renderURL var="viewEntryURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+			<portlet:param name="mvcPath" value="/html/admin_maintenance/edit.jsp" />
+			<portlet:param name="maintenanceScheduleId"
+					value="<%= String.valueOf(entry.getMaintenanceScheduleId()) %>" />
+		</portlet:renderURL>
+		<liferay-ui:icon image="edit" useDialog="true" url="<%= viewEntryURL %>" />
+		<portlet:actionURL name="deleteMaintenanceSchedule" var="deleteEntryURL">
+			<portlet:param name="redirect" value="<%= redirect %>" />
+			<portlet:param name="maintenanceScheduleId"
+					value="<%= String.valueOf(entry.getMaintenanceScheduleId()) %>" />
+		</portlet:actionURL>
+		<liferay-ui:icon-delete url="<%= deleteEntryURL %>" />
+	</c:if>
+</liferay-ui:icon-menu>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp
index a2ce1bd1..6a2c946d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp
@@ -1,21 +1,13 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="/html/admin_maintenance/init.jsp"%>
-
 <aui:nav-bar>
-	
 	<aui:nav>
-			
-			<c:if test="<%=PortalUtil.isCompanyAdmin(user) %>">
-			
-				<portlet:renderURL var="addEntryURL">
-					<portlet:param name="mvcPath" value="/html/admin_maintenance/edit.jsp" />
-					<portlet:param name="backURL" value="<%=currentURL%>" />
-				</portlet:renderURL>
-	
-				<aui:nav-item href="<%=addEntryURL%>" iconCssClass="icon-plus"
-					label="add" />
-			</c:if>
-
+		<c:if test="<%=PortalUtil.isCompanyAdmin(user) %>">
+			<portlet:renderURL var="addEntryURL">
+				<portlet:param name="mvcPath" value="/html/admin_maintenance/edit.jsp" />
+				<portlet:param name="backURL" value="<%=currentURL%>" />
+			</portlet:renderURL>
+			<aui:nav-item href="<%= addEntryURL %>" iconCssClass="icon-plus" label="add" />
+		</c:if>
 	</aui:nav>
-
 </aui:nav-bar>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp
index bf3879d1..70c73b83 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp
@@ -1,70 +1,44 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/admin_maintenance/init.jsp" %>
-
 <%
-	PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
+PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
 %>
-	
-	<liferay-ui:search-container
-		emptyResultsMessage="no-entries-were-found"
-		iteratorURL="<%= iteratorURL %>"
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" iteratorURL="<%= iteratorURL %>"
 		total="<%=MaintenanceScheduleLocalServiceUtil.countAll() %>">
-	
-		<% request.setAttribute("liferay-ui:search:searchContainer", searchContainer); %>
-		
-		<liferay-util:include page="/html/admin_maintenance/toolbar.jsp" servletContext="<%= application %>" />
-		
-		<liferay-ui:search-container-results
-			results="<%= MaintenanceScheduleLocalServiceUtil.findAll() %>"
-		/>
-		
-		<liferay-ui:search-container-row 
-			className="it.tref.liferay.portos.maintenance.model.MaintenanceSchedule"
-			modelVar="maintenanceSchedule"
-		>
-		
-			<liferay-ui:search-container-column-text name="maintenance-schedule-id" property="maintenanceScheduleId" 
-				orderable="<%= true %>" orderableProperty="maintenanceScheduleId" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-create-date" property="createDate"
-				orderable="<%= true %>" orderableProperty="createDate" />
-				
-				<liferay-ui:search-container-column-text name="maintenance-schedule-modified-date" property="modifiedDate"
-				orderable="<%= true %>" orderableProperty="modifiedDate" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-type" property="type" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-reason" property="reason" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-portal-message" property="portalMessage" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-after" property="after" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-end" value="<%= maintenanceSchedule.getEnd() != null ? dateFormat.format(maintenanceSchedule.getEnd()) : StringPool.BLANK %>" />
-
-			<liferay-ui:search-container-column-text name="maintenance-schedule-onreboot">
-				<%= MaintenanceOnReboot.parse(maintenanceSchedule.getOnreboot()).getDescription() %>
-			</liferay-ui:search-container-column-text>
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-status" > <%=MaintenanceStatus.parse(maintenanceSchedule.getStatus()).getDescription()%> </liferay-ui:search-container-column-text>
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-status-message" property="statusMessage" />
-			
-			<liferay-ui:search-container-column-text name="maintenance-schedule-completed">
-				<c:choose>
-					<c:when test="<%= maintenanceSchedule.getCompleted()%>">
-						<liferay-ui:icon image="check" />
-					</c:when>
-					<c:when test="<%= !maintenanceSchedule.getCompleted()%>">
-						<liferay-ui:icon image="close" />
-					</c:when>
-				</c:choose>
-			</liferay-ui:search-container-column-text>
-
-			<liferay-ui:search-container-column-jsp path="/html/admin_maintenance/maintenance_action.jsp" align="right" />
-		
-		</liferay-ui:search-container-row>
-	
-		<liferay-ui:search-iterator paginate="<%= true %>" />
-	
-	</liferay-ui:search-container>
\ No newline at end of file
+	<% request.setAttribute("liferay-ui:search:searchContainer", searchContainer); %>	
+	<liferay-util:include page="/html/admin_maintenance/toolbar.jsp" servletContext="<%= application %>" />
+	<liferay-ui:search-container-results results="<%= MaintenanceScheduleLocalServiceUtil.findAll() %>" />
+	<liferay-ui:search-container-row  className="it.tref.liferay.portos.maintenance.model.MaintenanceSchedule"
+			modelVar="maintenanceSchedule">
+		<liferay-ui:search-container-column-text name="maintenance-schedule-id" property="maintenanceScheduleId" 
+				orderable="true" orderableProperty="maintenanceScheduleId" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-create-date" property="createDate"
+				orderable="true" orderableProperty="createDate" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-modified-date" property="modifiedDate"
+				orderable="true" orderableProperty="modifiedDate" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-type" property="type" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-reason" property="reason" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-portal-message" property="portalMessage" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-after" property="after" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-end"
+				value="<%= maintenanceSchedule.getEnd() != null ? dateFormat.format(maintenanceSchedule.getEnd())
+						: StringPool.BLANK %>" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-onreboot">
+			<%= MaintenanceOnReboot.parse(maintenanceSchedule.getOnreboot()).getDescription() %>
+		</liferay-ui:search-container-column-text>
+		<liferay-ui:search-container-column-text name="maintenance-schedule-status" >
+			<%=MaintenanceStatus.parse(maintenanceSchedule.getStatus()).getDescription()%>
+		</liferay-ui:search-container-column-text>
+		<liferay-ui:search-container-column-text name="maintenance-schedule-status-message" property="statusMessage" />
+		<liferay-ui:search-container-column-text name="maintenance-schedule-completed">
+			<c:if test="<%= maintenanceSchedule.getCompleted() %>">
+				<liferay-ui:icon image="check" />
+			</c:if>
+			<c:if test="<%= !maintenanceSchedule.getCompleted() %>">
+				<liferay-ui:icon image="close" />
+			</c:if>
+		</liferay-ui:search-container-column-text>
+		<liferay-ui:search-container-column-jsp path="/html/admin_maintenance/maintenance_action.jsp" align="right" />
+	</liferay-ui:search-container-row>
+	<liferay-ui:search-iterator paginate="true" />
+</liferay-ui:search-container>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp
index 62f983fd..e1e2e836 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp
@@ -1,15 +1,11 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.liferay.portlet.PortletURLUtil"%>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="javax.portlet.PortletMode"%>
 <%@page import="javax.portlet.WindowState"%>
-
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
 <%@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %>
 <%@ taglib uri="http://liferay.com/tld/security" prefix="liferay-security" %>
@@ -17,20 +13,13 @@
 <%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 <%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
 <%@ taglib uri="http://liferay.com/tld/ddm" prefix="liferay-ddm" %>
-
 <%@ page contentType="text/html; charset=UTF-8" %>
-
 <liferay-theme:defineObjects />
 <portlet:defineObjects />
-
 <%
 PortletMode portletMode = liferayPortletRequest.getPortletMode();
 WindowState windowState = liferayPortletRequest.getWindowState();
-
 PortletURL currentURLObj = PortletURLUtil.getCurrent(liferayPortletRequest, liferayPortletResponse);
-
 String currentURL = currentURLObj.toString();
-
 SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
-
 %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp
index fc2ebbf3..7f058349 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp
@@ -1,8 +1,2 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
 <%@ include file="/html/init.jsp" %>
-
-
-
-
-
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp
index 64293d88..066bd440 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp
@@ -1,53 +1,45 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/poller_maintenance/init.jsp" %>
-
-<liferay-portlet:resourceURL  id="maintenancePoller" var="maintenancePollerURL"></liferay-portlet:resourceURL>
-
+<liferay-portlet:resourceURL  id="maintenancePoller" var="maintenancePollerURL" />
 <aui:script use="aui-timer,aui-io-request,iferay-notice,maintenance-alert">
+var maintenanceAlert = null;
+var maintenanceScheduleId = 0;
 
-	var maintenanceAlert = null;
-	var maintenanceScheduleId = 0;
-
-	function controllaManutenzione() {
-
-		A.io.request('<%= maintenancePollerURL %>', {
-			dataType:'json',
-			on: {
-				success: function() {
-					
-					var response = this.get('responseData');
-					
-					if(response.maintenanceExpected){
-						
-						if(maintenanceScheduleId === 0){
-							maintenanceScheduleId = response.maintenanceScheduleId;
-							maintenanceAlert = new Liferay.MaintenanceAlert({
-								remainingTime: response.startFrom,
-								onExpired: function(){
-									A.clearInterval(mainProcess);
-								}
-							});
-						}else if(maintenanceScheduleId !== response.maintenanceScheduleId){
-							maintenanceAlert.cancel();
-							maintenanceAlert = null;
-							maintenanceScheduleId = response.maintenanceScheduleId;
-							maintenanceAlert = new Liferay.MaintenanceAlert({
-								remainingTime: response.startFrom,
-								onExpired: function(){
-									A.clearInterval(mainProcess);
-								}
-							});
-						}
-						
-					}else if(maintenanceAlert){
+function controllaManutenzione() {
+	A.io.request('<%= maintenancePollerURL %>', {
+		dataType:'json',
+		on: {
+			success: function() {
+				var response = this.get('responseData');
+				if (response.maintenanceExpected) {
+					if (maintenanceScheduleId === 0) {
+						maintenanceScheduleId = response.maintenanceScheduleId;
+						maintenanceAlert = new Liferay.MaintenanceAlert({
+							remainingTime: response.startFrom,
+							onExpired: function(){
+								A.clearInterval(mainProcess);
+							}
+						});
+					} else if (maintenanceScheduleId !== response.maintenanceScheduleId) {
 						maintenanceAlert.cancel();
 						maintenanceAlert = null;
+						maintenanceScheduleId = response.maintenanceScheduleId;
+						maintenanceAlert = new Liferay.MaintenanceAlert({
+							remainingTime: response.startFrom,
+							onExpired: function(){
+								A.clearInterval(mainProcess);
+							}
+						});
 					}
+				} else if (maintenanceAlert) {
+					maintenanceAlert.cancel();
+					maintenanceAlert = null;
 				}
 			}
-		}); 
-	}
-	
-	controllaManutenzione();
-	var mainProcess = A.setInterval(controllaManutenzione, 10 * 1000);
-</aui:script>
\ No newline at end of file
+		}
+	}); 
+}
+
+controllaManutenzione();
+var mainProcess = A.setInterval(controllaManutenzione, 10 * 1000);
+</aui:script>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml
index 2a8225b7..aec73544 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
-
-<ivy-module
-	version="2.0"
-	xmlns:m2="http://ant.apache.org/ivy/maven"
+<ivy-module version="2.0" xmlns:m2="http://ant.apache.org/ivy/maven"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
 >
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml.MD5
index 34e7e1e9..cacb8bb1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml.MD5
+++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/ivy.xml.MD5
@@ -1 +1 @@
-5cc166f15f8f11b9ca7581e8a8ee4066
+5454e438274b75c5ce26600a335a3f79
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java
index 7f9066ff..da8f0377 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java
@@ -35,6 +35,7 @@ import com.liferay.portal.kernel.messaging.Message;
 import com.liferay.portal.kernel.messaging.MessageBusUtil;
 import com.liferay.portal.kernel.repository.model.FileEntry;
 import com.liferay.portal.kernel.util.ArrayUtil;
+import com.liferay.portal.kernel.util.ContentTypes;
 import com.liferay.portal.kernel.util.MapUtil;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
@@ -136,13 +137,15 @@ public class ProtocolloMessageListener extends BaseMessageListener {
 				FileEntry newFileEntry = null;
 				try {
 					newFileEntry = DLAppLocalServiceUtil.addFileEntry(userId, fileEntry.getRepositoryId(),
-							fileEntry.getFolderId(), reportDto.getFileName() + ".pdf", "application/pdf",
+							fileEntry.getFolderId(), reportDto.getFileName() + ".pdf", ContentTypes.APPLICATION_PDF,
 							reportDto.getFileName(), StringPool.BLANK, StringPool.BLANK, outputBytes, serviceContext);
 				} catch (DuplicateFileException e) {
 					FileEntry fe = DLAppServiceUtil.getFileEntry(fileEntry.getGroupId(), fileEntry.getFolderId(),
 							reportDto.getFileName());
-					_log.info("File duplicato : " + fe.getFileEntryId());
-					return;
+					DLAppLocalServiceUtil.deleteFileEntry(fe.getFileEntryId());
+					newFileEntry = DLAppLocalServiceUtil.addFileEntry(userId, fileEntry.getRepositoryId(),
+							fileEntry.getFolderId(), reportDto.getFileName() + ".pdf", ContentTypes.APPLICATION_PDF,
+							reportDto.getFileName(), StringPool.BLANK, StringPool.BLANK, outputBytes, serviceContext);
 				}
 				if (Validator.isNotNull(newFileEntry)) {
 					long[] fileEntryIds = new long[0];
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties
index 5d6d318b..079083d7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_rep
-    build.number=31
-    build.date=1619532877763
+    build.number=32
+    build.date=1631888946526
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/AuditModelListener.java b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/AuditModelListener.java
index 2d381562..c50bbb78 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/AuditModelListener.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/AuditModelListener.java
@@ -2,7 +2,7 @@ package it.tref.liferay.portos.audit.shared;
 
 import it.tref.liferay.portos.audit.shared.util.Constants;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -44,8 +44,8 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 					String newValue = array.getJSONObject(i).getString("newValue");
 					if (name.equalsIgnoreCase(getStatoAttributesName())) {
 
-						routeAuditMessage(convertStatoToEventString(newValue), newModel,
-								getMessage(newModel), attributes, true);
+						routeAuditMessage(convertStatoToEventString(newValue), newModel, getMessage(newModel),
+								attributes, true);
 
 						if (array.length() == 1) {
 							isUpdate = false;
@@ -57,18 +57,20 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 				}
 			}
 			if (isUpdate) {
-				boolean sended = routeAuditMessage(Constants.UPDATE.toUpperCase(), newModel,
-						getMessage(newModel), attributes, false);
+				boolean sended = routeAuditMessage(Constants.UPDATE.toUpperCase(), newModel, getMessage(newModel),
+						attributes, false);
 				if (sended) {
 					onBeforeRealUpdate(newModel, oldModel);
 				}
 			}
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			throw new ModelListenerException(e);
 		}
 	}
 
 	protected String convertStatoToEventString(String newValue) {
+
 		if ("1".equalsIgnoreCase(newValue) || "true".equalsIgnoreCase(newValue)) {
 			return Constants.ATTIVA.toUpperCase();
 		} else {
@@ -77,23 +79,20 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 	}
 
 	protected String getStatoAttributesName() {
+
 		return "valido";
 	}
 
 	protected String getStatoAttivaString() {
+
 		return "1";
 	}
 
 	protected abstract T getOldModel(T newModel) throws ModelListenerException;
 
 	protected List<String> getExcludedFields() {
-		List<String> esclusioni = new ArrayList<String>() {
-			{
-				add("modifiedDate");
-				add("createDate");
-			}
-		};
-		return esclusioni;
+
+		return Arrays.asList("modifiedDate", "createDate");
 	}
 
 	protected JSONObject getModifiedAttributes(T newRelazioniAnagrafiche, T oldRelazioniAnagrafiche) {
@@ -104,7 +103,7 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 		Map<String, Object> model = newRelazioniAnagrafiche.getModelAttributes();
 		Iterator<String> modelList = model.keySet().iterator();
 		while (modelList.hasNext()) {
-			String name = (String) modelList.next();
+			String name = modelList.next();
 			if (!getExcludedFields().contains(name)) {
 				attributesBuilder.add(name);
 			}
@@ -113,8 +112,9 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 		return attributesBuilder.getAttributesJSON();
 	}
 
-	protected boolean routeAuditMessage(String eventAction, T model, String message,
-			JSONObject additionalInfo, boolean cambiostato) throws ModelListenerException {
+	protected boolean routeAuditMessage(String eventAction, T model, String message, JSONObject additionalInfo,
+			boolean cambiostato) throws ModelListenerException {
+
 		String className = getClassName(model);
 		if (cambiostato) {
 			AuditUtil.doCambioStato(getEventType(model), className, (Long) model.getPrimaryKeyObj(), message,
@@ -129,10 +129,9 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 			onBeforeLog(model);
 			return true;
 		} else {
-			return AuditUtil.doStorico(getEventType(model), className, (Long) model.getPrimaryKeyObj(),
-					message, getEventCategory(model), eventAction, getParentClassName(model),
-					getParentClassPk(model), getRelatedClassName(model), getRelatedClassPk(model),
-					additionalInfo, null);
+			return AuditUtil.doStorico(getEventType(model), className, (Long) model.getPrimaryKeyObj(), message,
+					getEventCategory(model), eventAction, getParentClassName(model), getParentClassPk(model),
+					getRelatedClassName(model), getRelatedClassPk(model), additionalInfo, null);
 		}
 
 	}
@@ -143,31 +142,39 @@ public abstract class AuditModelListener<T extends BaseModel<T>> extends BaseMod
 	}
 
 	protected void onBeforeRealUpdate(T newModel, T oldModel) throws ModelListenerException {
+
 	}
 
 	protected void onBeforeLog(T model) throws ModelListenerException {
+
 	}
 
 	protected void onBeforeCambioStato(T model) throws ModelListenerException {
+
 	}
 
 	protected Long getParentClassPk(T model) {
+
 		return 0l;
 	}
 
 	protected String getParentClassName(T model) {
+
 		return StringPool.BLANK;
 	}
 
 	protected Long getRelatedClassPk(T model) {
+
 		return 0l;
 	}
 
 	protected String getRelatedClassName(T model) {
+
 		return StringPool.BLANK;
 	}
 
 	protected String getMessage(T model) {
+
 		return StringPool.BLANK;
 	}
 
diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/permission/HistoryPermission.java b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/permission/HistoryPermission.java
index cca32903..2bb476fe 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/permission/HistoryPermission.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/permission/HistoryPermission.java
@@ -23,11 +23,9 @@ public class HistoryPermission {
 
 		Boolean hasPermission = StagingPermissionUtil.hasPermission(permissionChecker, groupId,
 				RESOURCE_NAME, groupId, PortletKeys.AUDIT_DETAIL, actionId);
-
 		if (hasPermission != null) {
 			return hasPermission.booleanValue();
 		}
-
 		return permissionChecker.hasPermission(groupId, RESOURCE_NAME, groupId, actionId);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/Constants.java
index 07770b2d..f085e222 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/Constants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/Constants.java
@@ -1,6 +1,7 @@
 package it.tref.liferay.portos.audit.shared.util;
 
 public class Constants implements com.liferay.portal.kernel.util.Constants {
+
 	public static final String ATTIVA = "ATTIVA";
 	public static final String DISATTIVA = "DISATTIVA";
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/PortletKeys.java b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/PortletKeys.java
index a71e9228..d82e531f 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/PortletKeys.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/src/it/tref/liferay/portos/audit/shared/util/PortletKeys.java
@@ -1,6 +1,7 @@
 package it.tref.liferay.portos.audit.shared.util;
 
 public class PortletKeys extends com.liferay.portal.util.PortletKeys {
+
 	public static final String AUDIT = "1_WAR_portosauditportlet";
 	public static final String AUDIT_DETAIL = "2_WAR_portosauditportlet";
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath
index c519e307..46f10f5c 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/ext/portal-service.jar" sourcepath="/home/ture/liferay/src/liferay-patched/liferay-portal"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/ext/portlet.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/jsp-api.jar"/>
+	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/jsp-api.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerHotDeployListener.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerHotDeployListener.java
index 0b063ace..7eafb89a 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerHotDeployListener.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerHotDeployListener.java
@@ -13,12 +13,14 @@ public class ModelListenerHotDeployListener extends BaseMessageListener {
 	private ModelListenerWrapper[] modelListenerWrappers;
 
 	public ModelListenerHotDeployListener(String currentContextName, ModelListenerWrapper[] modelListenerWrappers) {
+
 		this.currentContextName = currentContextName;
 		this.modelListenerWrappers = modelListenerWrappers;
 	}
 
 	@Override
 	protected void doReceive(Message message) throws Exception {
+
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
 		if (command.equals("deploy")) {
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerInvocationHandler.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerInvocationHandler.java
index d2ce3175..9e4c4c05 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerInvocationHandler.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerInvocationHandler.java
@@ -22,20 +22,17 @@ public class ModelListenerInvocationHandler implements InvocationHandler {
 	private ModelListener<BaseModel<?>> modelListener;
 
 	public ModelListenerInvocationHandler(ModelListener<BaseModel<?>> modelListener) {
+
 		this.modelListener = modelListener;
 	}
 
 	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+
 		if (method.getDeclaringClass() == Object.class) {
 			String methodName = method.getName();
-
 			if (methodName.equals("equals")) {
-				if (proxy == args[0]) {
-					return true;
-				} else {
-					return false;
-				}
+				return proxy == args[0];
 			}
 		}
 		if (ArrayUtil.contains(MODEL_METHOD_NAMES, method.getName())) {
@@ -100,6 +97,7 @@ public class ModelListenerInvocationHandler implements InvocationHandler {
 	}
 
 	private Class<?> toPrimitive(Class<?> clazz) {
+
 		if (clazz.equals(Long.class)) {
 			return long.class;
 		} else if (clazz.equals(Integer.class)) {
@@ -118,6 +116,7 @@ public class ModelListenerInvocationHandler implements InvocationHandler {
 	}
 
 	private boolean isSimpleColumnType(Class<?> clazz) {
+
 		if (clazz.equals(Long.class)) {
 			return true;
 		} else if (clazz.equals(Integer.class)) {
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerPool.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerPool.java
index 2a6fbaa5..8e1e316a 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerPool.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerPool.java
@@ -13,6 +13,7 @@ public class ModelListenerPool {
 
 	protected static void register(String servletContextName, String modelClassName,
 			ModelListener<BaseModel<?>> modelListener) {
+
 		_servletContextNameMap.put(modelClassName, servletContextName);
 		if (!_modelListenersMap.containsKey(modelClassName)) {
 			_modelListenersMap.put(modelClassName, new ArrayList<ModelListener<BaseModel<?>>>());
@@ -21,19 +22,23 @@ public class ModelListenerPool {
 	}
 
 	protected static void unregister(String modelClassName) {
+
 		_servletContextNameMap.remove(modelClassName);
 		_modelListenersMap.remove(modelClassName);
 	}
 
 	protected static Set<String> getModelClassNames() {
+
 		return _modelListenersMap.keySet();
 	}
 
 	protected static List<ModelListener<BaseModel<?>>> getModelListeners(String modelClassName) {
+
 		return _modelListenersMap.get(modelClassName);
 	}
 
 	protected static String getServletContextName(String modelClassName) {
+
 		return _servletContextNameMap.get(modelClassName);
 	}
 
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerUtil.java
index 377879ef..651fc734 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/core/ModelListenerUtil.java
@@ -19,87 +19,55 @@ import com.liferay.portal.service.persistence.BasePersistence;
 
 public class ModelListenerUtil {
 
-  public static void registerModelListener(ModelListenerWrapper modelListenerWrapper) {
-
-    String servletContextName = modelListenerWrapper.getServletContextName();
-    String modelClassName = modelListenerWrapper.getModelClassName();
-    String[] modelListenerClassNames = modelListenerWrapper.getModelListenerClassNames();
-
-    Thread thread = Thread.currentThread();
-
-    ClassLoader currentClassLoader = thread.getContextClassLoader();
-
-    for (String modelListenerClassName : modelListenerClassNames) {
-
-      try {
-
-        ModelListener<BaseModel<?>> modelListener =
-            (ModelListener<BaseModel<?>>) ProxyFactory.newInstance(currentClassLoader, ModelListener.class,
-                modelListenerClassName);
-
-        ClassLoader classLoader = ClassLoaderPool.getClassLoader(servletContextName);
-
-        ModelListener<BaseModel<?>> proxyModelListener =
-            (ModelListener<BaseModel<?>>) Proxy.newProxyInstance(classLoader, new Class[] {ModelListener.class},
-                new ModelListenerInvocationHandler(modelListener));
-
-        BasePersistence persistence = getPersistence(servletContextName, modelClassName);
-
-        persistence.registerListener(proxyModelListener);
-
-        ModelListenerPool.register(servletContextName, modelClassName, proxyModelListener);
-
-      } catch (Exception e) {
-        _log.error("Error during registration " + modelListenerClassName + " on " + modelClassName, e);
-      }
-    }
-  }
-
-  public static void unregisterModelListeners() {
-
-    Set<String> modelClassNames = ModelListenerPool.getModelClassNames();
-
-    for (String modelClassName : modelClassNames) {
-
-      String servletContextName = ModelListenerPool.getServletContextName(modelClassName);
-      // _log.info("unregisterModelListeners --INIZIO-- modelClassName:" + modelClassName + " -
-      // servletContextName:"
-      // + servletContextName);
-      if (ServletContextPool.containsKey(servletContextName)) {
-        // _log.info("unregisterModelListeners --CONTEXT NAME PRESENTE-- modelClassName:" +
-        // modelClassName
-        // + " - servletContextName:" + servletContextName);
-        List<ModelListener<BaseModel<?>>> modelListeners = ModelListenerPool.getModelListeners(modelClassName);
-
-        for (ModelListener<BaseModel<?>> modelListener : modelListeners) {
-          // _log.info("unregisterModelListeners --RIMOSSO-- modelClassName:" + modelClassName + " -
-          // servletContextName:"
-          // + servletContextName);
-          BasePersistence persistence = getPersistence(servletContextName, modelClassName);
-
-          persistence.unregisterListener(modelListener);
-        }
-      }
-
-      ModelListenerPool.unregister(modelClassName);
-    }
-  }
-
-  private static BasePersistence<?> getPersistence(String servletContextName, String modelName) {
-
-    int pos = modelName.lastIndexOf(CharPool.PERIOD);
-
-    String entityName = modelName.substring(pos + 1);
-
-    pos = modelName.lastIndexOf(".model.");
-
-    String packagePath = modelName.substring(0, pos);
-
-    String beanName = packagePath + ".service.persistence." + entityName + "Persistence";
-
-    return (BasePersistence<?>) PortletBeanLocatorUtil.locate(servletContextName, beanName);
-  }
-
-  private final static Log _log = LogFactoryUtil.getLog(ModelListenerUtil.class);
-
+	public static void registerModelListener(ModelListenerWrapper modelListenerWrapper) {
+
+		String servletContextName = modelListenerWrapper.getServletContextName();
+		String modelClassName = modelListenerWrapper.getModelClassName();
+		String[] modelListenerClassNames = modelListenerWrapper.getModelListenerClassNames();
+		Thread thread = Thread.currentThread();
+		ClassLoader currentClassLoader = thread.getContextClassLoader();
+		for (String modelListenerClassName : modelListenerClassNames) {
+			try {
+				ModelListener<BaseModel<?>> modelListener = (ModelListener<BaseModel<?>>) ProxyFactory.newInstance(
+						currentClassLoader, ModelListener.class, modelListenerClassName);
+				ClassLoader classLoader = ClassLoaderPool.getClassLoader(servletContextName);
+				ModelListener<BaseModel<?>> proxyModelListener = (ModelListener<BaseModel<?>>) Proxy.newProxyInstance(
+						classLoader, new Class[] { ModelListener.class }, new ModelListenerInvocationHandler(
+								modelListener));
+				BasePersistence persistence = getPersistence(servletContextName, modelClassName);
+				persistence.registerListener(proxyModelListener);
+				ModelListenerPool.register(servletContextName, modelClassName, proxyModelListener);
+			} catch (Exception e) {
+				_log.error("Error during registration " + modelListenerClassName + " on " + modelClassName, e);
+			}
+		}
+	}
+
+	public static void unregisterModelListeners() {
+
+		Set<String> modelClassNames = ModelListenerPool.getModelClassNames();
+		for (String modelClassName : modelClassNames) {
+			String servletContextName = ModelListenerPool.getServletContextName(modelClassName);
+			if (ServletContextPool.containsKey(servletContextName)) {
+				List<ModelListener<BaseModel<?>>> modelListeners = ModelListenerPool.getModelListeners(modelClassName);
+				for (ModelListener<BaseModel<?>> modelListener : modelListeners) {
+					BasePersistence persistence = getPersistence(servletContextName, modelClassName);
+					persistence.unregisterListener(modelListener);
+				}
+			}
+			ModelListenerPool.unregister(modelClassName);
+		}
+	}
+
+	private static BasePersistence<?> getPersistence(String servletContextName, String modelName) {
+
+		int pos = modelName.lastIndexOf(CharPool.PERIOD);
+		String entityName = modelName.substring(pos + 1);
+		pos = modelName.lastIndexOf(".model.");
+		String packagePath = modelName.substring(0, pos);
+		String beanName = packagePath + ".service.persistence." + entityName + "Persistence";
+		return (BasePersistence<?>) PortletBeanLocatorUtil.locate(servletContextName, beanName);
+	}
+
+	private final static Log _log = LogFactoryUtil.getLog(ModelListenerUtil.class);
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/event/ModelListenerStartupAction.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/event/ModelListenerStartupAction.java
index 3817e0c0..79142302 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/event/ModelListenerStartupAction.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/event/ModelListenerStartupAction.java
@@ -15,6 +15,7 @@ public abstract class ModelListenerStartupAction extends SimpleAction {
 
 	@Override
 	public void run(String[] ids) throws ActionException {
+
 		Thread thread = Thread.currentThread();
 		ClassLoader currentClassLoader = thread.getContextClassLoader();
 		String currentContextName = ClassLoaderPool.getContextName(currentClassLoader);
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/model/ModelListenerWrapper.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/model/ModelListenerWrapper.java
index 5752d83c..62e6784f 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/model/ModelListenerWrapper.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/modellistener/shared/model/ModelListenerWrapper.java
@@ -2,46 +2,52 @@ package it.tref.liferay.portos.bo.modellistener.shared.model;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class ModelListenerWrapper implements Serializable {
 
 	private String servletContextName;
 	private String modelClassName;
 	private String[] modelListenerClassNames;
 
-	public ModelListenerWrapper(String servletContextName, String modelClassName,
-			String modelListenerClassName) {
+	public ModelListenerWrapper(String servletContextName, String modelClassName, String modelListenerClassName) {
+
 		this(servletContextName, modelClassName, new String[] { modelListenerClassName });
 	}
 
-	public ModelListenerWrapper(String servletContextName, String modelClassName,
-			String[] modelListenerClassNames) {
+	public ModelListenerWrapper(String servletContextName, String modelClassName, String[] modelListenerClassNames) {
+
 		this.servletContextName = servletContextName;
 		this.modelClassName = modelClassName;
 		this.modelListenerClassNames = modelListenerClassNames;
 	}
 
 	public String getServletContextName() {
+
 		return servletContextName;
 	}
 
 	public void setServletContextName(String servletContextName) {
+
 		this.servletContextName = servletContextName;
 	}
 
 	public String getModelClassName() {
+
 		return modelClassName;
 	}
 
 	public void setModelClassName(String modelClassName) {
+
 		this.modelClassName = modelClassName;
 	}
 
 	public String[] getModelListenerClassNames() {
+
 		return modelListenerClassNames;
 	}
 
 	public void setModelListenerClassNames(String[] modelListenerClassNames) {
+
 		this.modelListenerClassNames = modelListenerClassNames;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java
index 8afef36b..e4df0520 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java
@@ -6,10 +6,9 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings("serial")
 public class CronostoriaBean implements Serializable {
 
-	private static final long serialVersionUID = -3527959537727819398L;
-
 	private Date dataEvento;
 	private String tipoEvento;
 	private String testoEvento;
@@ -20,6 +19,7 @@ public class CronostoriaBean implements Serializable {
 
 	public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink,
 			CronostoriaLink... links) {
+
 		super();
 		this.dataEvento = dataEvento;
 		this.tipoEvento = tipoEvento;
@@ -30,6 +30,7 @@ public class CronostoriaBean implements Serializable {
 
 	public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink, String classPK,
 			String className, CronostoriaLink... links) {
+
 		super();
 		this.dataEvento = dataEvento;
 		this.tipoEvento = tipoEvento;
@@ -41,58 +42,72 @@ public class CronostoriaBean implements Serializable {
 	}
 
 	public Date getDataEvento() {
+
 		return dataEvento;
 	}
 
 	public void setDataEvento(Date dataEvento) {
+
 		this.dataEvento = dataEvento;
 	}
 
 	public String getTipoEvento() {
+
 		return tipoEvento;
 	}
 
 	public void setTipoEvento(String tipoEvento) {
+
 		this.tipoEvento = tipoEvento;
 	}
 
 	public String getTestoEvento() {
+
 		return testoEvento;
 	}
 
 	public void setTestoEvento(String testoEvento) {
+
 		this.testoEvento = testoEvento;
 	}
 
 	public List<CronostoriaLink> getLinks() {
+
 		return links;
 	}
 
 	public void setLinks(List<CronostoriaLink> links) {
+
 		this.links = links;
 	}
 
 	public String getTipoLink() {
+
 		return tipoLink;
 	}
 
 	public void setTipoLink(String tipoLink) {
+
 		this.tipoLink = tipoLink;
 	}
 
 	public String getClassPK() {
+
 		return classPK;
 	}
 
 	public void setClassPK(String classPK) {
+
 		this.classPK = classPK;
 	}
 
 	public String getClassName() {
+
 		return className;
 	}
 
 	public void setClassName(String className) {
+
 		this.className = className;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaLink.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaLink.java
index 8abd554e..44c6677e 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaLink.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaLink.java
@@ -2,32 +2,35 @@ package it.tref.liferay.portos.bo.shared.bean;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class CronostoriaLink implements Serializable {
 
-	private static final long serialVersionUID = -5956161623920832404L;
-
 	private CronostoriaTypeEnum type;
 	private String link;
 
 	public CronostoriaLink(CronostoriaTypeEnum type, String link) {
-		super();
+
 		this.type = type;
 		this.link = link;
 	}
 
 	public CronostoriaTypeEnum getType() {
+
 		return type;
 	}
 
 	public void setType(CronostoriaTypeEnum type) {
+
 		this.type = type;
 	}
 
 	public String getLink() {
+
 		return link;
 	}
 
 	public void setLink(String link) {
+
 		this.link = link;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaTypeEnum.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaTypeEnum.java
index 337fb142..702b38ec 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaTypeEnum.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaTypeEnum.java
@@ -9,15 +9,18 @@ public enum CronostoriaTypeEnum {
 	private String name;
 
 	private CronostoriaTypeEnum(String id, String name) {
+
 		this.id = id;
 		this.name = name;
 	}
 
 	public String getId() {
+
 		return id;
 	}
 
 	public String getName() {
+
 		return name;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeBean.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeBean.java
index 58a2b997..84d1898c 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeBean.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeBean.java
@@ -1,23 +1,24 @@
 package it.tref.liferay.portos.bo.shared.bean;
 
-import com.liferay.portal.kernel.util.UniqueList;
-import com.liferay.portal.kernel.util.UnmodifiableList;
-
 import java.io.Serializable;
 import java.util.List;
 
-public class FirmeBean implements Serializable {
+import com.liferay.portal.kernel.util.UniqueList;
+import com.liferay.portal.kernel.util.UnmodifiableList;
 
-	private static final long serialVersionUID = 1L;
+@SuppressWarnings("serial")
+public class FirmeBean implements Serializable {
 
 	private List<FirmeDetail> firmeDigitali = new UniqueList<FirmeDetail>();
 	private List<FirmeDetail> firmeApplicativo = new UniqueList<FirmeDetail>();
 
 	public List<FirmeDetail> getFirmeDigitali() {
+
 		return new UnmodifiableList<>(firmeDigitali);
 	}
 
 	public void setFirmeDigitali(List<FirmeDetail> firmeDigitali) {
+
 		this.firmeDigitali = new UniqueList<FirmeDetail>();
 		for (FirmeDetail firmaDigitale : firmeDigitali) {
 			this.firmeDigitali.add(firmaDigitale);
@@ -25,10 +26,12 @@ public class FirmeBean implements Serializable {
 	}
 
 	public List<FirmeDetail> getFirmeApplicativo() {
+
 		return new UnmodifiableList<>(firmeApplicativo);
 	}
 
 	public void setFirmeApplicativo(List<FirmeDetail> firmeApplicativo) {
+
 		this.firmeApplicativo = new UniqueList<FirmeDetail>();
 		for (FirmeDetail firmaApplicativo : firmeApplicativo) {
 			this.firmeApplicativo.add(firmaApplicativo);
@@ -36,6 +39,7 @@ public class FirmeBean implements Serializable {
 	}
 
 	public boolean firmaIsPresent(String codiceFiscale) {
+
 		for (FirmeDetail firmaDigitale : firmeDigitali) {
 			if (firmaDigitale.getCfFirmatario().equalsIgnoreCase(codiceFiscale)) {
 				return true;
@@ -50,6 +54,7 @@ public class FirmeBean implements Serializable {
 	}
 
 	public boolean firmaIsAnnullabile(String codiceFiscale) {
+
 		for (FirmeDetail firmaApplicativo : firmeApplicativo) {
 			if (firmaApplicativo.getCfFirmatario().equalsIgnoreCase(codiceFiscale)) {
 				return true;
@@ -59,11 +64,13 @@ public class FirmeBean implements Serializable {
 	}
 
 	public int numeroFirme() {
+
 		List<String> allSignatures = allSignatures();
 		return allSignatures.size();
 	}
 
 	public List<String> allSignatures() {
+
 		List<String> all = new UniqueList<String>();
 		for (FirmeDetail firmaDigitale : firmeDigitali) {
 			all.add(firmaDigitale.getCfFirmatario().toLowerCase());
@@ -75,6 +82,7 @@ public class FirmeBean implements Serializable {
 	}
 
 	public List<FirmeDetail> allFirmeDetails() {
+
 		List<FirmeDetail> all = new UniqueList<FirmeDetail>();
 		all.addAll(firmeDigitali);
 		all.addAll(firmeApplicativo);
@@ -82,6 +90,7 @@ public class FirmeBean implements Serializable {
 	}
 
 	public void removeFirmeApplicativo(String codiceFiscale) {
+
 		FirmeDetail firmeDetailToRemove = null;
 		for (FirmeDetail firmeDetail : firmeApplicativo) {
 			if (codiceFiscale.equalsIgnoreCase(firmeDetail.getCfFirmatario())) {
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeDetail.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeDetail.java
index c290418e..2cf25de1 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeDetail.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/FirmeDetail.java
@@ -3,37 +3,40 @@ package it.tref.liferay.portos.bo.shared.bean;
 import java.io.Serializable;
 import java.util.Date;
 
+@SuppressWarnings("serial")
 public class FirmeDetail implements Serializable {
 
-  private static final long serialVersionUID = -3570431996677329852L;
+	private String cfFirmatario;
+	private Date dtFirma;
 
-  private String cfFirmatario;
-  private Date dtFirma;
+	public FirmeDetail() {
 
-  public FirmeDetail() {
-    super();
-  }
+		super();
+	}
 
-  public FirmeDetail(String cfFirmatario, Date dtFirma) {
-    super();
-    this.cfFirmatario = cfFirmatario;
-    this.dtFirma = dtFirma;
-  }
+	public FirmeDetail(String cfFirmatario, Date dtFirma) {
 
-  public String getCfFirmatario() {
-    return cfFirmatario;
-  }
+		this.cfFirmatario = cfFirmatario;
+		this.dtFirma = dtFirma;
+	}
 
-  public void setCfFirmatario(String cfFirmatario) {
-    this.cfFirmatario = cfFirmatario;
-  }
+	public String getCfFirmatario() {
 
-  public Date getDtFirma() {
-    return dtFirma;
-  }
+		return cfFirmatario;
+	}
 
-  public void setDtFirma(Date dtFirma) {
-    this.dtFirma = dtFirma;
-  }
+	public void setCfFirmatario(String cfFirmatario) {
 
+		this.cfFirmatario = cfFirmatario;
+	}
+
+	public Date getDtFirma() {
+
+		return dtFirma;
+	}
+
+	public void setDtFirma(Date dtFirma) {
+
+		this.dtFirma = dtFirma;
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java
index 32faea76..551b1504 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java
@@ -1,32 +1,36 @@
 package it.tref.liferay.portos.bo.shared.bean;
 
-public class IstruttoreBean implements Comparable<IstruttoreBean> {
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class IstruttoreBean implements Serializable, Comparable<IstruttoreBean> {
+
 	private long idIstruttore;
 	private String denominazione;
 
 	public long getIdIstruttore() {
+
 		return idIstruttore;
 	}
 
 	public void setIdIstruttore(long idIstruttore) {
+
 		this.idIstruttore = idIstruttore;
 	}
 
 	public String getDenominazione() {
+
 		return denominazione;
 	}
 
 	public void setDenominazione(String denominazione) {
+
 		this.denominazione = denominazione;
 	}
 
 	@Override
 	public int compareTo(IstruttoreBean o) {
-		int value = 0;
-		value = getDenominazione().compareTo(o.getDenominazione());
-		if (value != 0) {
-			return value;
-		}
-		return 0;
+
+		return getDenominazione().compareTo(o.getDenominazione());
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/ParereGeologoBean.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/ParereGeologoBean.java
index b3380773..fcc85c7b 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/ParereGeologoBean.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/ParereGeologoBean.java
@@ -1,8 +1,11 @@
 package it.tref.liferay.portos.bo.shared.bean;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class ParereGeologoBean implements Comparable<ParereGeologoBean>{
+@SuppressWarnings("serial")
+public class ParereGeologoBean implements Serializable, Comparable<ParereGeologoBean> {
+
 	private long parereGeologoId;
 	private long intPraticaId;
 	private long dettPraticaId;
@@ -11,60 +14,68 @@ public class ParereGeologoBean implements Comparable<ParereGeologoBean>{
 	private String parere;
 
 	public long getIntPraticaId() {
+
 		return intPraticaId;
 	}
 
 	public void setIntPraticaId(long intPraticaId) {
+
 		this.intPraticaId = intPraticaId;
 	}
 
 	public Date getDataCreazione() {
+
 		return dataCreazione;
 	}
 
 	public void setDataCreazione(Date dataCreazione) {
+
 		this.dataCreazione = dataCreazione;
 	}
 
 	public long getUserId() {
+
 		return userId;
 	}
 
 	public void setUserId(long userId) {
+
 		this.userId = userId;
 	}
 
 	public long getParereGeologoId() {
+
 		return parereGeologoId;
 	}
 
 	public void setParereGeologoId(long parereGeologoId) {
+
 		this.parereGeologoId = parereGeologoId;
 	}
 
 	@Override
 	public int compareTo(ParereGeologoBean o) {
-		int value = 0;
-		value = getDataCreazione().compareTo(o.getDataCreazione());
-		if (value != 0) {
-			return value;
-		}
-		return 0;
+
+		return getDataCreazione().compareTo(o.getDataCreazione());
 	}
 
 	public long getDettPraticaId() {
+
 		return dettPraticaId;
 	}
 
 	public void setDettPraticaId(long dettPraticaId) {
+
 		this.dettPraticaId = dettPraticaId;
 	}
 
 	public String getParere() {
+
 		return parere;
 	}
 
 	public void setParere(String parere) {
+
 		this.parere = parere;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java
index b69e1b9e..fee65793 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java
@@ -5,28 +5,29 @@ public class Fascicolo {
 	private int anno;
 	private int numero;
 
-	public Fascicolo() {
-	}
-
 	public Fascicolo(int anno, int numero) {
+
 		this.anno = anno;
 		this.numero = numero;
 	}
 
 	public int getAnno() {
+
 		return anno;
 	}
 
 	public void setAnno(int anno) {
+
 		this.anno = anno;
 	}
 
 	public int getNumero() {
+
 		return numero;
 	}
 
 	public void setNumero(int numero) {
+
 		this.numero = numero;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/File.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/File.java
index 434c9c4d..568ce218 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/File.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/File.java
@@ -1,22 +1,27 @@
 package it.tref.liferay.portos.bo.shared.protocollo.model;
 
 public class File {
+
 	private String fileId;
 	private String fileSha256;
 
 	public String getFileId() {
+
 		return fileId;
 	}
 
 	public void setFileId(String fileId) {
+
 		this.fileId = fileId;
 	}
 
 	public String getFileSha256() {
+
 		return fileSha256;
 	}
 
 	public void setFileSha256(String fileSha256) {
+
 		this.fileSha256 = fileSha256;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java
index 946eda2f..ab9921ad 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java
@@ -19,66 +19,82 @@ public class Protocollo {
 	private List<File> files;
 
 	public boolean isChiuso() {
+
 		return chiuso;
 	}
 
 	public void setChiuso(boolean chiuso) {
+
 		this.chiuso = chiuso;
 	}
 
 	public String getUfficioId() {
+
 		return ufficioId;
 	}
 
 	public void setUfficioId(String ufficioId) {
+
 		this.ufficioId = ufficioId;
 	}
 
 	public String getUtenteId() {
+
 		return utenteId;
 	}
 
 	public void setUtenteId(String utenteId) {
+
 		this.utenteId = utenteId;
 	}
 
 	public String getOggetto() {
+
 		return oggetto;
 	}
 
 	public void setOggetto(String oggetto) {
+
 		this.oggetto = oggetto;
 	}
 
 	public TipoProtocollo getTipo() {
+
 		return tipo;
 	}
 
 	public void setTipo(TipoProtocollo tipo) {
+
 		this.tipo = tipo;
 	}
 
 	public List<File> getFiles() {
+
 		return files;
 	}
 
 	public void setFiles(List<File> files) {
+
 		this.files = files;
 	}
 
 	public String getPraticaId() {
+
 		return praticaId;
 	}
 
 	public void setPraticaId(String praticaId) {
+
 		this.praticaId = praticaId;
 	}
 
 	public Date getDataInserimento() {
+
 		return dataInserimento;
 	}
 
 	public void setDataInserimento(Date dataInserimento) {
+
 		this.dataInserimento = dataInserimento;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ActionKeys.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ActionKeys.java
index 0a2de7f5..84ca8300 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ActionKeys.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ActionKeys.java
@@ -2,17 +2,17 @@ package it.tref.liferay.portos.bo.shared.util;
 
 public class ActionKeys extends com.liferay.portal.security.permission.ActionKeys {
 
-  public static final String ASSEGNA_AL_RUOLO = "ASSEGNA_AL_RUOLO";
-  public static final String CAMBIO_ISTRUTTORE = "CAMBIO_ISTRUTTORE";
-  public static final String RICHIEDI_PARERE_GEOLOGO = "RICHIEDI_PARERE_GEOLOGO";
-  public static final String CAMBIO_STATO = "CAMBIO_STATO";
-  public static final String CAMBIO_TITOLARE = "CAMBIO_TITOLARE";
-  public static final String CAMBIO_STATO_WORKFLOW = "CAMBIO_STATO_WORKFLOW";
-  public static final String SOSPENDI_FASCICOLO = "SOSPENDI_FASCICOLO";
+	public static final String ASSEGNA_AL_RUOLO = "ASSEGNA_AL_RUOLO";
+	public static final String CAMBIO_ISTRUTTORE = "CAMBIO_ISTRUTTORE";
+	public static final String RICHIEDI_PARERE_GEOLOGO = "RICHIEDI_PARERE_GEOLOGO";
+	public static final String CAMBIO_STATO = "CAMBIO_STATO";
+	public static final String CAMBIO_TITOLARE = "CAMBIO_TITOLARE";
+	public static final String CAMBIO_STATO_WORKFLOW = "CAMBIO_STATO_WORKFLOW";
+	public static final String SOSPENDI_FASCICOLO = "SOSPENDI_FASCICOLO";
 
-  public static final String DOC_AGGIUNTIVA = "DOC_AGGIUNTIVA";
-  public static final String COMUNICAZIONI_MEDIATE = "COMUNICAZIONI_MEDIATE";
-  public static final String AVVISI_MANUALI = "AVVISI_MANUALI";
+	public static final String DOC_AGGIUNTIVA = "DOC_AGGIUNTIVA";
+	public static final String COMUNICAZIONI_MEDIATE = "COMUNICAZIONI_MEDIATE";
+	public static final String AVVISI_MANUALI = "AVVISI_MANUALI";
 
-  public static final String PAGAMENTI_PENDING = "PAGAMENTI_IN_PENDING";
+	public static final String PAGAMENTI_PENDING = "PAGAMENTI_IN_PENDING";
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java
index 3a5d3725..80c59ff2 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java
@@ -38,5 +38,4 @@ public class ConfigurazioneConstants {
 	public static final String IRIS_COMUNICAZIONI_DEBITORIE_URL = "conf.geniocivile.scheduler.iris.pagamenti.url";
 	public static final String IRIS_GENERAZIONE_IUV_URL = "conf.geniocivile.scheduler.iris.iuv.url";
 	public static final String IMPORTO_BOLLO = "conf.geniocivile.scheduler.iris.importobollo";
-
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java
index 50a5f6b4..1854f033 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java
@@ -1,6 +1,7 @@
 package it.tref.liferay.portos.bo.shared.util;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class Constants implements com.liferay.portal.kernel.util.Constants {
 
@@ -23,7 +24,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants {
 	public static final String TIPO_PRATICA_SANATORIA = "03";
 
 	@SuppressWarnings("serial")
-	public static final HashMap<String, String> PRATICA_ZONE = new HashMap<String, String>() {
+	public static final Map<String, String> PRATICA_ZONE = new HashMap<String, String>(8) {
 		{
 			put(PROCEDURA_A, TIPO_PRATICA_AUTORIZZAZIONE);
 			put(PROCEDURA_B, TIPO_PRATICA_DEPOSITO);
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/CronostoriaUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/CronostoriaUtil.java
index ada2da55..5087aaaf 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/CronostoriaUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/CronostoriaUtil.java
@@ -1,8 +1,9 @@
 package it.tref.liferay.portos.bo.shared.util;
 
 public interface CronostoriaUtil {
-  public static final String DOWNLOAD = "D";
-  public static final String LINK = "L";
-  public static final String TIPO_UTENTE = "U";
-  public static final String TIPO_GENIO_CIVILE = "G";
+
+	public static final String DOWNLOAD = "D";
+	public static final String LINK = "L";
+	public static final String TIPO_UTENTE = "U";
+	public static final String TIPO_GENIO_CIVILE = "G";
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java
index 2f325122..39c5bedd 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java
@@ -1,13 +1,12 @@
 package it.tref.liferay.portos.bo.shared.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
 
-import com.liferay.portal.kernel.language.LanguageUtil;
-
 import javax.servlet.jsp.PageContext;
 
+import com.liferay.portal.kernel.language.LanguageUtil;
+
 public class DocumentiPraticaUtil {
 
 	public final static String TIPOLOGIA_ALLEGATO_A00 = "A00";
@@ -74,233 +73,112 @@ public class DocumentiPraticaUtil {
 		return LanguageUtil.get(pageContext, "label.geniocivilefe.domanda.allegati." + code.toLowerCase());
 	}
 
-	public static List<String> getDocConUnicaCopiaPresente() {
-		List<String> docUnici = new ArrayList<String>();
-		docUnici.add(TIPOLOGIA_ALLEGATO_A00);
-		docUnici.add(TIPOLOGIA_ALLEGATO_A01);
-		docUnici.add(TIPOLOGIA_ALLEGATO_A11);
-		docUnici.add(TIPOLOGIA_ALLEGATO_A12);
-		docUnici.add(TIPOLOGIA_ALLEGATO_A14);
-		return docUnici;
-	}
+	private static final List<String> DOC_OBBLIGATORI = Arrays.asList(TIPOLOGIA_ALLEGATO_A00, TIPOLOGIA_ALLEGATO_A02,
+			TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A04, TIPOLOGIA_ALLEGATO_A05, TIPOLOGIA_ALLEGATO_A06,
+			TIPOLOGIA_ALLEGATO_A07, TIPOLOGIA_ALLEGATO_A08, TIPOLOGIA_ALLEGATO_A09, TIPOLOGIA_ALLEGATO_A10,
+			TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A14, TIPOLOGIA_ALLEGATO_A15, TIPOLOGIA_ALLEGATO_A17,
+			TIPOLOGIA_ALLEGATO_DELEGA);
 
 	public static List<String> getDocObbligatori() {
-		List<String> docObbligatori = new ArrayList<String>();
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A00);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A02);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A03);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A04);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A05);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A06);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A07);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A08);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A09);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A10);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A13);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A14);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A15);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_A17);
-		docObbligatori.add(TIPOLOGIA_ALLEGATO_DELEGA);
-		return docObbligatori;
 
+		return DOC_OBBLIGATORI;
 	}
 
-	public static List<String> getDocObbligatoriCheck() {
-		List<String> docObbligatoriCheck = new ArrayList<String>();
-		docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A05);
-		docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A06);
-		docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A07);
-		docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A09);
-		docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A14);
+	// TIPOLOGIA_ALLEGATO_A06) sia qui che in sez. geologica
+	private static final List<String> DOC_DOMANDA = Arrays.asList(TIPOLOGIA_ALLEGATO_A00, TIPOLOGIA_ALLEGATO_A01,
+			TIPOLOGIA_ALLEGATO_A02, TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A04, TIPOLOGIA_ALLEGATO_A06,
+			TIPOLOGIA_ALLEGATO_A07, TIPOLOGIA_ALLEGATO_A08, TIPOLOGIA_ALLEGATO_A09, TIPOLOGIA_ALLEGATO_A10,
+			TIPOLOGIA_ALLEGATO_A11, TIPOLOGIA_ALLEGATO_A12, TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A17,
+			TIPOLOGIA_ALLEGATO_ALTRI, TIPOLOGIA_ALLEGATO_DELEGA);
 
-		return docObbligatoriCheck;
+	public static List<String> getDocDomanda() {
 
+		return DOC_DOMANDA;
 	}
 
-	public static List<String> getDocDomanda() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_A00);
-		doc.add(TIPOLOGIA_ALLEGATO_A01);
-		doc.add(TIPOLOGIA_ALLEGATO_A02);
-		doc.add(TIPOLOGIA_ALLEGATO_A03);
-		doc.add(TIPOLOGIA_ALLEGATO_A04);
-		doc.add(TIPOLOGIA_ALLEGATO_A06); // Sia qui che in sez. geologica
-		doc.add(TIPOLOGIA_ALLEGATO_A07);
-		doc.add(TIPOLOGIA_ALLEGATO_A08);
-		doc.add(TIPOLOGIA_ALLEGATO_A09);
-		doc.add(TIPOLOGIA_ALLEGATO_A10);
-		doc.add(TIPOLOGIA_ALLEGATO_A11);
-		doc.add(TIPOLOGIA_ALLEGATO_A12);
-		doc.add(TIPOLOGIA_ALLEGATO_A13);
-		doc.add(TIPOLOGIA_ALLEGATO_A17);
-		doc.add(TIPOLOGIA_ALLEGATO_ALTRI);
-		doc.add(TIPOLOGIA_ALLEGATO_DELEGA);
-
-		return doc;
-	}
+	private static final List<String> DOC_OBBLIGATORI_DOMANDA = Arrays.asList(TIPOLOGIA_ALLEGATO_A00,
+			TIPOLOGIA_ALLEGATO_A02, TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A04, TIPOLOGIA_ALLEGATO_A06,
+			TIPOLOGIA_ALLEGATO_A07, TIPOLOGIA_ALLEGATO_A08, TIPOLOGIA_ALLEGATO_A09, TIPOLOGIA_ALLEGATO_A10,
+			TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A17, TIPOLOGIA_ALLEGATO_DELEGA);
+	private static final List<String> DOC_OBBLIGATORI_DOMANDA_C = Arrays.asList(TIPOLOGIA_ALLEGATO_A03);
 
 	public static List<String> getDocObbligatoriDomanda(String tipoProcedura) {
-		List<String> docObbligatori = new ArrayList<String>();
+
 		if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_C)) {
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A03);
+			return DOC_OBBLIGATORI_DOMANDA_C;
 		} else {
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A00);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A02);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A03);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A04);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A06);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A07);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A08);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A09);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A10);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A13);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_A17);
-			docObbligatori.add(TIPOLOGIA_ALLEGATO_DELEGA);
+			return DOC_OBBLIGATORI_DOMANDA;
 		}
-		return docObbligatori;
 	}
 
+	private static final List<String> DOC_GEOLOGO = Arrays.asList(TIPOLOGIA_ALLEGATO_A05, TIPOLOGIA_ALLEGATO_A06,
+			TIPOLOGIA_ALLEGATO_A14, TIPOLOGIA_ALLEGATO_A15, TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO, TIPOLOGIA_ALLEGATO_GEOLOGO_CPT, TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE, TIPOLOGIA_ALLEGATO_GEOLOGO_MASW, TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_DH, TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI, TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO, TIPOLOGIA_ALLEGATO_GEOLOGO_VARIE);
+
 	public static List<String> getDocGeologo() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_A05);
-		doc.add(TIPOLOGIA_ALLEGATO_A06);
-		doc.add(TIPOLOGIA_ALLEGATO_A14);
-		doc.add(TIPOLOGIA_ALLEGATO_A15);
-
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CPT);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_MASW);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_VARIE);
-		return doc;
 
+		return DOC_GEOLOGO;
 	}
 
+	private static final List<String> INDAGINI_GEOLOGICHE = Arrays.asList(TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO, TIPOLOGIA_ALLEGATO_GEOLOGO_CPT, TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE, TIPOLOGIA_ALLEGATO_GEOLOGO_MASW, TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_DH, TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI, TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO);
+
 	public static List<String> getIndaginiGeologiche() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CPT);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_MASW);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO);
-		return doc;
 
+		return INDAGINI_GEOLOGICHE;
 	}
 
+	private static final List<String> DOC_UNIVOCI = Arrays.asList(TIPOLOGIA_ALLEGATO_A00, TIPOLOGIA_ALLEGATO_A01,
+			TIPOLOGIA_ALLEGATO_A11, TIPOLOGIA_ALLEGATO_A12, TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A14,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO, TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_CPT, TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI, TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE, TIPOLOGIA_ALLEGATO_GEOLOGO_MASW, TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_DH, TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI, TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO,
+			TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO, TIPOLOGIA_ALLEGATO_GEOLOGO_VARIE);
+
 	public static List<String> getDocUnivoci() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_A00);
-		doc.add(TIPOLOGIA_ALLEGATO_A01);
-		doc.add(TIPOLOGIA_ALLEGATO_A11);
-		doc.add(TIPOLOGIA_ALLEGATO_A12);
-		doc.add(TIPOLOGIA_ALLEGATO_A13);
-		doc.add(TIPOLOGIA_ALLEGATO_A14);
-
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CAROTAGGIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_LABORATORIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_CPT);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DPSH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_INCLINOMETRICHE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOGNOSTICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_AFFIORAMENTI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_GEOMECCANICO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_RIFRAZIONE);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_MASW);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_HVSR);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_DH);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_PROSPEZIONI);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ARCHIVIO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_ALTRO);
-		doc.add(TIPOLOGIA_ALLEGATO_GEOLOGO_VARIE);
-		return doc;
 
+		return DOC_UNIVOCI;
 	}
 
-	public static List<String> getDocFineLavori() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_GIORNALE_LAVORI);
-		doc.add(TIPOLOGIA_ALLEGATO_CERTIFICATO_CALCESTRUZZO);
-		doc.add(TIPOLOGIA_ALLEGATO_CERTIFICATO_ACCIAIO);
-		doc.add(TIPOLOGIA_ALLEGATO_CERTIFICATO_LEGNO);
-		doc.add(TIPOLOGIA_ALLEGATO_CERTIFICATO_LATERIZIO);
-		doc.add(TIPOLOGIA_ALLEGATO_ALTRI_FINE_LAVORI);
-		doc.add(TIPOLOGIA_DOCUMENTAZIONE_ALTRA_FINE_LAVORI);
+	private static final List<String> DOC_FINE_LAVORI = Arrays.asList(TIPOLOGIA_ALLEGATO_GIORNALE_LAVORI,
+			TIPOLOGIA_ALLEGATO_CERTIFICATO_CALCESTRUZZO, TIPOLOGIA_ALLEGATO_CERTIFICATO_ACCIAIO,
+			TIPOLOGIA_ALLEGATO_CERTIFICATO_LEGNO, TIPOLOGIA_ALLEGATO_CERTIFICATO_LATERIZIO,
+			TIPOLOGIA_ALLEGATO_ALTRI_FINE_LAVORI, TIPOLOGIA_DOCUMENTAZIONE_ALTRA_FINE_LAVORI);
 
-		return doc;
+	public static List<String> getDocFineLavori() {
 
+		return DOC_FINE_LAVORI;
 	}
 
-	public static List<String> getDocObbligatoriFineLavori() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_GIORNALE_LAVORI);
+	private static final List<String> DOC_OBBLIGATORI_FINE_LAVORI = Arrays.asList(TIPOLOGIA_ALLEGATO_GIORNALE_LAVORI);
 
-		return doc;
+	public static List<String> getDocObbligatoriFineLavori() {
 
+		return DOC_OBBLIGATORI_FINE_LAVORI;
 	}
 
 	public static List<String> getDocCollaudo() {
-		List<String> doc = new ArrayList<String>();
-
-		doc.add(TIPOLOGIA_ALLEGATO_RELAZIONE_COLLAUDO);
-		doc.add(TIPOLOGIA_ALLEGATO_ALTRA_DOC);
-
-		return doc;
 
+		return Arrays.asList(TIPOLOGIA_ALLEGATO_RELAZIONE_COLLAUDO, TIPOLOGIA_ALLEGATO_ALTRA_DOC);
 	}
 
-	public static List<String> getDocObbligatoriCollaudo() {
-		List<String> doc = new ArrayList<String>();
+	private static final List<String> DOC_OBBLIGATORI_COLLAUDO = Arrays.asList(TIPOLOGIA_ALLEGATO_RELAZIONE_COLLAUDO);
 
-		doc.add(TIPOLOGIA_ALLEGATO_RELAZIONE_COLLAUDO);
-
-		return doc;
-
-	}
-
-	public static HashMap<String, Boolean> getDocControllo() {
-		HashMap<String, Boolean> docControl = new HashMap<String, Boolean>();
-		docControl.put(TIPOLOGIA_ALLEGATO_A00, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A01, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A02, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A03, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A04, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A05, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A06, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A07, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A08, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A09, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A10, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A13, false);
-		docControl.put(TIPOLOGIA_ALLEGATO_A14, false);
-		return docControl;
+	public static List<String> getDocObbligatoriCollaudo() {
 
+		return DOC_OBBLIGATORI_COLLAUDO;
 	}
-
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java
index 17c000db..f1b75ccf 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java
@@ -12,11 +12,13 @@ public class FascicoloURLUtil {
 
 	@Deprecated
 	public static String getFascicoloViewURL(long companyId, long intPraticaId) throws PortalException, SystemException {
+
 		return getFascicoloBOViewURL(companyId, intPraticaId);
 	}
 
 	public static String getFascicoloFEViewURL(long companyId, long intPraticaId, String mvcPath, String queryString)
 			throws PortalException, SystemException {
+
 		Company company = CompanyLocalServiceUtil.getCompany(companyId);
 		String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_FE, false);
 		urlToBack = HttpUtil.addParameter(urlToBack, StringPool.UNDERLINE + PortletKeys.FASCICOLOFE + "_intPraticaId",
@@ -39,9 +41,9 @@ public class FascicoloURLUtil {
 
 	public static String getFascicoloBOViewURL(long companyId, long intPraticaId) throws PortalException,
 			SystemException {
+
 		Company company = CompanyLocalServiceUtil.getCompany(companyId);
-		String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false);
-		urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId;
-		return urlToBack;
+		return ((String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false)) + "&_"
+				+ PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FirmeUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FirmeUtil.java
index 67990741..e0bb1d30 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FirmeUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FirmeUtil.java
@@ -15,6 +15,7 @@ import com.liferay.portal.kernel.util.UniqueList;
 public class FirmeUtil {
 
 	public static String addFirma(FirmeBean firmeBean, String codiceFiscale) {
+
 		List<FirmeDetail> firme = new UniqueList<FirmeDetail>();
 		firme.addAll(firmeBean.getFirmeApplicativo());
 		firme.add(new FirmeDetail(codiceFiscale.toLowerCase(), new Date()));
@@ -23,6 +24,7 @@ public class FirmeUtil {
 	}
 
 	public static String addFirmaDigitale(FirmeBean firmeBean, String codiceFiscale) {
+
 		List<FirmeDetail> firme = new UniqueList<FirmeDetail>();
 		firme.addAll(firmeBean.getFirmeDigitali());
 		firme.add(new FirmeDetail(codiceFiscale.toLowerCase(), null));
@@ -31,33 +33,39 @@ public class FirmeUtil {
 	}
 
 	public static String addFirma(String jsonFirmatari, String codiceFiscale) {
+
 		FirmeBean firmeBean = deserialize(jsonFirmatari);
 		return addFirma(firmeBean, codiceFiscale);
 	}
 
 	public static String addFirmaDigitale(String jsonFirmatari, String codiceFiscale) {
+
 		FirmeBean firmeBean = deserialize(jsonFirmatari);
 		return addFirmaDigitale(firmeBean, codiceFiscale);
 
 	}
 
 	public static String removeFirma(FirmeBean firmeBean, String codiceFiscale) {
+
 		firmeBean.removeFirmeApplicativo(codiceFiscale);
 		JSONSerializer jsonSerializer = JSONFactoryUtil.createJSONSerializer().exclude("class");
 		return jsonSerializer.serializeDeep(firmeBean);
 	}
 
 	public static String removeFirma(String jsonFirmatari, String codiceFiscale) {
+
 		FirmeBean firmeBean = deserialize(jsonFirmatari);
 		return removeFirma(firmeBean, codiceFiscale);
 	}
 
 	public static String serialize(FirmeBean firmeBean) {
+
 		JSONSerializer jsonSerializer = JSONFactoryUtil.createJSONSerializer().exclude("class");
 		return jsonSerializer.serializeDeep(firmeBean);
 	}
 
 	public static FirmeBean deserialize(String jsonFirmatari) {
+
 		JSONDeserializer<Object> jsonSerializer = JSONFactoryUtil.createJSONDeserializer();
 		@SuppressWarnings("unchecked")
 		Map<String, List<FirmeDetail>> deserialized = (Map<String, List<FirmeDetail>>) jsonSerializer
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/GenericUtils.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/GenericUtils.java
deleted file mode 100644
index 794cdc37..00000000
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/GenericUtils.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package it.tref.liferay.portos.bo.shared.util;
-
-import java.util.List;
-
-public class GenericUtils {
-
-	public static <T> void addIfnotExist(List<T> list, T item) {
-		if (!list.contains(item)) {
-			list.add(item);
-		}
-	}
-
-	public static <T> void addAllIfnotExist(List<T> list, List<T> items) {
-		for (T item : items) {
-			addIfnotExist(list, item);
-		}
-	}
-}
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/PagamentoConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/PagamentoConstants.java
index c4a6a093..fe7b94e4 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/PagamentoConstants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/PagamentoConstants.java
@@ -23,7 +23,7 @@ public class PagamentoConstants {
 	public static final String UTILIZZATA_ANNULLATO = "08";
 
 	@SuppressWarnings("serial")
-	private static final Map<String, String> mezzoToLabel = new HashMap<String, String>() {
+	private static final Map<String, String> mezzoToLabel = new HashMap<String, String>(3) {
 		{
 			put(MEZZO_ZERO, "label.pratica.pagamento.mezzo.zero");
 			put(MEZZO_MANUALE, "label.pratica.pagamento.mezzo.manuale");
@@ -31,10 +31,10 @@ public class PagamentoConstants {
 		}
 	};
 
-	public PagamentoConstants() {
-	}
+	public PagamentoConstants() {}
 
 	public static String mezzoToLabel(String mezzo) {
+
 		return mezzoToLabel.get(mezzo);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SessionUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SessionUtil.java
index b0fe0594..4f0f35b7 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SessionUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SessionUtil.java
@@ -5,30 +5,29 @@ import java.util.Enumeration;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.StringPool;
 
 public class SessionUtil {
 	private final static String PREFIX = "SessionUtil.";
 	private final static String DETTPRATICA_CLASSNAME = "DettPratica.";
 
-	private final static Log _log = LogFactoryUtil.getLog(SessionUtil.class);
+	public static void setDettPraticaObject(HttpServletRequest request, long dettPraticaId, String label, Object object) {
 
-	public static void setDettPraticaObject(HttpServletRequest request, long dettPraticaId, String label,
-			Object object) {
 		setObject(request, getLabel(DETTPRATICA_CLASSNAME, dettPraticaId, label), object);
 	}
 
 	public static Object getDettPraticaObject(HttpServletRequest request, long dettPraticaId, String label) {
+
 		return getObject(request, getLabel(DETTPRATICA_CLASSNAME, dettPraticaId, label));
 	}
 
 	public static void cleanDettPraticaObjects(HttpServletRequest request, long dettPraticaId) {
+
 		cleanDettPraticaObjects(request.getSession(), dettPraticaId);
 	}
 
 	public static void cleanDettPraticaObjects(HttpSession session, long dettPraticaId) {
+
 		String prefix = getPrefix(DETTPRATICA_CLASSNAME, dettPraticaId);
 		Enumeration<String> names = session.getAttributeNames();
 		while (names.hasMoreElements()) {
@@ -40,27 +39,32 @@ public class SessionUtil {
 	}
 
 	public static Object getObject(HttpServletRequest request, String label) {
+
 		return getObject(request.getSession(), label);
 	}
 
 	public static Object getObject(HttpSession session, String label) {
-		Object object = session.getAttribute(label);
-		return object;
+
+		return session.getAttribute(label);
 	}
 
 	public static void setObject(HttpServletRequest request, String label, Object object) {
+
 		setObject(request.getSession(), label, object);
 	}
 
 	public static void setObject(HttpSession session, String label, Object object) {
+
 		session.setAttribute(label, object);
 	}
 
 	private static String getLabel(String className, long classPK, String label) {
+
 		return getPrefix(className, classPK) + StringPool.PERIOD + label;
 	}
 
 	private static String getPrefix(String className, long classPK) {
+
 		return PREFIX + className + classPK;
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
index c694cd95..2dcb4418 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
@@ -6,28 +6,19 @@ import java.util.Map;
 public class StatoPraticaConstants {
 
 	public final static String SORTEGGIATA = "SO";
-
 	public final static String SOTTOPOSTA_A_PARERE = "SP";
-
 	public final static String RIFIUTATA = "RI";
 	public final static String VIDIMATA = "VI";
-
 	public final static String CONFORME = "CO";
 	public final static String NON_CONFORME = "NC";
-
 	public final static String INTEGRAZIONE = "IN";
-
 	public final static String VARIATA = "VA";
-
 	public static final String FINE_LAVORI = "FL";
 	public static final String COLLAUDO = "CL";
 	public static final String FINE_LAVORI_PARZIALE = "FP";
 	public static final String COLLAUDO_PARZIALE = "CP";
-
 	public static final String ANNULLATA = "AL";
-
 	public static final String INTEGRAZIONE_ACCETTATA = "SI";
-
 	/* Stati "virtuali" */
 	public static final String CAMBIO_ISTRUTTORE = "CI";
 	public final static String AUTORIZZATA = "AU";
@@ -37,7 +28,7 @@ public class StatoPraticaConstants {
 	public static final String INVIO_AVVISO_MANUALE = "MA";
 
 	@SuppressWarnings("serial")
-	private static final Map<String, String> statusLabel = new LinkedHashMap<String, String>() {
+	private static final Map<String, String> statusLabel = new LinkedHashMap<String, String>(15) {
 		{
 			put(StatoPraticaConstants.SORTEGGIATA, "label.admingeniocivile.statopratica.sorteggiata");
 			put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "label.admingeniocivile.statopratica.sottopostaaparere");
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoIntegrazioneUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoIntegrazioneUtil.java
index 1075c517..ef069057 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoIntegrazioneUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoIntegrazioneUtil.java
@@ -1,6 +1,6 @@
 package it.tref.liferay.portos.bo.shared.util;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class TipoIntegrazioneUtil {
@@ -14,15 +14,10 @@ public class TipoIntegrazioneUtil {
 	public static final String VARIAZIONE_SOGGETTO = "12";
 	public static final String VARIANTE = "13";
 
-	@SuppressWarnings("serial")
-	private static final List<String> outOfWorkflow = new ArrayList<String>() {
-		{
-			add(VARIAZIONE_SOGGETTO);
-			add(ANNULLA);
-		}
-	};
+	private static final List<String> outOfWorkflow = Arrays.asList(VARIAZIONE_SOGGETTO, ANNULLA);
 
 	public static boolean isOutOfWorkflow(String tipoIntegrazione) {
+
 		return outOfWorkflow.contains(tipoIntegrazione);
 	}
 }
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java
index 60edf122..633f7ee1 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java
@@ -1,6 +1,6 @@
 package it.tref.liferay.portos.bo.shared.util;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -15,23 +15,17 @@ public class TipoSoggettoUtil {
 
 	public static final String JSON_CODICE_FISCALE = "codiceFiscale";
 
-	@SuppressWarnings("serial")
-	private static final List<String> allSubjects = new ArrayList<String>() {
-		{
-			add(TipoSoggettoUtil.COMMITTENTE);
-			add(TipoSoggettoUtil.DITTA);
-			add(TipoSoggettoUtil.PROGETTISTA);
-			add(TipoSoggettoUtil.DIRETTORE_LAVORI);
-			add(TipoSoggettoUtil.GEOLOGO);
-			add(TipoSoggettoUtil.COLLAUDATORE);
-		}
-	};
+	private static final List<String> allSubjects = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DITTA,
+			TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO,
+			TipoSoggettoUtil.COLLAUDATORE);
 
 	public static List<String> getAllSubjects() {
+
 		return allSubjects;
 	}
 
 	public static boolean validaCodiceFiscale(String codiceFiscale, boolean ultimoCarattere) {
+
 		// conversione della stringa in caratteri maiuscoli
 		try {
 			String cf = codiceFiscale.toUpperCase().replaceAll(" ", "");
@@ -101,7 +95,8 @@ public class TipoSoggettoUtil {
 			} else {
 				return false;
 			}
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			return false;
 		}
 	}
diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath
index b079ea96..84f163c5 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath
+++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
+	<classpathentry kind="lib" path="/home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/ext/portal-service.jar" sourcepath="/home/ture/liferay/src/liferay-patched/liferay-portal"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RestFile.java b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RestFile.java
index d09f4f45..a33c0acb 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RestFile.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RestFile.java
@@ -3,6 +3,8 @@ package it.tref.firma.shared;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.liferay.portal.kernel.util.StringPool;
+
 public class RestFile implements Serializable {
 	private static final long serialVersionUID = 560778228734037313L;
 
@@ -16,28 +18,29 @@ public class RestFile implements Serializable {
 	public RestFile() {
 		this.idFile = Integer.valueOf(-1);
 		this.dataInvio = new Date();
-		this.nomeFile = "";
-		this.documentiType = "";
-		this.tipoPratica = "";
-		setFile("");
+		this.nomeFile = StringPool.BLANK;
+		this.documentiType = StringPool.BLANK;
+		this.tipoPratica = StringPool.BLANK;
+		setFile(StringPool.BLANK);
 	}
 
+	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		if (this.idFile != null) {
 			sb.append("Id = ");
 			sb.append(this.idFile);
-			sb.append(" ");
+			sb.append(StringPool.SPACE);
 		}
 		if (this.documentiType != null) {
 			sb.append("Documenti type = ");
 			sb.append(this.documentiType);
-			sb.append(" ");
+			sb.append(StringPool.SPACE);
 		}
 		if (this.tipoPratica != null) {
 			sb.append("Tipo pratica= ");
 			sb.append(this.tipoPratica);
-			sb.append(" ");
+			sb.append(StringPool.SPACE);
 		}
 		return sb.toString();
 	}
diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RispostaCostanti.java b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RispostaCostanti.java
index 743d6a8a..42f7aa39 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RispostaCostanti.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/src/it/tref/firma/shared/RispostaCostanti.java
@@ -1,8 +1,8 @@
 package it.tref.firma.shared;
 
 public interface RispostaCostanti {
-	public static final int NO_SET = -100;
 
+	public static final int NO_SET = -100;
 	public static final int OK = 0;
 	public static final int NO_CONFIGURATION = 1;
 	public static final int NO_UTENTE = 2;
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component
index 0241a5f3..d93ec973 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component
@@ -2,10 +2,10 @@
     <wb-module deploy-name="portos-kaleo-web">
         <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="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-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">
+        <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-kaleo-web"/>
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/build.xml b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/build.xml
index e80f359f..f1300035 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/build.xml
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/build.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE project>
-
 <project name="portos-kaleo-web" basedir="." default="deploy">
 	<import file="../build-common-web.xml" />
-	
 	<property name="original.war.file" value="kaleo-web-6.2.0.3.war" />
-	
 	<property name="import.shared" value="portos-bo-shared,portos-kaleo-shared" />
-	
 </project>
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/liferay-plugin-package.properties
index 0ec58156..68fef372 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/liferay-plugin-package.properties
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/liferay-plugin-package.properties
@@ -8,12 +8,13 @@ page-url=http://www.liferay.com
 author=Liferay, Inc.
 licenses=LGPL
 portal-dependency-jars=\
+    commons-codec.jar,\
     commons-collections.jar,\
+    commons-lang.jar,\
     jabsorb.jar,\
     json-java.jar,\
     slf4j-api.jar,\
-    util-slf4j.jar,\
-    commons-codec.jar
+    util-slf4j.jar
 required-deployment-contexts=\
     portos-kaleo-portlet,\
     portos-bo-portlet
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java
index e113d625..866d53ed 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java
@@ -14,7 +14,7 @@ import it.tref.liferay.portos.kaleo.util.WorkflowUtil;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -83,31 +83,19 @@ import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil;
 import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServiceUtil;
 
 public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
-	@SuppressWarnings("serial")
-	private static final List<String> valoriAmmessi = new ArrayList<String>() {
-		{
-			add(StatoPraticaConstants.ANNULLATA);
-			add(StatoPraticaConstants.CONFORME);
-			add(StatoPraticaConstants.INTEGRAZIONE);
-			add(StatoPraticaConstants.NON_CONFORME);
-		}
-	};
-
-	@SuppressWarnings("serial")
-	private static final List<Integer> logTypes = new ArrayList<Integer>() {
-		{
-			add(WorkflowLog.TASK_ASSIGN);
-			add(WorkflowLog.TASK_COMPLETION);
-			add(WorkflowLog.TASK_UPDATE);
-			add(WorkflowLog.TRANSITION);
-		}
-	};
+
+	private static final List<String> valoriAmmessi = Arrays.asList(StatoPraticaConstants.ANNULLATA,
+			StatoPraticaConstants.CONFORME, StatoPraticaConstants.INTEGRAZIONE, StatoPraticaConstants.NON_CONFORME);
+
+	private static final List<Integer> logTypes = Arrays.asList(WorkflowLog.TASK_ASSIGN, WorkflowLog.TASK_COMPLETION,
+			WorkflowLog.TASK_UPDATE, WorkflowLog.TRANSITION);
 
 	private final static Log _log = LogFactoryUtil.getLog(EditWorkflowTaskAction.class);
 
 	@Override
 	public void processAction(StrutsPortletAction originalStrutsPortletAction, PortletConfig portletConfig,
 			ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
+
 		String cmd = ParamUtil.getString(actionRequest, Constants.CMD);
 		if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) {
 			try {
@@ -124,7 +112,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 							+ SessionMessages.KEY_SUFFIX_CLOSE_REDIRECT, closeRedirect);
 				}
 				sendRedirect(actionRequest, actionResponse, redirect);
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				if (e instanceof WorkflowTaskDueDateException) {
 					SessionErrors.add(actionRequest, e.getClass());
 				} else if (e instanceof PrincipalException || e instanceof WorkflowException) {
@@ -141,6 +130,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected void assignTask(ActionRequest actionRequest) throws Exception {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
 		long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId");
@@ -150,6 +140,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected void completeTask(ActionRequest actionRequest) throws Exception {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
 		String transitionName = ParamUtil.getString(actionRequest, "transitionName");
@@ -161,19 +152,21 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 			HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil
 					.getHttpServletRequest(actionRequest));
 			String esito = httpServletRequest.getParameter("kaleo--esito--") != null ? httpServletRequest.getParameter(
-					"kaleo--esito--").trim() : "";
-			String testoDocumento = httpServletRequest.getParameter("kaleo--testo_del_documento--") != null ? httpServletRequest
-					.getParameter("kaleo--testo_del_documento--") : "";
-			if (!valoriAmmessi.contains(esito) || (esito.equalsIgnoreCase("IN") && testoDocumento.isEmpty())) {
+					"kaleo--esito--").trim() : StringPool.BLANK;
+			String testoDocumento = httpServletRequest.getParameter("kaleo--testo_del_documento--") != null
+					? httpServletRequest.getParameter("kaleo--testo_del_documento--") : StringPool.BLANK;
+			if (!valoriAmmessi.contains(esito)
+					|| (esito.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE) && testoDocumento.isEmpty())) {
 				_log.error("controllo validazione completamento task registra-esito = " + workflowTaskId
-						+ " non riuscito - esito non valorizzato o esito IN con testo del documento vuoto");
+						+ " non riuscito - esito non valorizzato o esito " + StatoPraticaConstants.INTEGRAZIONE
+						+ " con testo del documento vuoto");
 				throw new PortalException("controllo validazione completamento task registra-esito non riuscito");
 			}
 		} else if (transitionName.equalsIgnoreCase("Riassegna") || transitionName.equalsIgnoreCase("assegna")) {
 			HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil
 					.getHttpServletRequest(actionRequest));
 			String istr = httpServletRequest.getParameter("kaleo--istruttore--") != null ? httpServletRequest
-					.getParameter("kaleo--istruttore--").trim() : "";
+					.getParameter("kaleo--istruttore--").trim() : StringPool.BLANK;
 			if (istr.isEmpty()) {
 				_log.error("controllo validazione completamento task  = " + transitionName + " -" + workflowTaskId
 						+ " non riuscito - esito non valorizzato o esito IN con testo del documento vuoto");
@@ -183,7 +176,6 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 				KaleoTaskInstanceToken token = KaleoTaskInstanceTokenLocalServiceUtil
 						.getKaleoTaskInstanceToken(workflowTaskId);
 				if (Validator.isNotNull(token)) {
-
 					if (token.getClassName().equals(ControlloPratica.class.getName())) {
 						ControlloPratica controllo = ControlloPraticaLocalServiceUtil.getControlloPratica(token
 								.getClassPK());
@@ -203,7 +195,6 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 				}
 			}
 		}
-
 		Map<String, Serializable> workflowContext = new HashMap<String, Serializable>();
 		workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName);
 		WorkflowUtil.updateWorkflowContextWithTaskFormParameters(actionRequest, workflowContext);
@@ -212,6 +203,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected void relaseTask(ActionRequest actionRequest) throws Exception {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
 		long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId");
@@ -221,10 +213,12 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected boolean isCheckMethodOnProcessAction() {
+
 		return _CHECK_METHOD_ON_PROCESS_ACTION;
 	}
 
 	protected void updateTask(ActionRequest actionRequest) throws Exception {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
 		String comment = ParamUtil.getString(actionRequest, "comment");
@@ -247,11 +241,13 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 
 	protected void sendRedirect(ActionRequest actionRequest, ActionResponse actionResponse, String redirect)
 			throws IOException, SystemException {
+
 		sendRedirect(null, actionRequest, actionResponse, redirect, null);
 	}
 
 	protected void sendRedirect(PortletConfig portletConfig, ActionRequest actionRequest,
 			ActionResponse actionResponse, String redirect, String closeRedirect) throws IOException, SystemException {
+
 		if (isDisplaySuccessMessage(actionRequest)) {
 			addSuccessMessage(actionRequest, actionResponse);
 		}
@@ -285,6 +281,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected boolean isDisplaySuccessMessage(PortletRequest portletRequest) throws SystemException {
+
 		if (!SessionErrors.isEmpty(portletRequest)) {
 			return false;
 		}
@@ -299,7 +296,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 			if (layoutTypePortlet.hasPortletId(portletId)) {
 				return true;
 			}
-		} catch (PortalException pe) {
+		}
+		catch (PortalException pe) {
 			if (_log.isDebugEnabled()) {
 				_log.debug(pe, pe);
 			}
@@ -312,6 +310,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected void addSuccessMessage(ActionRequest actionRequest, ActionResponse actionResponse) {
+
 		PortletConfig portletConfig = (PortletConfig) actionRequest.getAttribute(JavaConstants.JAVAX_PORTLET_CONFIG);
 		boolean addProcessActionSuccessMessage = GetterUtil.getBoolean(
 				portletConfig.getInitParameter("add-process-action-success-action"), true);
@@ -323,10 +322,12 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	protected void setForward(PortletRequest portletRequest, String forward) {
+
 		portletRequest.setAttribute(getForwardKey(portletRequest), forward);
 	}
 
 	public static String getForwardKey(PortletRequest portletRequest) {
+
 		String portletId = (String) portletRequest.getAttribute(WebKeys.PORTLET_ID);
 		String portletNamespace = PortalUtil.getPortletNamespace(portletId);
 		return portletNamespace.concat(PORTLET_STRUTS_FORWARD);
@@ -337,6 +338,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	@Override
 	public String render(StrutsPortletAction originalStrutsPortletAction, PortletConfig portletConfig,
 			RenderRequest renderRequest, RenderResponse renderResponse) throws Exception {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) renderRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId");
 		WorkflowTask workflowTask = null;
@@ -358,11 +360,11 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 		User user = themeDisplay.getUser();
 		Organization org = OrganizationLocalServiceUtil.getOrganization(group.getClassPK());
 		boolean canPortosAssegnatore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
-				org.getGroupId(), "portos_assegnatore");
+				org.getGroupId(), Constants.ROLE_NAME_ASSEGNATORE);
 		boolean canPortosApprovatore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
-				org.getGroupId(), "portos_approvatore");
+				org.getGroupId(), Constants.ROLE_NAME_APPROVATORE);
 		boolean canPortosIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
-				org.getGroupId(), "portos_istruttore");
+				org.getGroupId(), Constants.ROLE_NAME_ISTRUTTORE);
 		renderRequest.setAttribute("canPortosAssegnatore", canPortosAssegnatore);
 		renderRequest.setAttribute("canPortosApprovatore", canPortosApprovatore);
 		renderRequest.setAttribute("canPortosIstruttore", canPortosIstruttore);
@@ -372,6 +374,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 
 	private String getTransitionValue(long taskInstanceId, String transitionName) throws PortalException,
 			SystemException {
+
 		ClassLoader classLoaderKaleoLog = (ClassLoader) PortletBeanLocatorUtil.locate(
 				it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader");
 		DynamicQuery dqKaleoLog = DynamicQueryFactoryUtil.forClass(FormLog.class, classLoaderKaleoLog);
@@ -388,28 +391,28 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 				String tipoEsito = StringPool.BLANK;
 				String appString = json.getString(WorkflowConstants.WORKFLOW_TASKNAME_ESITO);
 				switch (appString) {
-				case StatoPraticaConstants.INTEGRAZIONE:
-					tipoEsito = "Richiesta Integrazione";
-					break;
-				case StatoPraticaConstants.CONFORME:
-					if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-						tipoEsito = "Conforme";
-					} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-						tipoEsito = "Autorizzata";
-					}
-					break;
-				case StatoPraticaConstants.NON_CONFORME:
-					if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-						tipoEsito = "Non conforme";
-					} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-						tipoEsito = "Non autorizzata";
-					}
-					break;
-				case StatoPraticaConstants.ANNULLATA:
-					tipoEsito = "Annullata";
-					break;
-				default:
-					break;
+					case StatoPraticaConstants.INTEGRAZIONE:
+						tipoEsito = "Richiesta Integrazione";
+						break;
+					case StatoPraticaConstants.CONFORME:
+						if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+							tipoEsito = "Conforme";
+						} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
+							tipoEsito = "Autorizzata";
+						}
+						break;
+					case StatoPraticaConstants.NON_CONFORME:
+						if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+							tipoEsito = "Non conforme";
+						} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
+							tipoEsito = "Non autorizzata";
+						}
+						break;
+					case StatoPraticaConstants.ANNULLATA:
+						tipoEsito = "Annullata";
+						break;
+					default:
+						break;
 				}
 				return tipoEsito;
 			} else if (json.has("istruttore")) {
@@ -424,6 +427,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	}
 
 	private ControlloPratica getControlloPratica(long taskInstanceId) throws PortalException, SystemException {
+
 		PortletBeanLocatorUtil.locate(it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(),
 				"portletClassLoader");
 		KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId);
@@ -443,6 +447,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	 */
 	private Map<Long, String> getHistoryWorkfloLogs(ThemeDisplay themeDisplay, long workflowInstanceId,
 			RenderRequest renderRequest, ControlloPratica controlloPratica) {
+
 		Map<Long, String> esitiMapByWorkflowLogID = new HashMap<Long, String>();
 		try {
 			List<WorkflowLog> workflowLogs = WorkflowLogManagerUtil.getWorkflowLogsByWorkflowInstance(
@@ -460,42 +465,46 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 						if (formLog != null && Validator.isNotNull(formLog.getFormParameters())) {
 							JSONObject json = JSONFactoryUtil.createJSONObject(formLog.getFormParameters());
 							if (json.has(WorkflowConstants.WORKFLOW_TASKNAME_ESITO)) {
-								String tipoEsito = "";
+								String tipoEsito = StringPool.BLANK;
 								String appString = json.getString(WorkflowConstants.WORKFLOW_TASKNAME_ESITO);
 								switch (appString) {
-								case StatoPraticaConstants.INTEGRAZIONE:
-									tipoEsito = "Richiesta Integrazione";
-									break;
-								case StatoPraticaConstants.CONFORME:
-									if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-										tipoEsito = "Conforme";
-									} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-										tipoEsito = "Autorizzata";
-									}
-									break;
-								case StatoPraticaConstants.NON_CONFORME:
-									if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
-										tipoEsito = "Non conforme";
-									} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
-										tipoEsito = "Non autorizzata";
-									}
-									break;
-								case StatoPraticaConstants.ANNULLATA:
-									tipoEsito = "Annullata";
-									break;
-								default:
-									break;
+									case StatoPraticaConstants.INTEGRAZIONE:
+										tipoEsito = "Richiesta Integrazione";
+										break;
+									case StatoPraticaConstants.CONFORME:
+										if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+											tipoEsito = "Conforme";
+										} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica
+												.getIntPraticaId())) {
+											tipoEsito = "Autorizzata";
+										}
+										break;
+									case StatoPraticaConstants.NON_CONFORME:
+										if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
+											tipoEsito = "Non conforme";
+										} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica
+												.getIntPraticaId())) {
+											tipoEsito = "Non autorizzata";
+										}
+										break;
+									case StatoPraticaConstants.ANNULLATA:
+										tipoEsito = "Annullata";
+										break;
+									default:
+										break;
 								}
 								esitiMapByWorkflowLogID.put(workflowLog.getWorkflowLogId(), tipoEsito);
 							}
 						}
 					}
-				} catch (Exception e) {
+				}
+				catch (Exception e) {
 					// l'errore non va gestito
 					e.printStackTrace();
 				}
 			}
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			_log.error("Errore in getHistoryWorkflowLogs", e);
 		}
 		return esitiMapByWorkflowLogID;
@@ -509,6 +518,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	 * @param workflowTaskId
 	 */
 	private void checkPresenzaIstruttore(String transitionName, long workflowTaskId) {
+
 		if (transitionName.equalsIgnoreCase("registra-esito")) {
 			try {
 				KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
@@ -543,7 +553,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 								+ controlloPratica.getControlloPraticaId());
 					}
 				}
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				_log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" + e.getMessage()
 						+ " , " + e.getCause() + "]");
 			}
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java
index ca2df83a..ce2eeef1 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java
@@ -55,231 +55,185 @@ public class RenderFormTaskPortletAction extends BaseStrutsPortletAction {
 
 	private static Log _log = LogFactoryUtil.getLog(RenderFormTaskPortletAction.class);
 
-  @Override
-  public String render(PortletConfig portletConfig, RenderRequest renderRequest, RenderResponse renderResponse)
-      throws Exception {
-
-    ServiceContext serviceContext = ServiceContextFactory.getInstance(renderRequest);
-
-    long companyId = PortalUtil.getCompanyId(renderRequest);
-
-    long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId");
-    long assigneeUserId = ParamUtil.getLong(renderRequest, "assigneeUserId");
-    String transitionName = ParamUtil.getString(renderRequest, "transitionName");
-
-	
-    
-    KaleoTaskInstanceToken kaleoTaskInstanceToken =
-        KaleoTaskInstanceTokenLocalServiceUtil.getKaleoTaskInstanceToken(workflowTaskId);
-
-    KaleoDefinition kaleoDefinition =
-        KaleoDefinitionLocalServiceUtil.getKaleoDefinition(kaleoTaskInstanceToken.getKaleoDefinitionId());
-
-    KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
-
-    FormDefinitionLink formDefinitionLink =
-        FormDefinitionLinkLocalServiceUtil.fetchByC_DefinitionName_DefinitionVersion(companyId,
-            kaleoDefinition.getName(), kaleoDefinition.getVersion());
-
-    if (formDefinitionLink == null) {
-      return null;
-    }
-
-    FormTemplateLink formTemplateLink =
-        FormTemplateLinkLocalServiceUtil.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(
-            formDefinitionLink.getFormDefinitionLinkId(), kaleoTask.getKaleoNodeId(), transitionName);
-
-    if (formTemplateLink == null) {
-      return null;
-    }
-
-    long ddmTemplateId = formTemplateLink.getDdmTemplateId();
-    long ddmStructureId = formDefinitionLink.getDdmStructureId();
-
-    /*
-     * Script OnOpenForm
-     */
-    Map<String, Serializable> workflowContext =
-        WorkflowUtil.executeOnOpenForm(companyId, workflowTaskId, assigneeUserId, transitionName);
-
-    Map<String, Serializable> parameters = WorkflowUtil.getFormParameters(companyId, workflowTaskId);
-
-    Map<String, List<Map<String, Serializable>>> fieldNameOptions =
-        getOptions(workflowContext, serviceContext.getLocale());
-
-    renderRequest.setAttribute("ddmTemplateId", ddmTemplateId);
-    renderRequest.setAttribute("ddmStructureId", ddmStructureId);
-    renderRequest.setAttribute("parameters", parameters);
-    renderRequest.setAttribute("prefix", WorkflowConstants.PREFIX_NAME_ELEMENT_FORM);
-    renderRequest.setAttribute("suffix", WorkflowConstants.SUFFIX_NAME_ELEMENT_FORM);
-    renderRequest.setAttribute("fieldNameOptions", fieldNameOptions);
-
-    // ADT BUG BO id = 27 
-    String classPkForCarichiLavoro = ParamUtil.getString(renderRequest, "classPkForCarichiLavoro");
-    _log.info("classPkForCarichiLavoro = "+classPkForCarichiLavoro);
-    boolean checkVisualizzaCarichiLavoro=(ddmTemplateId==21699||ddmTemplateId==21705);
-    if (checkVisualizzaCarichiLavoro){
-    	renderRequest.setAttribute("classPkForCarichiLavoro", classPkForCarichiLavoro);    	
-    }
-    //ADT BUG BO ID=32
-    if (transitionName!=null&&transitionName.equalsIgnoreCase("registra-esito")){
-    	parameters.remove("esito");
-    	parameters.remove("testo_del_documento");
-    }
-    /////////////////
-    
-    
-    return "/portlet/workflow_tasks/render_form_task.jsp";
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public void serveResource(PortletConfig portletConfig, ResourceRequest resourceRequest,
-      ResourceResponse resourceResponse) throws Exception {
-
-    ServiceContext serviceContext = ServiceContextFactory.getInstance(resourceRequest);
-
-    long companyId = PortalUtil.getCompanyId(resourceRequest);
-
-    long workflowTaskId = ParamUtil.getLong(resourceRequest, "workflowTaskId");
-    long assigneeUserId = ParamUtil.getLong(resourceRequest, "assigneeUserId");
-    String transitionName = ParamUtil.getString(resourceRequest, "transitionName");
-
-    List<String> errors = new ArrayList<String>();
-
-    KaleoTaskInstanceToken kaleoTaskInstanceToken =
-        KaleoTaskInstanceTokenLocalServiceUtil.getKaleoTaskInstanceToken(workflowTaskId);
-
-    KaleoDefinition kaleoDefinition =
-        KaleoDefinitionLocalServiceUtil.getKaleoDefinition(kaleoTaskInstanceToken.getKaleoDefinitionId());
-
-    KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
-
-    FormDefinitionLink formDefinitionLink =
-        FormDefinitionLinkLocalServiceUtil.fetchByC_DefinitionName_DefinitionVersion(companyId,
-            kaleoDefinition.getName(), kaleoDefinition.getVersion());
-
-    if (formDefinitionLink != null) {
-
-      FormTemplateLink formTemplateLink =
-          FormTemplateLinkLocalServiceUtil.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(
-              formDefinitionLink.getFormDefinitionLinkId(), kaleoTask.getKaleoNodeId(), transitionName);
-
-      if (formTemplateLink != null) {
-
-        Map<String, Serializable> workflowContext = new HashMap<String, Serializable>();
-
-        WorkflowUtil.updateWorkflowContextWithTaskFormParameters(resourceRequest, workflowContext);
-
-        DDMTemplate ddmTemplate = DDMTemplateLocalServiceUtil.getDDMTemplate(formTemplateLink.getDdmTemplateId());
-
-        String xsd = DDMXSDUtil.getXSD(PortalUtil.getClassNameId(DDMTemplate.class), ddmTemplate.getTemplateId());
-
-        JSONArray jsonArray = DDMXSDUtil.getJSONArray(xsd);
-
-        Map<String, String> formParameters =
-            (Map<String, String>) workflowContext.get(WorkflowConstants.CONTEXT_TASK_FORM_PARAMETERS);
-
-        if (formParameters != null) {
-          for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject jsonObject = jsonArray.getJSONObject(i);
-            String name = jsonObject.getString("name");
-            boolean required = GetterUtil.getBoolean(jsonObject.getString("required"));
-            if (required) {
-              String value = formParameters.get(name);
-              if (Validator.isNull(value)) {
-                String language = ddmTemplate.getDefaultLanguageId();
-                JSONObject localizationMapJSON = jsonObject.getJSONObject("localizationMap");
-                if (localizationMapJSON.has(serviceContext.getLanguageId())) {
-                  language = serviceContext.getLanguageId();
-                } else if (!localizationMapJSON.has(language)) {
-                  DDMStructure ddmStructure =
-                      DDMStructureLocalServiceUtil.getDDMStructure(formDefinitionLink.getDdmStructureId());
-                  language = ddmStructure.getDefaultLanguageId();
-                }
-                String label = localizationMapJSON.getJSONObject(language).getString("label");
-                errors.add(LanguageUtil.format(serviceContext.getLocale(), "error-portos-kaleo-required", label));
-              }
-            }
-          }
-        }
-
-        /*
-         * Script OnValidation
-         */
-        workflowContext =
-            WorkflowUtil
-                .executeOnValidation(companyId, workflowTaskId, assigneeUserId, transitionName, workflowContext);
-
-        String json = MapUtil.getString(workflowContext, WorkflowConstants.CONTEXT_VALIDATION_OUTCOME_PARAMETER);
-        if (Validator.isNotNull(json)) {
-          JSONObject validationJSON = JSONFactoryUtil.createJSONObject(json);
-          JSONArray validationErrorsJSON = validationJSON.getJSONArray("errors");
-          if (validationErrorsJSON != null) {
-            for (int i = 0; i < validationErrorsJSON.length(); i++) {
-              errors.add(validationErrorsJSON.getString(i));
-            }
-          }
-        }
-      }
-    }
-
-    JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
-
-    if (!errors.isEmpty()) {
-      jsonObject.put("valid", false);
-      JSONArray jsonMessages = JSONFactoryUtil.createJSONArray();
-      for (String error : errors) {
-        jsonMessages.put(error);
-      }
-      jsonObject.put("messages", jsonMessages);
-    } else {
-      jsonObject.put("valid", true);
-    }
-
-    resourceResponse.setContentType(ContentTypes.APPLICATION_JSON);
-
-    HttpServletResponse httpServletResponse = PortalUtil.getHttpServletResponse(resourceResponse);
-
-    ServletResponseUtil.write(httpServletResponse, jsonObject.toString());
-
-    resourceResponse.flushBuffer();
-  }
-
-  private Map<String, List<Map<String, Serializable>>> getOptions(Map<String, Serializable> workflowContext,
-      Locale locale) throws PortalException {
-
-    Map<String, List<Map<String, Serializable>>> fieldNameOptions = Collections.emptyMap();
-
-    if (workflowContext.containsKey(WorkflowConstants.CONTEXT_OPEN_FORM_OPTIONS_PARAMETER)) {
-      String json = MapUtil.getString(workflowContext, WorkflowConstants.CONTEXT_OPEN_FORM_OPTIONS_PARAMETER);
-      if (Validator.isNotNull(json)) {
-        // field name (ddm) -> map<string, string>
-        fieldNameOptions = new HashMap<String, List<Map<String, Serializable>>>();
-        JSONObject jsonObject = JSONFactoryUtil.createJSONObject(json);
-        Iterator<String> it = jsonObject.keys();
-        while (it.hasNext()) {
-          String key = it.next();
-          // options
-          if (Validator.isNotNull(json)) {
-            JSONArray jsonArray = jsonObject.getJSONArray(key);
-            if (jsonArray != null) {
-              List<Map<String, Serializable>> options = new ArrayList<Map<String, Serializable>>();
-              for (int i = 0; i < jsonArray.length(); i++) {
-                JSONObject optionJSON = jsonArray.getJSONObject(i);
-                Map<String, Serializable> optionFields = new HashMap<String, Serializable>();
-                optionFields.put("label", LanguageUtil.get(locale, optionJSON.getString("label")));
-                optionFields.put("value", optionJSON.getString("value"));
-                optionFields.put("default", optionJSON.getBoolean("default"));
-                options.add(optionFields);
-              }
-              fieldNameOptions.put(key, options);
-            }
-          }
-        }
-      }
-    }
-
-    return fieldNameOptions;
-  }
+	@Override
+	public String render(PortletConfig portletConfig, RenderRequest renderRequest, RenderResponse renderResponse)
+			throws Exception {
+
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(renderRequest);
+		long companyId = PortalUtil.getCompanyId(renderRequest);
+		long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId");
+		long assigneeUserId = ParamUtil.getLong(renderRequest, "assigneeUserId");
+		String transitionName = ParamUtil.getString(renderRequest, "transitionName");
+		KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
+				.getKaleoTaskInstanceToken(workflowTaskId);
+		KaleoDefinition kaleoDefinition = KaleoDefinitionLocalServiceUtil.getKaleoDefinition(kaleoTaskInstanceToken
+				.getKaleoDefinitionId());
+		KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
+		FormDefinitionLink formDefinitionLink = FormDefinitionLinkLocalServiceUtil
+				.fetchByC_DefinitionName_DefinitionVersion(companyId, kaleoDefinition.getName(),
+						kaleoDefinition.getVersion());
+		if (formDefinitionLink == null) {
+			return null;
+		}
+		FormTemplateLink formTemplateLink = FormTemplateLinkLocalServiceUtil
+				.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(formDefinitionLink.getFormDefinitionLinkId(),
+						kaleoTask.getKaleoNodeId(), transitionName);
+		if (formTemplateLink == null) {
+			return null;
+		}
+		long ddmTemplateId = formTemplateLink.getDdmTemplateId();
+		long ddmStructureId = formDefinitionLink.getDdmStructureId();
+		/*
+		 * Script OnOpenForm
+		 */
+		Map<String, Serializable> workflowContext = WorkflowUtil.executeOnOpenForm(companyId, workflowTaskId,
+				assigneeUserId, transitionName);
+		Map<String, Serializable> parameters = WorkflowUtil.getFormParameters(companyId, workflowTaskId);
+		Map<String, List<Map<String, Serializable>>> fieldNameOptions = getOptions(workflowContext,
+				serviceContext.getLocale());
+		renderRequest.setAttribute("ddmTemplateId", ddmTemplateId);
+		renderRequest.setAttribute("ddmStructureId", ddmStructureId);
+		renderRequest.setAttribute("parameters", parameters);
+		renderRequest.setAttribute("prefix", WorkflowConstants.PREFIX_NAME_ELEMENT_FORM);
+		renderRequest.setAttribute("suffix", WorkflowConstants.SUFFIX_NAME_ELEMENT_FORM);
+		renderRequest.setAttribute("fieldNameOptions", fieldNameOptions);
+		String classPkForCarichiLavoro = ParamUtil.getString(renderRequest, "classPkForCarichiLavoro");
+		_log.info("classPkForCarichiLavoro = " + classPkForCarichiLavoro);
+		boolean checkVisualizzaCarichiLavoro = (ddmTemplateId == 21699 || ddmTemplateId == 21705);
+		if (checkVisualizzaCarichiLavoro) {
+			renderRequest.setAttribute("classPkForCarichiLavoro", classPkForCarichiLavoro);
+		}
+		if (transitionName != null && transitionName.equalsIgnoreCase("registra-esito")) {
+			parameters.remove("esito");
+			parameters.remove("testo_del_documento");
+		}
+		return "/portlet/workflow_tasks/render_form_task.jsp";
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void serveResource(PortletConfig portletConfig, ResourceRequest resourceRequest,
+			ResourceResponse resourceResponse) throws Exception {
+
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(resourceRequest);
+		long companyId = PortalUtil.getCompanyId(resourceRequest);
+		long workflowTaskId = ParamUtil.getLong(resourceRequest, "workflowTaskId");
+		long assigneeUserId = ParamUtil.getLong(resourceRequest, "assigneeUserId");
+		String transitionName = ParamUtil.getString(resourceRequest, "transitionName");
+		List<String> errors = new ArrayList<String>();
+		KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
+				.getKaleoTaskInstanceToken(workflowTaskId);
+		KaleoDefinition kaleoDefinition = KaleoDefinitionLocalServiceUtil.getKaleoDefinition(kaleoTaskInstanceToken
+				.getKaleoDefinitionId());
+		KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
+		FormDefinitionLink formDefinitionLink = FormDefinitionLinkLocalServiceUtil
+				.fetchByC_DefinitionName_DefinitionVersion(companyId, kaleoDefinition.getName(),
+						kaleoDefinition.getVersion());
+		if (formDefinitionLink != null) {
+			FormTemplateLink formTemplateLink = FormTemplateLinkLocalServiceUtil
+					.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(
+							formDefinitionLink.getFormDefinitionLinkId(), kaleoTask.getKaleoNodeId(), transitionName);
+			if (formTemplateLink != null) {
+				Map<String, Serializable> workflowContext = new HashMap<String, Serializable>();
+				WorkflowUtil.updateWorkflowContextWithTaskFormParameters(resourceRequest, workflowContext);
+				DDMTemplate ddmTemplate = DDMTemplateLocalServiceUtil.getDDMTemplate(formTemplateLink
+						.getDdmTemplateId());
+				String xsd = DDMXSDUtil.getXSD(PortalUtil.getClassNameId(DDMTemplate.class),
+						ddmTemplate.getTemplateId());
+				JSONArray jsonArray = DDMXSDUtil.getJSONArray(xsd);
+				Map<String, String> formParameters = (Map<String, String>) workflowContext
+						.get(WorkflowConstants.CONTEXT_TASK_FORM_PARAMETERS);
+				if (formParameters != null) {
+					for (int i = 0; i < jsonArray.length(); i++) {
+						JSONObject jsonObject = jsonArray.getJSONObject(i);
+						String name = jsonObject.getString("name");
+						boolean required = GetterUtil.getBoolean(jsonObject.getString("required"));
+						if (required) {
+							String value = formParameters.get(name);
+							if (Validator.isNull(value)) {
+								String language = ddmTemplate.getDefaultLanguageId();
+								JSONObject localizationMapJSON = jsonObject.getJSONObject("localizationMap");
+								if (localizationMapJSON.has(serviceContext.getLanguageId())) {
+									language = serviceContext.getLanguageId();
+								} else if (!localizationMapJSON.has(language)) {
+									DDMStructure ddmStructure = DDMStructureLocalServiceUtil
+											.getDDMStructure(formDefinitionLink.getDdmStructureId());
+									language = ddmStructure.getDefaultLanguageId();
+								}
+								String label = localizationMapJSON.getJSONObject(language).getString("label");
+								errors.add(LanguageUtil.format(serviceContext.getLocale(),
+										"error-portos-kaleo-required", label));
+							}
+						}
+					}
+				}
+				/*
+				 * Script OnValidation
+				 */
+				workflowContext = WorkflowUtil.executeOnValidation(companyId, workflowTaskId, assigneeUserId,
+						transitionName, workflowContext);
+				String json = MapUtil
+						.getString(workflowContext, WorkflowConstants.CONTEXT_VALIDATION_OUTCOME_PARAMETER);
+				if (Validator.isNotNull(json)) {
+					JSONObject validationJSON = JSONFactoryUtil.createJSONObject(json);
+					JSONArray validationErrorsJSON = validationJSON.getJSONArray("errors");
+					if (validationErrorsJSON != null) {
+						for (int i = 0; i < validationErrorsJSON.length(); i++) {
+							errors.add(validationErrorsJSON.getString(i));
+						}
+					}
+				}
+			}
+		}
+		JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
+		if (!errors.isEmpty()) {
+			jsonObject.put("valid", false);
+			JSONArray jsonMessages = JSONFactoryUtil.createJSONArray();
+			for (String error : errors) {
+				jsonMessages.put(error);
+			}
+			jsonObject.put("messages", jsonMessages);
+		} else {
+			jsonObject.put("valid", true);
+		}
+		resourceResponse.setContentType(ContentTypes.APPLICATION_JSON);
+		HttpServletResponse httpServletResponse = PortalUtil.getHttpServletResponse(resourceResponse);
+		ServletResponseUtil.write(httpServletResponse, jsonObject.toString());
+		resourceResponse.flushBuffer();
+	}
+
+	private Map<String, List<Map<String, Serializable>>> getOptions(Map<String, Serializable> workflowContext,
+			Locale locale) throws PortalException {
+
+		Map<String, List<Map<String, Serializable>>> fieldNameOptions = Collections.emptyMap();
+		if (workflowContext.containsKey(WorkflowConstants.CONTEXT_OPEN_FORM_OPTIONS_PARAMETER)) {
+			String json = MapUtil.getString(workflowContext, WorkflowConstants.CONTEXT_OPEN_FORM_OPTIONS_PARAMETER);
+			if (Validator.isNotNull(json)) {
+				// field name (ddm) -> map<string, string>
+				fieldNameOptions = new HashMap<String, List<Map<String, Serializable>>>();
+				JSONObject jsonObject = JSONFactoryUtil.createJSONObject(json);
+				Iterator<String> it = jsonObject.keys();
+				while (it.hasNext()) {
+					String key = it.next();
+					// options
+					if (Validator.isNotNull(json)) {
+						JSONArray jsonArray = jsonObject.getJSONArray(key);
+						if (jsonArray != null) {
+							List<Map<String, Serializable>> options = new ArrayList<Map<String, Serializable>>();
+							for (int i = 0; i < jsonArray.length(); i++) {
+								JSONObject optionJSON = jsonArray.getJSONObject(i);
+								Map<String, Serializable> optionFields = new HashMap<String, Serializable>();
+								optionFields.put("label", LanguageUtil.get(locale, optionJSON.getString("label")));
+								optionFields.put("value", optionJSON.getString("value"));
+								optionFields.put("default", optionJSON.getBoolean("default"));
+								options.add(optionFields);
+							}
+							fieldNameOptions.put(key, options);
+						}
+					}
+				}
+			}
+		}
+		return fieldNameOptions;
+	}
 }
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderHistoryFormAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderHistoryFormAction.java
index 01ff29c8..0c63bb7c 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderHistoryFormAction.java
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderHistoryFormAction.java
@@ -20,6 +20,7 @@ import com.liferay.portal.kernel.json.JSONDeserializer;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.struts.BaseStrutsPortletAction;
 import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.kernel.workflow.WorkflowTask;
@@ -62,7 +63,7 @@ public class RenderHistoryFormAction extends BaseStrutsPortletAction {
 						.getWorkflowInstanceId());
 				ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(kaleoInstance
 						.getClassPK());
-				String tipoEsito = "";
+				String tipoEsito = StringPool.BLANK;
 				String appString = (String) parameters.get(WorkflowConstants.WORKFLOW_TASKNAME_ESITO);
 				switch (appString) {
 				case StatoPraticaConstants.INTEGRAZIONE:
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java
index af115357..1ed6b392 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java
@@ -15,6 +15,8 @@ import java.util.Map;
 import javax.portlet.PortletRequest;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.liferay.portal.NoSuchWorkflowInstanceLinkException;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -23,7 +25,6 @@ import com.liferay.portal.kernel.json.JSONDeserializer;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowHandler;
 import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil;
@@ -47,20 +48,15 @@ public class WorkflowUtil {
 		ServiceContext serviceContext = new ServiceContext();
 		serviceContext.setCompanyId(companyId);
 		serviceContext.setUserId(assigneeUserId);
-
 		KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
 				.getKaleoTaskInstanceToken(workflowTaskId);
-
 		KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
-
 		Map<String, Serializable> workflowContext = new HashMap<String, Serializable>();
-
 		WorkflowHandler workflowHandler = WorkflowHandlerRegistryUtil.getWorkflowHandler(kaleoTaskInstanceToken
 				.getClassName());
 		if (workflowHandler != null) {
 			workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_TYPE, workflowHandler.getType(Locale.getDefault()));
 		}
-
 		workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_CLASS_NAME, kaleoTaskInstanceToken.getClassName());
 		workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_CLASS_PK,
 				String.valueOf(kaleoTaskInstanceToken.getClassPK()));
@@ -70,13 +66,10 @@ public class WorkflowUtil {
 		workflowContext.put(WorkflowConstants.CONTEXT_USER_ID, String.valueOf(assigneeUserId));
 		workflowContext.put(WorkflowConstants.CONTEXT_SERVICE_CONTEXT, serviceContext);
 		workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName);
-
 		ExecutionContext executionContext = new ExecutionContext(kaleoTaskInstanceToken.getKaleoInstanceToken(),
 				kaleoTaskInstanceToken, workflowContext, serviceContext);
-
 		ActionExecutorUtil.executeKaleoActions(KaleoNode.class.getName(), kaleoTask.getKaleoNodeId(),
 				ExecutionType.ON_OPEN_FORM, executionContext);
-
 		return executionContext.getWorkflowContext();
 	}
 
@@ -93,22 +86,17 @@ public class WorkflowUtil {
 		if (workflowContext == null) {
 			workflowContext = Collections.<String, Serializable> emptyMap();
 		}
-
 		ServiceContext serviceContext = new ServiceContext();
 		serviceContext.setCompanyId(companyId);
 		serviceContext.setUserId(assigneeUserId);
-
 		KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
 				.getKaleoTaskInstanceToken(workflowTaskId);
-
 		KaleoTask kaleoTask = kaleoTaskInstanceToken.getKaleoTask();
-
 		WorkflowHandler workflowHandler = WorkflowHandlerRegistryUtil.getWorkflowHandler(kaleoTaskInstanceToken
 				.getClassName());
 		if (workflowHandler != null) {
 			workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_TYPE, workflowHandler.getType(Locale.getDefault()));
 		}
-
 		workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_CLASS_NAME, kaleoTaskInstanceToken.getClassName());
 		workflowContext.put(WorkflowConstants.CONTEXT_ENTRY_CLASS_PK,
 				String.valueOf(kaleoTaskInstanceToken.getClassPK()));
@@ -118,13 +106,10 @@ public class WorkflowUtil {
 		workflowContext.put(WorkflowConstants.CONTEXT_USER_ID, String.valueOf(assigneeUserId));
 		workflowContext.put(WorkflowConstants.CONTEXT_SERVICE_CONTEXT, serviceContext);
 		workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName);
-
 		ExecutionContext executionContext = new ExecutionContext(kaleoTaskInstanceToken.getKaleoInstanceToken(),
 				kaleoTaskInstanceToken, workflowContext, serviceContext);
-
 		ActionExecutorUtil.executeKaleoActions(KaleoNode.class.getName(), kaleoTask.getKaleoNodeId(),
 				ExecutionType.ON_VALIDATION, executionContext);
-
 		return executionContext.getWorkflowContext();
 	}
 
@@ -138,26 +123,20 @@ public class WorkflowUtil {
 			String className, long workflowTaskId) throws PortalException, SystemException {
 
 		if (Validator.isNotNull(workflowTaskId)) {
-
 			KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
 					.getKaleoTaskInstanceToken(workflowTaskId);
-
 			companyId = kaleoTaskInstanceToken.getCompanyId();
 			groupId = kaleoTaskInstanceToken.getGroupId();
 			classPK = kaleoTaskInstanceToken.getClassPK();
 			className = kaleoTaskInstanceToken.getClassName();
 		}
-
 		WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(
 				companyId, groupId, className, classPK);
 		if (workflowInstanceLink == null) {
 			throw new NoSuchWorkflowInstanceLinkException();
 		}
-
 		long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();
-
 		Map<String, Serializable> parameters = new HashMap<String, Serializable>();
-
 		// order asc
 		List<FormLog> formLogs = FormLogLocalServiceUtil.findByC_Instance(companyId, workflowInstanceId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS);
@@ -169,7 +148,6 @@ public class WorkflowUtil {
 				parameters.putAll(jsonDeserializer.deserialize(formParameters));
 			}
 		}
-
 		return parameters;
 	}
 
@@ -189,7 +167,7 @@ public class WorkflowUtil {
 			}
 			String parameterName = name.substring(WorkflowConstants.PREFIX_NAME_ELEMENT_FORM.length(), name.length()
 					- WorkflowConstants.SUFFIX_NAME_ELEMENT_FORM.length());
-			String value = StringUtil.merge(ParamUtil.getParameterValues(portletRequest, name));
+			String value = StringUtils.join(ParamUtil.getParameterValues(portletRequest, name), ',');
 			formParameters.put(parameterName, value);
 		}
 		if (formParameters == null) {
@@ -207,7 +185,7 @@ public class WorkflowUtil {
 				}
 				String parameterName = name.substring(WorkflowConstants.PREFIX_NAME_ELEMENT_FORM.length(),
 						name.length() - WorkflowConstants.SUFFIX_NAME_ELEMENT_FORM.length());
-				String value = StringUtil.merge(ParamUtil.getParameterValues(httpServletRequest, name));
+				String value = StringUtils.join(ParamUtil.getParameterValues(httpServletRequest, name), ',');
 				formParameters.put(parameterName, value);
 			}
 		}
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
index efe61171..51eeb642 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=Kaleo
-    build.number=34
-    build.date=1629802401816
+    build.number=37
+    build.date=1630333022375
     build.auto.upgrade=true
 
 ##