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

resolviendo merge

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-09-17 15:19:36 -07:00
parent 6fde7b5c45 7cefe021d4
commit 53545003f2
34 changed files with 1637 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Contabilidad/RepAnexoCatalogo.aspx.vb
View File

@@ -26,7 +26,7 @@ Partial Class AC_RepAnexoCatalogo
ViewState("FechaInicio") = value
End Set
End Property
Private Property FechaFin As Date
Private Property FechaFin As DateTime
Get
FechaFin = ViewState("FechaFin").ToString.ToDate
End Get

42
Contabilidad/RepIVA.aspx
View File

@@ -40,6 +40,13 @@
<li>
<asp:LinkButton ID="LnkExcel2" OnClick="LnkExcel2_Click" runat="server"><i class="fa fa-file-excel-o" style="font-weight:bold;"></i> Generales del proveedor</asp:LinkButton>
</li>
<asp:UpdatePanel runat="server" ID="UPPCompara" UpdateMode="Conditional" >
<ContentTemplate>
<li>
<asp:LinkButton ID="LnkModalCompara" OnClick="LnkModalCompara_Click" runat="server"><i class="fa fa-list-o" style="font-weight:bold;"></i> Comparativo</asp:LinkButton>
</li>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
</asp:Content>
@@ -271,6 +278,41 @@
</div>
</ContentTemplate>
</asp:UpdatePanel>
<div id="ModalCompara" class="modal ADS fade" role="dialog">
<asp:UpdatePanel ID="UpCompara" class="modal-dialog rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Comparativo</h4>
</div>
<div class="modal-body">
<asp:GridView ID="GvCompara" runat="server" GridLines="None" AutoGenerateColumns="False" EmptyDataText="" CssClass="table table-striped table-hover table-advance Widthall">
<Columns>
<asp:BoundField DataField="Msg" HeaderText="Mensaje" />
<asp:BoundField DataField="FueConciliado" HeaderText="Conciliado" />
<asp:BoundField DataField="Fecha" HeaderText="Fecha" DataFormatString="{0:d}" />
<asp:BoundField DataField="ImporteMN" HeaderText="Importe" DataFormatString="{0:N2}" />
<asp:HyperLinkField DataTextField="CvePrePoliza" DataNavigateUrlFormatString="/Contabilidad/RegPrePoliza.aspx?CvePrePoliza={0}" DataNavigateUrlFields="CvePrePoliza" HeaderText="Prepoliza" />
<asp:HyperLinkField DataTextField="CveIE" DataNavigateUrlFormatString="/Bancos/IE.aspx?CveIE={0}" DataNavigateUrlFields="CveIE" HeaderText="IE" />
<asp:BoundField DataField="FechaAplicado" HeaderText="Fecha Aplicado" DataFormatString="{0:d}" />
</Columns>
</asp:GridView>
</div>
<div class="modal-footer">
.
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</asp:Content>
<asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
</asp:Content>

21
Contabilidad/RepIVA.aspx.cs
View File

@@ -332,6 +332,27 @@ public partial class Contabilidad_RepIVA : ClsPaginas
Response.End();
}
protected void LnkModalCompara_Click(object sender, EventArgs e)
{
ClsContabilidad Objconta = new ClsContabilidad();
int Conciliado = DdlTipoMovto.SelectedValue.ToEntero();
if (Objconta.GetRepIVAComparativo(txtFechaI.Text.ToDate(), txtFechaF.Text.ToDate(), UsuarioActual.CveUsuario, Conciliado, UsuarioActual.CveEmpresa ))
{
GvCompara.DataSource = Objconta.DtResultados;
}
Objconta.Dispose();
GvCompara.DataBind();
RegistraScript("$('#ModalCompara').modal('show')");
UpCompara.Update();
}
protected string LV(string Valor)
{
return (Valor.ToDecimal() > 0) ? Valor.ToDecimal().ToString().FormatoNumero(0).Replace(",", string.Empty) : "";