AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2025-03-20 17:09:04 -07:00
parent b3944d2f11 8d424112ea
commit 273601cb33
7 changed files with 95 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Compras/Compras.aspx.vb
View File

@@ -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

56
Inventarios/PrestamosdeProveedor.aspx
View File

@@ -59,7 +59,7 @@
<br />
<div class="row">
<div class="col-md-5">
<div class="col-md-6">
<asp:UpdatePanel runat="server" ID="UPDatosAlmacen" UpdateMode="Conditional">
<ContentTemplate>
@@ -68,7 +68,7 @@
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-pin font-green"></i>
<span class="caption-subject bold uppercase">RECEPCIÓN DE TRASPASO</span>
<span class="caption-subject bold uppercase">Devolución de Préstamo</span>
</div>
<div class="actions">
<div class="btn-group">
@@ -80,10 +80,10 @@
</div>
</div>
<div class="portlet-body rowpadding">
<div class="row">
<label class="col-md-3">Fecha:</label>
<div class="col-md-9">
<div class="input-group input-sm input-small date date-picker" data-date-format="dd/mm/yyyy">
<div class="row" style="padding:0px">
<label class="col-md-1">Fecha:</label>
<div class="col-md-4" >
<div class="input-group input-sm input-small date date-picker" data-date-format="dd/mm/yyyy" style="margin-left:-10px">
<asp:TextBox ID="TxtFechaEntrega" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10" ValidationGroup="GrpRecibir" Width="100px" ClientIDMode="Static"></asp:TextBox>
<span class="input-group-btn ">
<asp:LinkButton runat="server" ID="ImgFechaEntrega" class="btn default"> <i class="fa fa-calendar"></i> </asp:LinkButton>
@@ -99,31 +99,29 @@
<ajax:ValidatorCalloutExtender ID="VCOFechaEntrega3" runat="server" HighlightCssClass="vco" TargetControlID="RVFechaEntrega" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
</div>
<div class="row">
<asp:HiddenField ID="HdnCveProveedor" runat="server" />
<label class="col-md-3">Almacén:</label>
<div class="col-md-9">
<asp:DropDownList ID="DdlAlmacenOrigen" Width="150px" AppendDataBoundItems="true" runat="server" DataTextField="Almacen" DataValueField="CveAlmacen" CssClass="form-control input-sm select2me"></asp:DropDownList>
<asp:RequiredFieldValidator ID="RFVAlmacenOrigen" runat="server" ControlToValidate="DdlAlmacenOrigen" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Almacen Origen''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEAlmacenOrigen" runat="server" HighlightCssClass="vco" TargetControlID="RFVAlmacenOrigen" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
<div class="row">
<label class="col-md-3">Recibió:</label>
<div class="col-md-9">
<asp:HiddenField ID="HdnCveProveedor" runat="server" />
<label class="col-md-2">Almacén:</label>
<div class="col-md-4">
<asp:DropDownList ID="DdlAlmacenOrigen" Width="100%" AppendDataBoundItems="true" runat="server" DataTextField="Almacen" DataValueField="CveAlmacen" CssClass="form-control input-sm select2me"></asp:DropDownList>
<asp:RequiredFieldValidator ID="RFVAlmacenOrigen" runat="server" ControlToValidate="DdlAlmacenOrigen" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Almacen Origen''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEAlmacenOrigen" runat="server" HighlightCssClass="vco" TargetControlID="RFVAlmacenOrigen" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
<div class="row" style="padding:0px">
<label class="col-md-1">Recibió:</label>
<div class="col-md-4">
<asp:TextBox runat="server" ID="TxtRecibio" />
</div>
</div>
<div class="row">
<label class="col-md-3">Observaciones:</label>
<div class="col-md-9">
<asp:TextBox ID="TxtObservacionesEntrega" TextMode="MultiLine" Rows="2" runat="server" Width="300px"></asp:TextBox>
<asp:RequiredFieldValidator ID="RfvObservaciones" runat="server" ControlToValidate="TxtObservacionesEntrega" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Observaciones''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpRecibir"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VceObservaciones" runat="server" HighlightCssClass="vco" TargetControlID="RfvObservaciones" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
<div class="row">
<label class="col-md-2">Observaciones:</label>
<div class="col-md-4">
<asp:TextBox ID="TxtObservacionesEntrega" TextMode="MultiLine" Rows="2" runat="server" Width="100%"></asp:TextBox>
<asp:RequiredFieldValidator ID="RfvObservaciones" runat="server" ControlToValidate="TxtObservacionesEntrega" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Observaciones''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpRecibir"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VceObservaciones" runat="server" HighlightCssClass="vco" TargetControlID="RfvObservaciones" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
<div class="row" style="padding:0px">
<div style="text-align: center;" class="col-sm-12">
<asp:UpdatePanel runat="server">
<ContentTemplate>

33
Nomina/Nomina.aspx
View File

@@ -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
}
</style>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -830,8 +839,12 @@
<asp:Button ID="BtnImprimirsobrerecibo" OnClick="BtnImprimirsobrerecibo_Click" UseSubmitBehavior="false" runat="server" Text="Imprimir" CssClass="btn btn-primary hidden" />
<div id="ModalConceptos" class="modal ADS fade" role="dialog">
<asp:UpdatePanel class="modal-dialog modal-lg" runat="server" ID="UpModalConceptos" UpdateMode="Conditional">
<asp:UpdatePanel class="modal-dialog modal-lg " runat="server" ID="UpModalConceptos" UpdateMode="Conditional">
<ContentTemplate>
<asp:TextBox ID="TxtCvePeriodo" CssClass="TxtCvePeriodo hidden" runat="server"></asp:TextBox>
<asp:TextBox ID="TxtCvePersonal" CssClass="TxtCvePersonal hidden" runat="server"></asp:TextBox>
<asp:Button ID="BtnSobreRecibo" CssClass="BtnSobreRecibo hidden" OnClick="LnkSobreRecibo_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
<div class="modal-content">
<div class="modal-header ">
<h4 class="modal-title">Sobre Recibo</h4>
@@ -2185,13 +2198,6 @@
</div>
</div>
</ContentTemplate>
<Triggers>
<%--<asp:PostBackTrigger ControlID="BtnImprimirsobrerecibo" />--%>
</Triggers>
</asp:UpdatePanel>
</div>
<div id="ModalMovtoPermanente" class="modal ADS fade" role="dialog">
<asp:UpdatePanel ID="UpMovtosPermanentesModal" UpdateMode="Conditional" class="modal-dialog" runat="server">
<ContentTemplate>
@@ -2362,6 +2368,14 @@
</asp:UpdatePanel>
</div>
</ContentTemplate>
<Triggers>
<%--<asp:PostBackTrigger ControlID="BtnImprimirsobrerecibo" />--%>
</Triggers>
</asp:UpdatePanel>
</div>
<div id="ModalUpConcepto" class="modal ADS fade" role="dialog">
<asp:UpdatePanel class="modal-dialog " runat="server" ID="UPpanelModalUpConcepto" UpdateMode="Conditional">
@@ -5263,13 +5277,10 @@
</Triggers>
</asp:UpdatePanel>
</div>
<asp:TextBox ID="TxtCvePeriodo" CssClass="TxtCvePeriodo hidden" runat="server"></asp:TextBox>
<asp:TextBox ID="TxtCvePersonal" CssClass="TxtCvePersonal hidden" runat="server"></asp:TextBox>
<asp:Button ID="BtnGeneratepdf" CssClass="BtnGeneratepdf hidden" OnClick="BtnGeneratepdf_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
<asp:UpdatePanel runat="server" UpdateMode="Conditional">
<ContentTemplate>
<asp:Button ID="BtnSobreRecibo" CssClass="BtnSobreRecibo hidden" OnClick="LnkSobreRecibo_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
<asp:Button ID="BtnGenerateXml" CssClass="BtnGenerateXml hidden" OnClick="BtnGenerateXml_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
<span class="ltlxml">
<asp:Literal ID="LtlXml" runat="server"></asp:Literal></span>

8
Nomina/Nomina.aspx.cs
View File

@@ -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});");
}

6
Nomina/RepMovtosPermanentes.aspx
View File

@@ -192,6 +192,11 @@
<asp:Label ID="lblmontoLimite" runat="server" Text='<%# Eval("MontoLimite","{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="">
<ItemTemplate>
<asp:Label ID="lblAcumulado" runat="server" Text='<%# Eval("Acumulado","{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="">
<ItemTemplate>
<asp:Label ID="lblsaldo" runat="server" Text='<%# Eval("Saldo","{0:N2}")%>'> </asp:Label>
@@ -230,6 +235,7 @@
<th>Movimientos</th>
<th>Activos</th>
<th>Inactivos</th>
<th>Acumulado</th>
<th>Saldo</th>
<th></th>
</tr>

6
RH/CalculoSBC.aspx
View File

@@ -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;
}
</style>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -472,7 +474,7 @@
<ajax:TabPanel ID="TabDetalleParteVariable" runat="server" HeaderText="Detalle parte variable">
<ContentTemplate>
<asp:GridView ID="GVDetalleParteVariable" HeaderStyle-CssClass="ADtr" runat="server" GridLines="None" OnRowDataBound="GVDetalleParteVariable_RowDataBound"
CssClass="table table-hover table-striped ScrollAD Widthall GVBuscaddor"></asp:GridView>
CssClass="table table-hover table-striped ScrollAD Widthall GVBuscaddor GVDetalleParteVariable"></asp:GridView>
</ContentTemplate>
</ajax:TabPanel>
</ajax:TabContainer>

22
Ventas/RepRecuperacion.aspx
View File

@@ -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;
}*/
</style>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -337,7 +356,8 @@
</div>
<label class="col-md-1 truncate">Vendedor:</label>
<div class="col-md-2">
<asp:ListBox ID="DdlVendedor" SelectionMode="Multiple" data-text="Todos" AppendDataBoundItems="true" DataTextField="Vendedor" DataValueField="CveVendedor" CssClass="form-control ddlFiltros input-sm select2me Widthall" Style="width: 100%;" runat="server"></asp:ListBox>
<%--<asp:ListBox ID="DdlVendedor" SelectionMode="Multiple" data-text="Todos" AppendDataBoundItems="true" DataTextField="Vendedor" DataValueField="CveVendedor" CssClass="form-control ddlFiltros input-sm select2me Widthall" Style="width: 100%;" runat="server"></asp:ListBox>--%>
<asp:ListBox ID="DdlVendedor" SelectionMode="Multiple" data-text="Todos" AppendDataBoundItems="true" DataTextField="Vendedor" DataValueField="CveVendedor" CssClass="form-control input-sm select2me Widthall" Style="width: 100%;" runat="server"></asp:ListBox>
</div>
</div>
<div class="row">