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 RODRIGUEZ
2021-06-04 03:26:22 -07:00
parent 096ed6a6d1 a9e67a6d62
commit c2b51b60ab
21 changed files with 1924 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Ventas/Ventas.aspx
View File

@@ -353,7 +353,7 @@
<asp:HyperLink ID="HlCuentaTerminal" data-toggle="modal" data-target="#ModalCuentaTerminal" runat="server" Visible="false"><i class="fa fa-money"></i> Asignar Cuenta de Terminal</asp:HyperLink>
</li>
<li>
<asp:HyperLink ID="HplFolioFiscalModal" data-toggle="modal" data-target="#ModalFolioFiscal" runat="server" Visible="false"><i class="fa fa-plus"></i> Asignar Folio Fiscal</asp:HyperLink>
<asp:HyperLink ID="HplFolioFiscalModal" data-toggle="modal" data-target="#ModalFolioFiscal" runat="server" Visible="false"><i class="fa fa-pencil"></i> Asignar Folio Fiscal</asp:HyperLink>
</li>
<li>
<asp:LinkButton runat="server" ID="LnkImprimirFormatoCicovisa" Visible="false" OnClick="LnkImprimirFormatoCicovisa_Click">Imprimir Formato Cicovisa</asp:LinkButton>
@@ -4812,10 +4812,19 @@
<asp:RadioButtonList ID="RblTipo" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group col-md-12" CellSpacing="100">
<asp:ListItem Value="3" Class="one" Selected="True"><label><b>Total x Concepto</b></label></asp:ListItem>
<asp:ListItem Value="1" Class="one"><label><b>Total General</b></label></asp:ListItem>
<asp:ListItem Value="2" Class="one"><label><b>Total x Remisión</b></label></asp:ListItem>
<asp:ListItem Value="2" Class="one"><label><b>Total x Remisión</b></label></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
<div class="row" id="DivPSRemision" runat="server" visible="false">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<label for="<%= DdlPSRemision.ClientID.ToString()%>">Producto/Servicio:</label>
<ADS:Dropdownlost runat="server" ID="DdlPSRemision" CssStyle="width: 100%;" CssClass=" form-control input-sm DdlPS" IncluyeTodos="false" CssClassDdl="select2me form-control" DataTextField="PSCodigo" DataValueField="CvePS" />
</div>
</div>
</div>
<br />
<div class="row">
<div class="col-md-8">
<asp:CheckBox ID="ChkRemProductos" runat="server" AutoPostBack="true" Text="Mostrar Productos" />
@@ -6230,7 +6239,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Facturas Relacionadas</h4>
</div>
<div class="modal-body">
<div class="modal-body" style="width:900px;">
<div class="row">
<div class="col-md-2">
<label>Relación:</label>
@@ -6249,7 +6258,19 @@
<asp:DropDownList ID="DdlFacturaARelacionar" runat="server" AutoPostBack="true" AppendDataBoundItems="true" DataTextField="Folio" DataValueField="CveVenta" Width="100%" CssClass="select2me"></asp:DropDownList>
</div>
<div class="col-md-2">
<asp:LinkButton ID="LnkAgregarFacturaRelacionada" runat="server" CssClass="btn btn-sm btn-primary" OnClick="LnkAgregarFacturaRelacionada_Click"><i class="fa fa-plus"></i>Agregar</asp:LinkButton>
<asp:LinkButton ID="LnkAgregarFacturaRelacionada" runat="server" CssClass="btn btn-sm btn-primary" OnClick="LnkAgregarFacturaRelacionada_Click"><i class="fa fa-plus"></i>Agregar Factura</asp:LinkButton>
</div>
</div>
<br />
<div id="DivFolioFiscalAgregar" runat="server" class="row">
<div class="col-md-2">
<label>Folio Fiscal:</label>
</div>
<div class="col-md-8">
<asp:TextBox ID="TxtFolioFiscalRelacionar" runat="server" Text="" Width="100%" CssClass="form-control input-sm"></asp:TextBox>
</div>
<div class="col-md-2">
<asp:LinkButton ID="LnkAgregarFolioFiscalRelacionada" runat="server" CssClass="btn btn-sm btn-primary" OnClick="LnkAgregarFolioFiscalRelacionada_Click"><i class="fa fa-plus"></i>Agregar Folio</asp:LinkButton>
</div>
</div>
<br />
@@ -6290,8 +6311,10 @@
<div class="modal-body">
<asp:UpdatePanel runat="server" ID="UpdatePanel3" UpdateMode="Conditional">
<ContentTemplate>
Folio Fiscal
<asp:TextBox ID="TxtModalFolioFiscal" runat="server" Width="250px"></asp:TextBox>
<div class="row">
<div class="col-md-2"> Folio Fiscal</div>
<div class="col-md-10"> <asp:TextBox ID="TxtModalFolioFiscal" runat="server" Width="100%"></asp:TextBox></div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
@@ -6870,7 +6893,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
<asp:Button Text="Aplicar Remisiones" ID="BtnAplicarRNCDevoluciones" OnClick="BtnAplicarRNCDevoluciones_Click" CssClass="btn btn-primary" runat="server" ValidationGroup="VGAplicarRNC" />
</div>
</div>