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-01-08 17:53:31 -07:00
parent befcb41bea 9d9303407f
commit 819265799a
14 changed files with 214 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ventas/PopUpBuscarFolio.aspx
View File

@@ -75,7 +75,7 @@
<%--<asp:DropDownList ID="DdlNombre" runat="server" CssClass="select2me" DataTextField="CodigoNombre" AutoPostBack="true" DataValueField="CveCliente" Width="230px"></asp:DropDownList>--%>
</td>
<td class="text-right"><b>Vendedor:</b></td>
<td class="text-right"><b>Vendedor:</b></td>
<td>
<asp:DropDownList ID="DdlVendedor" runat="server" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="Vendedor" DataValueField="CveVendedor" Width="228px" >
<asp:ListItem Selected="true" Text="Todos" Value="-1" ></asp:ListItem>
@@ -165,7 +165,7 @@
</ContentTemplate>
</asp:UpdatePanel>
<tr align="left" style="display:none;">
<tr align="left">
<td class="text-right"><b>Pedido:</b></td>
<td>
<asp:TextBox ID="TxtPedidoContrato" runat="server" CssClass="form-control" Width="230px" Height="30px" style="padding: 0px"></asp:TextBox>
@@ -174,18 +174,13 @@
<td>
<asp:TextBox ID="TxtOrdenCompra" runat="server" CssClass="form-control" Width="230px" Height="30px" style="padding: 0px"></asp:TextBox>
</td>
</tr>
<tr align="left" runat="server" id="TRVendedores" >
<td class="text-right"></td>
<td>
</td>
</tr>
</tr>
<tr>
<td style="text-align: center;" colspan="4">
<asp:Button ID="BtnBuscar" runat="server" Text="Buscar" class="btn btn-primary" /></td>
<td colspan="4">
<div class="row">
<div class="col-md-6 " style="text-align:center"> <asp:Button ID="BtnBuscar" runat="server" Text="Buscar" class="btn btn-primary" /></div>
</div>
</td>
</tr>
</table>
</asp:Panel>

1
Ventas/RepComisionesSMS.aspx
View File

@@ -165,6 +165,7 @@
<asp:BoundField HeaderText="Médico" DataField="Medico" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField HeaderText="Fecha Hora Cirugia" DataField="FechaCirugia" ItemStyle-HorizontalAlign="Left" DataFormatString="{0:dd/MM/yyyy hh:mm}" />
<asp:BoundField HeaderText="Procedimiento" DataField="Procedimiento" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField HeaderText="Tipo Venta" DataField="TipoVenta" />
<asp:BoundField HeaderText="Código" DataField="Codigo" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField HeaderText="Producto" DataField="PS" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField HeaderText="Cantidad" DataField="Cantidad" DataFormatString="{0:#,###.##}" ItemStyle-HorizontalAlign="Right" />

3
Ventas/Ventas.aspx
View File

@@ -1982,7 +1982,7 @@
<asp:TemplateField>
<HeaderTemplate>Producto</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlPS" runat="server" Text='<%# Eval("CodigoPS") %>'></asp:Literal>
<asp:Literal ID="LtlPS" runat="server" Text='<%# Eval("CodigoPS") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Serie" Visible="false">
@@ -2051,6 +2051,7 @@
<HeaderTemplate>Producto o Servicio</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlPS" runat="server" Text='<%# Eval("PS") %>'></asp:Literal>
<asp:HyperLink ID="HlPS" runat="server" Text='<%# Eval("PS") %>' Visible="false" Target="_blank"></asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>

5
Ventas/Ventas.aspx.vb
View File

@@ -2445,6 +2445,8 @@ Partial Class Ventas
Exit Sub
End If
Modalidad = ""
Opcion = ""
Index = 0
@@ -9557,6 +9559,7 @@ Partial Class Ventas
e.Row.CssClass = "SubTotales"
End If
Else
Dim tFecha As Date = If(e.Row.DBCampo("Fecha") <> "", e.Row.DBCampo("Fecha").ToDate, NowADS())
e.Row.FCLiteral("LtlPS").Text = String.Format("<a Class='Texto' target='_blank' href='/Inventarios/Kardex.aspx?CvePS={0}&CveAlmacen={1}&FechaI={2}&FechaF={3}'> {4}</a>", e.Row.DBCampo("CvePS"), e.Row.DBCampo("CveAlmacen"), tFecha.AddDays(-7).ToShortDateString, tFecha.AddDays(7).ToShortDateString, e.Row.DBCampo("PS"))
@@ -9578,6 +9581,8 @@ Partial Class Ventas
End If
End If
End If
If (CveVenta > 0 And DdlTipoComprobante.SelectedValue <> "Cot") AndAlso Not AplicaDevolucion Then