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:
Hector Javier Rodriguez Flores
2021-09-26 20:44:36 -07:00
parent 0eb9ed6245 6df2d8cc84
commit 50b59323e2
24 changed files with 512 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Inventarios/EntradasSalidas.aspx
View File

@@ -123,7 +123,7 @@
<ContentTemplate>
<asp:Panel ID="Panel1" runat="server" DefaultButton="BtnConsultar">
<div class="portlet solid grey-cascade portlet-filter">
<div class="portlet-title portlet-filterT smalltitle" style="min-height: 49px;">
<div class="portlet-title portlet-filterT smalltitle" style="min-height: 39px;">
<div class="tools">
<asp:Button ID="BtnConsultar" CssClass="btn btn-default" runat="server" Text="Consultar" />
</div>
@@ -134,7 +134,7 @@
<asp:DropDownList ID="DdlCAlmacen" runat="server" CssClass="form-control input-sm" Style="max-width: 200px" DataTextField="Almacen" DataValueField="CveAlmacen"></asp:DropDownList>
</div>--%>
<label class="col-md-1 truncate">Concepto:</label>
<div class="col-md-2 ">
<div class="col-md-3 ">
<asp:DropDownList ID="DdlCConcepto" DataTextField="Concepto" CssClass="form-control input-sm" DataValueField="CveConcepto" runat="server" Style="max-width: 200px"></asp:DropDownList>
</div>
<label class="col-md-1 truncate">Folio:</label>
@@ -165,23 +165,20 @@
</div>
<div class="caption uppercase" style="position: relative;">
<i class="fa fa-info-circle"></i>Información del movimiento
</div>
</div>
<div class="portlet-body" <%= IIf(chkexpand.Checked = True, "", "style='display:none;'")%>>
<div id="tbEncabezado" runat="server" class="rowpadding" visible="true">
<div class="row">
<label class="col-md-1 truncate" style="width: 110px">Almacén:</label>
<div class="col-md-2">
<asp:DropDownList ID="DdlAlmacen" AutoPostBack="true" AppendDataBoundItems="true" OnSelectedIndexChanged="DdlAlmacen_SelectedIndexChanged" runat="server" CssClass="form-control input-sm select2me" Style="max-width: 200px" DataTextField="Almacen" DataValueField="CveAlmacen"></asp:DropDownList>
<div class="col-md-4">
<asp:DropDownList ID="DdlAlmacen" AutoPostBack="true" AppendDataBoundItems="true" OnSelectedIndexChanged="DdlAlmacen_SelectedIndexChanged" runat="server" CssClass="form-control input-sm select2me" DataTextField="Almacen" DataValueField="CveAlmacen"></asp:DropDownList>
<asp:RequiredFieldValidator InitialValue="-1" ID="RfvAlmacen" Display="None" ValidationGroup="GrpGuardar" runat="server" ControlToValidate="DdlAlmacen" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Almacen''</b> es necesario, por favor seleccione uno."></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender1" runat="server" HighlightCssClass="vco" TargetControlID="RfvAlmacen" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
<label class="col-md-1 truncate" style="width: 110px" id="DivConcepto1" runat="server">Concepto:</label>
<div class="col-md-2 " id="DivConcepto2" runat="server">
<asp:DropDownList ID="DdlConcepto" DataTextField="Concepto" CssClass="form-control input-sm select2me" AutoPostBack="true" DataValueField="CveConcepto" runat="server" Style="max-width: 200px"></asp:DropDownList>
<div class="col-md-4 " id="DivConcepto2" runat="server">
<asp:DropDownList ID="DdlConcepto" DataTextField="Concepto" CssClass="form-control input-sm select2me" AutoPostBack="true" DataValueField="CveConcepto" runat="server" ></asp:DropDownList>
<asp:RequiredFieldValidator InitialValue="-1" ID="RfvConcepto" Display="None" ValidationGroup="GrpGuardar" runat="server" ControlToValidate="DdlConcepto" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Concepto''</b> es necesario, por favor seleccione uno."></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VcoConcepto" runat="server" HighlightCssClass="vco" TargetControlID="RfvConcepto" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
@@ -191,8 +188,8 @@
<div id="DivCliente" runat="server" visible="false">
<label class="col-md-1 truncate" style="width: 110px">Cliente:</label>
<div class="col-md-2">
<asp:DropDownList ID="DdlClientes" AutoPostBack="true" OnSelectedIndexChanged="DdlClientes_SelectedIndexChanged" AppendDataBoundItems="true" runat="server" CssClass="form-control input-sm select2me" Style="max-width: 200px" DataTextField="NombreComercial" DataValueField="CveCliente"></asp:DropDownList>
<div class="col-md-4">
<asp:DropDownList ID="DdlClientes" AutoPostBack="true" OnSelectedIndexChanged="DdlClientes_SelectedIndexChanged" AppendDataBoundItems="true" runat="server" CssClass="form-control input-sm select2me" DataTextField="NombreComercial" DataValueField="CveCliente"></asp:DropDownList>
</div>
</div>
@@ -286,26 +283,26 @@
<div class="col-md-2">
</div>
</div>
<div class="row" id="divGuia" runat="server" visible="False">
<div class="row">
<div id="divGuia" runat="server" visible="False">
<label class="col-md-1 truncate" style="width: 110px">
<asp:Label runat="server" ID="LblGuia">Guía:</asp:Label>
</label>
<div class="col-md-2">
<asp:TextBox ID="TxtGuia" runat="server" MaxLength="20" Width="100%"></asp:TextBox>
</div>
</div>
<div class="row" runat="server" id="TrResponsable">
<div class="col-md-6" runat="server" id="TrResponsable">
<label class="col-md-1" style="width: 110px">Recibe:</label>
<div class="col-md-3">
<asp:TextBox runat="server" Text="" ID="TxtResponsable" Width="100%" />
<%--<asp:DropDownList ID="DdlResponsable" runat="server" DataTextField="Nombre" DataValueField="CveUsuario" CssClass="form-control input-sm" Style="width: 200px !important;"></asp:DropDownList>--%>
</div>
</div>
</div>
</div>
<div class="row">
<label class="col-md-1 truncate" style="width: 110px">
Observaciones:
Observaciones:
</label>
<div class="col-md-5">
<asp:TextBox ID="TxtObservaciones" TextMode="MultiLine" Rows="2" CssClass="form-control input-sm" runat="server" MaxLength="232"></asp:TextBox>

2
Inventarios/EntradasSalidas.aspx.vb
View File

@@ -329,7 +329,7 @@ Partial Class Inventarios_EntradasSalidas
Case "1"
Case "2"
divMonedaSeccion.Visible = True
'divMonedaSeccion.Visible = True
divGuia.Visible = True
End Select

17
Inventarios/EntregaAlmacen.aspx.vb
View File

@@ -1036,13 +1036,16 @@ Partial Class Inventarios_EntregaAlmacen
End Sub
Private Sub CargaDocumentos(tCveVenta As Integer)
Dim objInv As New ClsEdocumentacion
If objInv.DocumentacionElectronicaGet(-1, -1, -1, UsuarioActual.CveEmpresa, -1, tCveVenta) Then
GvDocs.DataSource = objInv.DtResultados.FiltraParametros("Adjunto <> ''")
End If
objInv.Dispose()
GvDocs.DataBind()
If tCveVenta > 0 Then
Dim objInv As New ClsEdocumentacion
If objInv.DocumentacionElectronicaGet(-1, -1, -1, UsuarioActual.CveEmpresa, -1, tCveVenta) Then
GvDocs.DataSource = objInv.DtResultados.FiltraParametros("Adjunto <> ''")
End If
objInv.Dispose()
GvDocs.DataBind()
End If
End Sub

2
Inventarios/RepNotasSinAlmacen.aspx
View File

@@ -195,7 +195,7 @@
<asp:TemplateField ItemStyle-Width="70px" HeaderText="Acción" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<span data-placement="top" data-toggle="tooltip" title="Marcar el producto como que no se recibirá">
<asp:LinkButton runat="server" OnClick="BtnActulizarEstatus_Click" CssClass="btn btn-sm red" Text="<i class='fa fa-eye-slash' aria-hidden='true'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro de marcar el producto como que no se recibirá?" data-btn-ok-label="si"></asp:LinkButton>
<asp:LinkButton ID="lnkAccion" runat="server" OnClick="BtnActulizarEstatus_Click" CssClass="btn btn-sm red" Text="<i class='fa fa-eye-slash' aria-hidden='true'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro de marcar el producto como que no se recibirá?" data-btn-ok-label="si"></asp:LinkButton>
</span>
</ItemTemplate>
</asp:TemplateField>

2
Inventarios/RepNotasSinAlmacen.aspx.vb
View File

@@ -279,7 +279,7 @@ Partial Class RepNotasSinAlmacen
e.Row.Cells(1).Text = e.Row.DBCampo("Fecha").ToDate.ToShortDateString
e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Center
e.Row.Cells(2).Text = "<a class=""Texto"" href=""/Compras/Proveedores.aspx?CveProveedor=" & e.Row.DBCampo("CveProveedor") & """>" & e.Row.DBCampo("RazonSocial") & "</a>"
e.Row.FCLinkButton("lnkAccion").Visible = False
If GvCompras.Columns(4).Visible Then
e.Row.Cells(4).Text = ""
End If

16
Inventarios/TraspasoAlmacen.aspx
View File

@@ -190,6 +190,20 @@
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender4" runat="server" HighlightCssClass="vco" TargetControlID="CompareValidator1" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
<label class="col-md-2">F. Envío:</label>
<div class="col-md-2" style="padding-left: 5px; padding-top: 0px;" runat="server" id="divFechaEnvio" visible="false">
<div class="input-group input-sm input-small date date-picker" data-date-format="dd/mm/yyyy" style="width: 120px !important;">
<asp:TextBox ID="TxtFechaEnvio" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10" Width="75px" ClientIDMode="Static"></asp:TextBox>
<span class="input-group-btn ">
<asp:LinkButton runat="server" ID="ImgFechaEnvio" class="btn default"> <i class="fa fa-calendar"></i> </asp:LinkButton>
</span>
<ajax:MaskedEditExtender ID="MaskedEditExtender3" runat="server" TargetControlID="TxtFechaEnvio" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
<ajax:CalendarExtender runat="server" ID="CalendarExtender2" TargetControlID="TxtFechaEnvio" PopupButtonID="ImgFechaEnvio" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
<asp:CompareValidator ID="CompareValidator2" runat="server" ControlToValidate="TxtFechaEnvio" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Envío''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date"></asp:CompareValidator>
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender3" runat="server" HighlightCssClass="vco" TargetControlID="CompareValidator2" Width="350px"></ajax:ValidatorCalloutExtender>
</div>
</div>
</div>
<div class="row">
<label class="col-md-1">Unidad:</label>
@@ -827,7 +841,7 @@
</div>
<div class="form-group form-md-line-input input-iconright">
<label for="<%= DdlConfigAuto.ClientID.ToString()%>">Configuración Carta Porte:</label>
<asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me " Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="false" CausesValidation="true" DataTextField="ConfigAutoTransporte" DataValueField="ClaveConfigAutoTransporte">
<asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me " Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="false" CausesValidation="true" DataTextField="ClaveConfigAutoTransporteDescripcion" DataValueField="ClaveConfigAutoTransporte">
<asp:ListItem Selected="True" Text="Seleccione" Value=""></asp:ListItem>
</asp:DropDownList>
</div>

4
Inventarios/TraspasoAlmacen.aspx.vb
View File

@@ -189,6 +189,10 @@ Partial Class Inventarios_TraspasoAlmacen
LblResponsable.Visible = False
End If
If UsuarioActual.Empresa.Funcionalidad(161) = "1" Then
divFechaEnvio.Visible = True
End If
CargaCombos()
CreaDT()