Merge branch 'feature/Ajuste66' into develop

front/src/main/webapp/js/dda/admin/catalogos/addons/addon.js

@@ -230,7 +230,7 @@ function procesaRespuestaObtenAddOn(jsonData) {
 function showErrorModal(msg)
 {
 	$("html, body").animate({ scrollTop: 0 }, "slow");
-	$("#divErrorModal").html("<div class='alert alert-dismissible alert-danger'> <button type='button' class='close' data-dismiss='alert'>×</button> <h4>Error</h4>"+parseMessage(msg)+"</div>");
+	$("#divErrorModal").html("<div class='alert alert-dismissible alert-danger'> <button type='button' class='close' data-dismiss='alert'></button> <h4>Error</h4>"+parseMessage(msg)+"</div>");
 	closeDialog("divErrorModal");
 };
 

front/src/main/webapp/jsp/common/defaultTopLogin.jsp

@@ -202,14 +202,14 @@ function parseMessage(msg){
 function showError(msg)
 {
 	$("html, body").animate({ scrollTop: 0 }, "slow");
-	$("#divError").html("<div class='alert alert-dismissible alert-danger'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Error</h4>"+parseMessage(msg)+"</div>");
+	$("#divError").html("<div class='alert alert-dismissible alert-danger'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Error</h4>"+parseMessage(msg)+"</div>");
 	closeDialog("divError");
 };
 
 function showMessage(msg)
 {
 	$("html, body").animate({ scrollTop: 0 }, "slow");
-	$("#divMessage").html("<div class='alert alert-dismissible alert-info'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Mensajes</h4>"+parseMessage(msg)+"</div>");
+	$("#divMessage").html("<div class='alert alert-dismissible alert-info'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Mensajes</h4>"+parseMessage(msg)+"</div>");
 	closeDialog("divMessage");
 };
 
@@ -217,7 +217,7 @@ function showWarn(msg)
 {
 	
 	$("html, body").animate({ scrollTop: 0 }, "slow");
-	$("#divWarn").html("<div class='alert alert-dismissible alert-warning'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Advertencia</h4>"+parseMessage(msg)+"</div>");
+	$("#divWarn").html("<div class='alert alert-dismissible alert-warning'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Advertencia</h4>"+parseMessage(msg)+"</div>");
 	closeDialog("divWarn");
 	
 };
@@ -226,7 +226,7 @@ function showAdv(msg)
 {
 	
 	$("html, body").animate({ scrollTop: 0 }, "slow");
-	$("#divWarn").html("<div class='alert alert-dismissible alert-warning'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Aviso</h4>"+parseMessage(msg)+"</div>");
+	$("#divWarn").html("<div class='alert alert-dismissible alert-warning'> <button type='button' class='close' data-bs-dismiss='alert'></button> <h4>Aviso</h4>"+parseMessage(msg)+"</div>");
 	closeDialog("divWarn");
 	
 };
@@ -572,7 +572,7 @@ Number.prototype.toFixedDown = function(digits) {
 						<div id="divMessage">
 							<s:if test="hasActionMessages()">
 								  	<div class='alert alert-dismissible alert-info'> 
-								  		<button type='button' class='btn-close' data-bs-dismiss='alert'></button> 
+								  		<button type='button' class='btn-close' data-bs-dismiss='alert'></button> 
 								  		<s:actionmessage/>	
 								  	</div>
 								  	<script type="text/javascript">
@@ -585,7 +585,7 @@ Number.prototype.toFixedDown = function(digits) {
 							<s:if test="hasActionErrors()">
 								  	<div class="alert alert-dismissible alert-danger">
 								  		 <h4>Error</h4>
-		 								 <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+		 								 <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
 								    	 <s:actionerror/>
 								  	</div>
 								  	<script type="text/javascript">

front/src/main/webapp/jsp/dda/admin/catalogos/apartados/apartadoAlta.jsp

@@ -78,7 +78,7 @@
 	    <div class="modal-content">
 	      <div class="modal-header">
 	        <h4 class="modal-title">Notificacin SAP</h4>
-	        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+	        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 	      </div>
 	      <div class="modal-body">	        
 	      </div>

front/src/main/webapp/jsp/dda/admin/presupuestos/editarPresupuesto.jsp

@@ -121,7 +121,7 @@
 	    <!-- Modal content-->
 	    <div class="modal-content">
 	      <div class="modal-header">
-	      	<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+	      	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 	        <h4 class="modal-title">Redistribuci&oacute;n Presupuestos</h4>
 	      </div>
 	      

front/src/main/webapp/jsp/dda/carga/transaccion/modalesTransacciones.jsp

@@ -111,7 +111,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Confirmaci&oacute;n</h4>
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 			</div>
 			<div class="modal-body">
 				<p>{{mensajeConfirmacion}}</p>
@@ -129,7 +129,7 @@
 	<div class="modal-dialog  mymodal-xl">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 				<h4 class="modal-title text-center"> Vista previa de la carga de transacciones para {{fmaFront(mesCarga)}}</h4>
 			</div>
 			<div class="modal-body">
@@ -163,7 +163,7 @@
 	<div class="modal-dialog  mymodal-xl">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 				<h4 class="modal-title text-center"> Asociacion de Titulos para carga {{fmaFront(mesCarga)}} </h4>
 				<br><br><br><br>
 				<div class="l-box-body l-spaced form-horizontal">

front/src/main/webapp/jsp/dda/contrato/license/terminos/terminos.jsp

@@ -182,7 +182,7 @@
     <div class="modal-content">
       <div class="modal-header">
       	<h4 class="modal-title">Configuracin de Pagos Peri&oacute;dicos</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       <div class="modal-body">                	        	
 				<label id="labErrAddPer" style="color:red;"></label>

front/src/main/webapp/jsp/dda/contrato/license/titulo/cargaForm.jsp

@@ -94,7 +94,7 @@
     <div class="modal-content">
       <div class="modal-header">
       	<h4 class="modal-title">Agregar Series</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       
       <div class="modal-body">

front/src/main/webapp/jsp/dda/contrato/terminos/terminos.jsp

@@ -208,7 +208,7 @@
     <div class="modal-content">
       <div class="modal-header">
       	<h4 class="modal-title">Configuraci&oacute;n de Pagos Peri&oacute;dicos</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       <div class="modal-body">                	        	
 				<label id="labErrAddPer" style="color:red;"></label>

front/src/main/webapp/jsp/dda/contrato/titulo/cargaForm.jsp

@@ -86,7 +86,7 @@
     <div class="modal-content">
       <div class="modal-header">
       	<h4 class="modal-title">Agregar Series</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       
       <div class="modal-body">

front/src/main/webapp/jsp/dda/contrato/transaccion/titulo/cambioMultipleForm.jsp

@@ -7,7 +7,7 @@
 			<div class="modal-header">
 				<h3 class="modal-title">Ajustar Categor&iacute;a</h3>
 				<button type="button" class="btn-close" data-bs-dismiss="modal"
-					aria-hidden="true"></button>
+					aria-hidden="true"></button>
 			</div>
 			<div class="modal-body">
 
@@ -215,7 +215,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title">Total Ttulos</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       
       <div class="modal-body">

front/src/main/webapp/jsp/dda/contrato/transaccion/titulo/titulosForm.jsp

@@ -249,7 +249,7 @@
     <div class="modal-content">
       <div class="modal-header">
       	<h4 class="modal-title">Agregar Series</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       
       <div class="modal-body">

front/src/main/webapp/jsp/dda/reporte/cpview/modalesVisualizaciones.jsp

@@ -56,7 +56,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Confirmaci&oacute;n</h4>
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 			</div>
 			<div class="modal-body">
 				<p>{{mensajeConfirmacion}}</p>

front/src/main/webapp/jsp/dda/reporte/datosContrato/modalesVisualizaciones.jsp

@@ -56,7 +56,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Confirmaci&oacute;n</h4>
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 			</div>
 			<div class="modal-body">
 				<p>{{mensajeConfirmacion}}</p>

front/src/main/webapp/jsp/dda/reporte/modalesReporte/modalesCarga.jsp

@@ -57,7 +57,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Confirmaci&oacute;n</h4>
-				<button type="button" class="btn-close" data-bs-dismiss="modal">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
 			</div>
 			<div class="modal-body">
 				<p>{{mensajeConfirmacion}}</p>