diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar index 282c8364..473794ef 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar index 99b7c26a..87468fc8 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar index 0b1f673d..c71b076c 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar index 047a6e9f..31819359 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar index 282c8364..473794ef 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 158564ae..f851d364 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index 99b7c26a..87468fc8 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index 0b1f673d..c71b076c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 047a6e9f..31819359 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 1adc3001..a73560d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -1131,6 +1131,7 @@ label.error.file.annullamento.already.exist = Impossibile generare il file di an error.geniocivilefe.pratica.allegato.ext.valid = Estensione Allegato non valida error.geniocivilefe.pratica.allegato.length.valid = Lunghezza massima nome file superata +error.geniocivilefe.pagamento.bollettino = Numero marca da bollo non inserito # Manifattura Web Group, mofidica per rendere la dimensione massima degli allegati configurabile # da pannello di controllo. In origine era hardcoded a 20971520 byte. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java index 4d0bf1b3..e5ed489f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java @@ -1,5 +1,16 @@ package it.tref.liferay.portos.bo.scheduler; +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.messaging.Message; +import com.liferay.portal.kernel.messaging.MessageListener; +import com.liferay.portal.kernel.messaging.MessageListenerException; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; + import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; @@ -16,17 +27,6 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -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.messaging.Message; -import com.liferay.portal.kernel.messaging.MessageListener; -import com.liferay.portal.kernel.messaging.MessageListenerException; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; - public class SchedulerGeneraProtocollo implements MessageListener { private static final Log _log = LogFactoryUtil.getLog(SchedulerGeneraProtocollo.class); 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 474a2028..e9527964 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=2970 - build.date=1707838344827 + build.number=2982 + build.date=1708674243125 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 158564ae..f851d364 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index 0b1f673d..c71b076c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 047a6e9f..31819359 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 38c0e1e9..edb993ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -2272,6 +2272,13 @@ public class FascicoloFePortlet extends MVCPortlet { ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest); long pagamentoId = ParamUtil.getLong(uploadRequest, "pagamentoId"); String numeroBollettino = ParamUtil.getString(request, "numeroBollettino", StringPool.BLANK); + if(numeroBollettino.equals(StringPool.BLANK)){ + numeroBollettino= ParamUtil.getString(uploadRequest, "numeroHBollettino", StringPool.BLANK); + if(!numeroBollettino.equals(StringPool.QUESTION)){ + SessionErrors.add(request, "error.geniocivilefe.pagamento.bollettino"); + } + numeroBollettino=StringPool.BLANK; + } String sourceFileName = uploadRequest.getFileName("docFile"); File file = uploadRequest.getFile("docFile"); if (Validator.isNotNull(sourceFileName) && file != null) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp index 68913c2d..a8665c0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp @@ -71,6 +71,8 @@ + + @@ -152,6 +154,7 @@ 'p7m,pdf' + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp index 70e0eb07..9fc484bb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp @@ -17,6 +17,7 @@ long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); long fineLavoriId = ParamUtil.getLong(request, "fineLavoriId"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId); +String testoPagamento = (String) company.getExpandoBridge().getAttribute("testo_pagamento", false); if (fineLavori == null) { fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); } @@ -43,6 +44,8 @@ if (Validator.isNotNull(pagamento)) { String formRicevutaPagamento = "fmRicevuta"; String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request); %> + + @@ -109,9 +112,9 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request); -
- <%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %> - +
+ <%= testoPagamento %> + <%-- <%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %> --%>
'p7m,pdf' +
@@ -354,7 +358,7 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
<% String paymentConfirmText = StringPool.BLANK; - paymentConfirmText = LanguageUtil.get(pageContext, "label-confirm-payment-manual"); + paymentConfirmText = (String) company.getExpandoBridge().getAttribute("testo_pagamento_breve", false); %> <%= paymentConfirmText %>