Aggiunta la possibilità di cambiare esercizio nella liduidazione defi…

…nitiva e massiva dell'IVA
consiglionazionaledellericerche · Dec 23, 2024 · b9c39dd · b9c39dd
1 parent 82851f2
commit b9c39dd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/gestiva00/actions/LiquidazioneDefinitivaIvaAction.java b/sigla-ejb/src/main/java/it/cnr/contab/gestiva00/actions/LiquidazioneDefinitivaIvaAction.java
@@ -19,6 +19,8 @@
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.Optional;
+
 import it.cnr.contab.gestiva00.bp.LiquidazioneDefinitivaIvaBP;
 import it.cnr.contab.gestiva00.bp.LiquidazioneIvaBP;
 import it.cnr.contab.gestiva00.core.bulk.IPrintable;
@@ -228,7 +230,10 @@ protected it.cnr.jada.action.Forward setDataDaA(
 
     try {
 	    int esercizio = stampaBulk.getEsercizio().intValue();
-	    int meseIndex = ((Integer)stampaBulk.getMesi_int().get(stampaBulk.getMese())).intValue();
+		int meseIndex = Optional.ofNullable(stampaBulk.getMese())
+				.map(s -> {
+					return ((Integer)stampaBulk.getMesi_int().get(s)).intValue();
+				}).orElse(12);
 		java.util.GregorianCalendar gc = getGregorianCalendar();
 		gc.set(java.util.Calendar.DAY_OF_MONTH, 1);
 		gc.set(java.util.Calendar.YEAR, esercizio);

diff --git a/...main/resources/it/cnr/contab/gestiva00/core/bulk/Liquidazione_definitiva_ivaVBulkInfo.xml b/...main/resources/it/cnr/contab/gestiva00/core/bulk/Liquidazione_definitiva_ivaVBulkInfo.xml
@@ -275,6 +275,15 @@
 
 	<!-- ************************ FORM FIELD PROPERTY ******************** -->
 
+	<formFieldProperty
+			name="esercizio"
+			property="esercizio"
+			inputType="TEXT"
+			enabledOnSearch="true"
+			enabledOnEdit="true"
+			enabledOnInsert="true"
+			label="Esercizio"
+			command="doOnMeseChange"/>
 
 	<formFieldProperty name="data_da" />
 	<formFieldProperty name="data_a" />

diff --git a/sigla-web/src/main/webapp/gestiva00/liquidazione_definitiva_iva.jsp b/sigla-web/src/main/webapp/gestiva00/liquidazione_definitiva_iva.jsp
@@ -47,6 +47,12 @@
 				 <% } %>
 			</tr>     	
 			<% if (!richiamaChiusuraMode) { %>
+			    <tr>
+					<td>
+						<% bp.getController().writeFormLabel(out,"esercizio");%>
+					</td>
+			        <td><% bp.getController().writeFormInput(out,"esercizio");%></td>
+			    </tr>
 				<tr>
 					<td>
 						<% bp.getController().writeFormLabel(out,"mese");%>

diff --git a/sigla-web/src/main/webapp/gestiva00/liquidazione_massa_iva.jsp b/sigla-web/src/main/webapp/gestiva00/liquidazione_massa_iva.jsp
@@ -26,7 +26,7 @@
 <% LiquidazioneMassaIvaBP bp = (LiquidazioneMassaIvaBP)BusinessProcess.getBusinessProcess(request);
 	 bp.openFormWindow(pageContext); %>
 
-	<div class="Group" style="width:100%">
+	<div class="Group card p-2" style="width:100%">
 		<table width="100%">
 <!--
 			<tr>
@@ -38,8 +38,13 @@
 				</td>
 			</tr>
 -->
-
-			<tr>
+             <tr>
+                <td>
+                    <% bp.getController().writeFormLabel(out,"esercizio");%>
+                </td>
+                <td><% bp.getController().writeFormInput(out,"esercizio");%></td>
+             </tr>
+			 <tr>
 				<td>
 					<% bp.getController().writeFormLabel(out,"mese");%>
 				</td>
@@ -54,6 +59,8 @@
 				<td>
 					<% bp.getController().writeFormInput(out,null,"data_da",false,null,"");%>
 				</td>
+			</tr>
+			<tr>
 				<td>
 					<% bp.getController().writeFormLabel(out,"data_a");%>
 				</td>