From 8de7efe0f7f10f7f72126a3244459ff2391f58fc Mon Sep 17 00:00:00 2001 From: caudillochon Date: Wed, 19 Mar 2025 13:19:38 -0700 Subject: [PATCH 1/3] -- --- Nomina/Nomina.aspx | 33 +++++++++++++++++++++----------- Nomina/Nomina.aspx.cs | 8 ++++---- Nomina/RepMovtosPermanentes.aspx | 6 ++++++ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index e338287c5..1fede38ff 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -206,6 +206,15 @@ .form-group.form-md-line-input .form-control.input-sm ~ label { padding-bottom: 20px; } + .allspacevhwh{ + width:100vw !important; + height:100vh !important; + padding-right: calc((100% - 900px) / 2); + padding-left: calc((100% - 910px) / 2); + } + .allspacevhwh >.modal-content{ + width:900px !important + } @@ -830,8 +839,12 @@ - + + + <%----%> + + + + + - - - diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs index eeb186ce7..d1407318a 100644 --- a/Nomina/Nomina.aspx.cs +++ b/Nomina/Nomina.aspx.cs @@ -2950,7 +2950,7 @@ public partial class Nomina_Nomina2 : ClsPaginas pnlAddupMovto.Visible = false; CargaMovtoPermanente(); CargaPersonalIncapacidad(); - RegistraScript("$('#ModalConceptos').modal();"); + RegistraScript("$('#C_UpModalConceptos.allspacevhwh').removeClass('allspacevhwh');$('#ModalConceptos').modal();"); } #region Asistencias @@ -7666,14 +7666,14 @@ public partial class Nomina_Nomina2 : ClsPaginas } protected void DdlTipo_SelectedIndexChanged(object sender, EventArgs e) { - CargaConcepto(); + //CargaConcepto(); UpMovtosPermanentesModal.Update(); } protected void LnkAddMovtoPermanente_Click(object sender, EventArgs e) { DdlTipo.SelectedValue = "D"; - CargaConcepto(); + //CargaConcepto(); DdlTipoDescto_SelectedIndexChanged(null, null); pnlAddupMovto.Visible = true; LnkAddMovto.Visible = true; @@ -7692,7 +7692,7 @@ public partial class Nomina_Nomina2 : ClsPaginas GVMovtoPermanenteSaldos.DataBind(); UpMovtosPermanentesModal.Update(); - RegistraScript("$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});"); + RegistraScript("$('#C_UpModalConceptos:not(.allspacevhwh)').addClass('allspacevhwh');$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});"); } diff --git a/Nomina/RepMovtosPermanentes.aspx b/Nomina/RepMovtosPermanentes.aspx index a78516e2e..32e59cbbb 100644 --- a/Nomina/RepMovtosPermanentes.aspx +++ b/Nomina/RepMovtosPermanentes.aspx @@ -192,6 +192,11 @@ + + + + + @@ -230,6 +235,7 @@ Movimientos Activos Inactivos + Acumulado Saldo From 8a3ec1f452cae2697082954684ffd1615a11cfa4 Mon Sep 17 00:00:00 2001 From: caudillochon Date: Thu, 20 Mar 2025 01:26:32 -0700 Subject: [PATCH 2/3] --- RH/CalculoSBC.aspx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RH/CalculoSBC.aspx b/RH/CalculoSBC.aspx index aec2b7fe2..c4b81e18c 100644 --- a/RH/CalculoSBC.aspx +++ b/RH/CalculoSBC.aspx @@ -10,7 +10,9 @@ .GVCalculosSBC tr th:nth-child(n+13):not(:nth-child(n+16)) { background-color: #88d6cd !important; - } + }.GVDetalleParteVariable tr > td:nth-child(n+2) { + text-align: right; +} @@ -472,7 +474,7 @@ + CssClass="table table-hover table-striped ScrollAD Widthall GVBuscaddor GVDetalleParteVariable"> From 8d424112ea6235ae58bc1c55de9d97a7e1833328 Mon Sep 17 00:00:00 2001 From: rakcsle Date: Thu, 20 Mar 2025 08:35:02 -0700 Subject: [PATCH 3/3] =?UTF-8?q?Compras=20CvePersonal=20de=20viaticos=20en?= =?UTF-8?q?=20detalle,=20=20pretamos=20proveedor=20ajustes=20visuales,=20r?= =?UTF-8?q?e=20recuperaci=C3=B3n=20vendedor=20list=20bug=20cuando=20el=20i?= =?UTF-8?q?tem=20es=20mas=20grande=20que=20elcontnedor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Compras/Compras.aspx.vb | 11 ++++++ Inventarios/PrestamosdeProveedor.aspx | 56 +++++++++++++-------------- Ventas/RepRecuperacion.aspx | 22 ++++++++++- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index 241e90e0d..8fefa2be5 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -5571,6 +5571,17 @@ Partial Class Compras_Compras CvePersonal = GvPersonal.Rows(Cont).FCDropDownList("DdlPersonalGv").SelectedValue.ToEntero Referencia = GvPersonal.Rows(Cont).FCTextBox("TxtReferencia").Text End If + + + If CvePersonal <= 0 AndAlso RBLContado.SelectedValue.ToEntero = 2 AndAlso TxtNumeroReembolso.Text.Length > 0 Then + CvePersonal = DdlPersonalReembolso.SelectedValue.ToEntero + If Not CvePersonal > 0 Then + Alert("Debe asignar personal al reembolso.", TipoMensaje.MsgAdvertencia) + ErrorDetalles = True + End If + End If + + Cont = Cont + 1 'Si es AF-INSUMO se guarda CveAF en CompraDetalle diff --git a/Inventarios/PrestamosdeProveedor.aspx b/Inventarios/PrestamosdeProveedor.aspx index ec234bb63..382bac5a8 100644 --- a/Inventarios/PrestamosdeProveedor.aspx +++ b/Inventarios/PrestamosdeProveedor.aspx @@ -59,7 +59,7 @@
-
+
@@ -68,7 +68,7 @@
- RECEPCIÓN DE TRASPASO + Devolución de Préstamo
@@ -80,10 +80,10 @@
-
- -
-
+
+ +
+
@@ -99,31 +99,29 @@
-
-
- - -
- - - -
-
-
- -
+ + + +
+ + + +
+ +
+
+ +
-
-
- -
- - - -
-
-
+ +
+ + + +
+
+
diff --git a/Ventas/RepRecuperacion.aspx b/Ventas/RepRecuperacion.aspx index ab11d858c..78b9ad4ce 100644 --- a/Ventas/RepRecuperacion.aspx +++ b/Ventas/RepRecuperacion.aspx @@ -52,6 +52,25 @@ width: 100%; height: 500px; } + .select2-container--default .select2-selection--multiple .select2-selection__choice { + /*max-width: 150px;*/ /* Ajusta a tu gusto */ + max-width: calc(100% - 2em); + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + /*.select2-selection__choice__remove{*/ + /* o absolute/fixed, según necesites */ + /*position: absolute; + z-index: 9999;*/ /* un valor alto para estar sobre los demás */ + /*} + .select2-search.select2-search--inline .select2-search__field .select2-selection__rendered .select2-container--default .select2-container--focus { + + position: absolute; + z-index: 1; + }*/ + + @@ -337,7 +356,8 @@
- + <%----%> +