--cambios en cortes
This commit is contained in:
@@ -67,12 +67,12 @@
|
|||||||
<asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-primary" />
|
<asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-primary" />
|
||||||
<a href="javascript:;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a>
|
<a href="javascript:;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a>
|
||||||
<asp:CheckBox ID="chkexpand" CssClass="hidden" runat="server" />
|
<asp:CheckBox ID="chkexpand" CssClass="hidden" runat="server" />
|
||||||
<%-- <audio id="audio" src="http://www.soundjay.com/button/beep-07.wav" autostart="false"></audio>--%>
|
<%-- <audio id="audio" src="http://www.soundjay.com/button/beep-07.wav" autostart="false"></audio>--%>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-1">
|
<div class="col-md-1">
|
||||||
<asp:Label runat="server" ID="LblSubProyecto" Text="SubProyecto"/>
|
<asp:Label runat="server" ID="LblSubProyecto" Text="SubProyecto" />
|
||||||
<%--SubProyecto--%>
|
<%--SubProyecto--%>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
@@ -81,6 +81,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-1">
|
<div class="col-md-1">
|
||||||
F.I.:
|
F.I.:
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
|
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
|
||||||
@@ -98,6 +99,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-1 ">
|
<div class="col-md-1 ">
|
||||||
F.F.:
|
F.F.:
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
|
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
|
||||||
@@ -178,6 +180,15 @@
|
|||||||
<asp:Literal ID="LtlNotasCredito" runat="server" Text='<%# Eval("NotasCredito", "{0:N2}") %>'></asp:Literal>
|
<asp:Literal ID="LtlNotasCredito" runat="server" Text='<%# Eval("NotasCredito", "{0:N2}") %>'></asp:Literal>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
|
<HeaderTemplate>
|
||||||
|
<asp:Label Text="Ventas<br/>Contado" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
|
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
||||||
|
</HeaderTemplate>
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Literal ID="LtlVentasContado" runat="server" Text='<%# Eval("VentasContado", "{0:N2}") %>'></asp:Literal>
|
||||||
|
</ItemTemplate>
|
||||||
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
<asp:Label Text="Ventas<br/>Crédito" runat="server" CausesValidation="false"> </asp:Label>
|
<asp:Label Text="Ventas<br/>Crédito" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
@@ -232,15 +243,15 @@
|
|||||||
<asp:Literal ID="LtlTransferencia" runat="server" Text='<%# Eval("VentasTransferencia", "{0:N2}") %>'></asp:Literal>
|
<asp:Literal ID="LtlTransferencia" runat="server" Text='<%# Eval("VentasTransferencia", "{0:N2}") %>'></asp:Literal>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right" Visible="false">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right" Visible="false">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
<asp:Label Text="Saldo<br/> Aplicado" runat="server" CausesValidation="false"> </asp:Label>
|
<asp:Label Text="Saldo<br/> Aplicado" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
||||||
</HeaderTemplate>
|
</HeaderTemplate>
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<asp:Literal ID="LtlSaldoAplicado" runat="server" Text='<%# Eval("SaldoAnteriorAplicado", "{0:#,###.##}") %>'></asp:Literal>
|
<asp:Literal ID="LtlSaldoAplicado" runat="server" Text='<%# Eval("SaldoAnteriorAplicado", "{0:#,###.##}") %>'></asp:Literal>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
<asp:Label Text="Total Retiro" runat="server" CausesValidation="false"> </asp:Label>
|
<asp:Label Text="Total Retiro" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
@@ -260,7 +271,7 @@
|
|||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
<asp:Label Text="Devol." ToolTip="Devoluciones" runat="server" CausesValidation="false"> </asp:Label>
|
<asp:Label Text="Devol." ToolTip="Devoluciones" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
||||||
</HeaderTemplate>
|
</HeaderTemplate>
|
||||||
@@ -268,7 +279,15 @@
|
|||||||
<asp:Literal ID="LtlDevoluciones" runat="server" Text='<%# Eval("Devoluciones", "{0:#,###.##}") %>'></asp:Literal>
|
<asp:Literal ID="LtlDevoluciones" runat="server" Text='<%# Eval("Devoluciones", "{0:#,###.##}") %>'></asp:Literal>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
|
<HeaderTemplate>
|
||||||
|
<asp:Label Text="Total<br/>Devs. RNC" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
|
<asp:Literal runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
|
||||||
|
</HeaderTemplate>
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Literal ID="LtlTotalDevRNC" runat="server" Text='<%# Eval("TotalDevRNC", "{0:N2}") %>'></asp:Literal>
|
||||||
|
</ItemTemplate>
|
||||||
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
<asp:Label Text="Importe Inicial" runat="server" CausesValidation="false"> </asp:Label>
|
<asp:Label Text="Importe Inicial" runat="server" CausesValidation="false"> </asp:Label>
|
||||||
@@ -296,6 +315,7 @@
|
|||||||
<asp:Literal ID="LtlTotalCorte" runat="server" Text='<%# Eval("TotalCorte", "{0:N2}") %>'></asp:Literal>
|
<asp:Literal ID="LtlTotalCorte" runat="server" Text='<%# Eval("TotalCorte", "{0:N2}") %>'></asp:Literal>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
|
<%--<asp:BoundField HeaderText="CveCorte" DataField="CveCorte" />--%>
|
||||||
</Columns>
|
</Columns>
|
||||||
<HeaderStyle CssClass="Titulos" Font-Size="9pt" />
|
<HeaderStyle CssClass="Titulos" Font-Size="9pt" />
|
||||||
<RowStyle CssClass="Texto" />
|
<RowStyle CssClass="Texto" />
|
||||||
@@ -352,30 +372,36 @@
|
|||||||
</Columns>
|
</Columns>
|
||||||
</asp:GridView>
|
</asp:GridView>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<asp:GridView ID="GvPorIVA" runat="server" AutoGenerateColumns="False" GridLines="None" CssClass="table table-striped table-advance table-hover">
|
<asp:GridView ID="GvPorIVA" runat="server" AutoGenerateColumns="False" GridLines="None" CssClass="table table-striped table-advance table-hover">
|
||||||
<Columns>
|
<Columns>
|
||||||
<asp:BoundField HeaderText="Documento" DataField="TipoDocto" />
|
<asp:BoundField HeaderText="Documento" DataField="TipoDocto" />
|
||||||
<asp:BoundField HeaderText="16%" DataField="IVA16" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
<asp:BoundField HeaderText="16%" DataField="IVA16" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
||||||
<asp:BoundField HeaderText=" 0%" DataField="IVA0" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
<asp:BoundField HeaderText=" 0%" DataField="IVA0" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
||||||
</Columns>
|
</Columns>
|
||||||
</asp:GridView>
|
</asp:GridView>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<asp:GridView ID="GvD" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun corte" DataKeyNames="CveVenta" ToolTip="Reporte de Cortes" CssClass="table table-striped table-advance table-hover Widthall" Style="position: static" UseAccessibleHeader="false" GridLines="None">
|
<asp:GridView ID="GvD" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun corte" DataKeyNames="CveVenta" ToolTip="Reporte de Cortes" CssClass="table table-striped table-advance table-hover Widthall" Style="position: static" UseAccessibleHeader="false" GridLines="None">
|
||||||
<Columns>
|
<Columns>
|
||||||
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
|
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
|
||||||
<HeaderTemplate>
|
<HeaderTemplate>
|
||||||
Serie - Folio
|
Serie - Folio
|
||||||
|
|
||||||
</HeaderTemplate>
|
</HeaderTemplate>
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<asp:HyperLink ID="LBDescripcion" runat="server" Text='<%# Eval("SerieFolio") %>' NavigateUrl='<%# Eval("CveVenta", "/Ventas/Ventas.aspx?CveVenta={0}")%>' ></asp:HyperLink>
|
<asp:HyperLink ID="LBDescripcion" runat="server" Text='<%# Eval("SerieFolio") %>' NavigateUrl='<%# Eval("CveVenta", "/Ventas/Ventas.aspx?CveVenta={0}")%>'></asp:HyperLink>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:BoundField HeaderText="Cliente" DataField="NombreComercial" ItemStyle-HorizontalAlign="Left" />
|
<asp:BoundField HeaderText="Cliente" DataField="NombreComercial" ItemStyle-HorizontalAlign="Left" />
|
||||||
|
<asp:TemplateField HeaderText="Fac.Rem.Anterior" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" >
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Literal ID="LtlFacRemisionAnterior" runat="server" Text='<%# Eval("FacturaRemisionAnteriorTexto") %>'></asp:Literal>
|
||||||
|
</ItemTemplate>
|
||||||
|
</asp:TemplateField>
|
||||||
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<asp:Label ID="LblTotal" Text='<%# Eval("ImportePagado", "{0:N2}") %>' runat="server"></asp:Label>
|
<asp:Label ID="LblTotal" Text='<%# Eval("ImportePagado", "{0:N2}") %>' runat="server"></asp:Label>
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<%--<asp:BoundField HeaderText="Total" DataField="ImportePagado" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />--%>
|
<%--<asp:BoundField HeaderText="Total" DataField="ImportePagado" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />--%>
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ Partial Class Bancos_RepCortes
|
|||||||
If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
|
If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
|
||||||
GvDatos.Columns(3).Visible = True
|
GvDatos.Columns(3).Visible = True
|
||||||
GvDatos.Columns(4).Visible = True
|
GvDatos.Columns(4).Visible = True
|
||||||
GvDatos.Columns(12).Visible = True
|
GvDatos.Columns(13).Visible = True
|
||||||
End If
|
End If
|
||||||
|
|
||||||
GvDatos.DataSource = DtCortes
|
GvDatos.DataSource = DtCortes
|
||||||
|
|||||||
@@ -1602,7 +1602,14 @@ Partial Class PopUpVerFactura
|
|||||||
If DtCortesVentas.Rows.Count > 0 Or DtCortesVentasResumen.Rows.Count > 0 Then
|
If DtCortesVentas.Rows.Count > 0 Or DtCortesVentasResumen.Rows.Count > 0 Then
|
||||||
Dim lrds As New List(Of ReportDataSource)
|
Dim lrds As New List(Of ReportDataSource)
|
||||||
|
|
||||||
Dim rds As New ReportDataSource With {.Name = "DataSet1", .Value = DtCortesVentasResumen}
|
Dim DtMetodosPago = DtCortesVentasResumen.Copy()
|
||||||
|
|
||||||
|
'MOVER EL VENTAS CREDITO DE LA DERECHA A LA IZQUIERDA EN EL PDF
|
||||||
|
If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
|
||||||
|
DtMetodosPago = DtCortesVentasResumen.FiltraParametros("MetodoPago <> 'Crédito'")
|
||||||
|
End If
|
||||||
|
|
||||||
|
Dim rds As New ReportDataSource With {.Name = "DataSet1", .Value = DtMetodosPago}
|
||||||
lrds.Add(rds)
|
lrds.Add(rds)
|
||||||
Dim rds2 As New ReportDataSource With {.Name = "DataSet2", .Value = DtCortesVentas}
|
Dim rds2 As New ReportDataSource With {.Name = "DataSet2", .Value = DtCortesVentas}
|
||||||
lrds.Add(rds2)
|
lrds.Add(rds2)
|
||||||
@@ -1689,6 +1696,14 @@ Partial Class PopUpVerFactura
|
|||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
Dim TotalCredito As Decimal = DtCortesVentasResumen.SUMD("Importe", "MetodoPago = 'Crédito'")
|
||||||
|
|
||||||
|
Dim rowCredito = DtDatosResumen.NewRow()
|
||||||
|
rowCredito("Columna") = "Crédito"
|
||||||
|
rowCredito("Importe") = TotalCredito
|
||||||
|
rowCredito("Orden") = 4
|
||||||
|
DtDatosResumen.Rows.Add(rowCredito)
|
||||||
|
|
||||||
Dim rds3 As New ReportDataSource With {.Name = "DataSet3", .Value = DtDatosResumen.FiltraParametros("Orden > 0", "Orden")}
|
Dim rds3 As New ReportDataSource With {.Name = "DataSet3", .Value = DtDatosResumen.FiltraParametros("Orden > 0", "Orden")}
|
||||||
lrds.Add(rds3)
|
lrds.Add(rds3)
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-xs {
|
.btn-xs {
|
||||||
padding: 0px 5px;
|
padding: 0px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -294,15 +294,15 @@
|
|||||||
CssClass="ScrollAD table table-striped table-hover Widthall" data-heighterror="320" data-freezecols="0" data-freezerows="0" GridLines="None"
|
CssClass="ScrollAD table table-striped table-hover Widthall" data-heighterror="320" data-freezecols="0" data-freezerows="0" GridLines="None"
|
||||||
DataKeyNames="CveVenta,TipoDocto,Saldo,AtencionA,CveFormaPago33,SerieFolio">
|
DataKeyNames="CveVenta,TipoDocto,Saldo,AtencionA,CveFormaPago33,SerieFolio">
|
||||||
<Columns>
|
<Columns>
|
||||||
<asp:BoundField HeaderText="Atención" DataField="AtencionA" />
|
<asp:BoundField HeaderText="Atención" DataField="AtencionA" />
|
||||||
<asp:HyperLinkField HeaderText="Folio" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" DataTextField="SerieFolio" ItemStyle-HorizontalAlign="Center" />
|
<asp:HyperLinkField HeaderText="Folio" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" DataTextField="SerieFolio" ItemStyle-HorizontalAlign="Center" />
|
||||||
<asp:BoundField HeaderText="Fecha/Hora" DataField="Fecha" ItemStyle-HorizontalAlign="Center" />
|
<asp:BoundField HeaderText="Fecha/Hora" DataField="Fecha" ItemStyle-HorizontalAlign="Center" />
|
||||||
<asp:BoundField HeaderText="Importe" DataField="Saldo" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
<asp:BoundField HeaderText="Importe" DataField="Saldo" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
|
||||||
<asp:TemplateField HeaderText="" ItemStyle-HorizontalAlign="Right">
|
<asp:TemplateField HeaderText="" ItemStyle-HorizontalAlign="Right">
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<asp:LinkButton ID="LnkImprimir" runat="server" AlternateText="Imprimir ticket"
|
<asp:LinkButton ID="LnkImprimir" runat="server" AlternateText="Imprimir ticket"
|
||||||
CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-print'></i>" ToolTip="Imprimir"
|
CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-print'></i>" ToolTip="Imprimir"
|
||||||
OnClick="LnkImprimir_Click" Visible="false" />
|
OnClick="LnkImprimir_Click" Visible="false" />
|
||||||
|
|
||||||
<asp:LinkButton ID="BtnPagar" runat="server" CssClass="btn btn-xs btn-success" Text="Cobrar" CommandName="Cobrar" CommandArgument='<%# Eval("CveVenta") %>' />
|
<asp:LinkButton ID="BtnPagar" runat="server" CssClass="btn btn-xs btn-success" Text="Cobrar" CommandName="Cobrar" CommandArgument='<%# Eval("CveVenta") %>' />
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
@@ -318,12 +318,16 @@
|
|||||||
<div class="col-md-1"><b>Nombre:</b></div>
|
<div class="col-md-1"><b>Nombre:</b></div>
|
||||||
<div class="col-md-4"> <label><asp:Literal ID="LtlNombre" runat="server"></asp:Literal></label> </div>
|
<div class="col-md-4"> <label><asp:Literal ID="LtlNombre" runat="server"></asp:Literal></label> </div>
|
||||||
|
|
||||||
<div class="col-md-1"><b>Folio:</b></div>
|
<div class="col-md-1"><b>Folio:</b></div>
|
||||||
<div class="col-md-2"> <label><asp:Literal ID="LtlFolio" runat="server"></asp:Literal></label> </div>
|
<div class="col-md-2"> <label><asp:Literal ID="LtlFolio" runat="server"></asp:Literal></label> </div>
|
||||||
|
|
||||||
<div class="col-md-1"><b><asp:Literal ID="LtLTipoSaldo" runat="server" Text="Total:"></asp:Literal></b></div>
|
<div class="col-md-1"><b>
|
||||||
<div class="col-md-1"><b><asp:TextBox ID="LtlSaldo" runat="server" Enabled="true" CssClass="TextBoxAsLabel" BorderStyle="None" BackColor="Transparent" ForeColor="#3c763d" Style="text-align: left"></asp:TextBox> </b></div>
|
<asp:Literal ID="LtLTipoSaldo" runat="server" Text="Total:"></asp:Literal></b></div>
|
||||||
<div class="col-md-1" style="text-align:right;"><asp:LinkButton ID="LnkLiberar" runat="server" CssClass="btn btn-xs btn-success" Text="Liberar" OnClick="LnkLiberar_Click" /></div>
|
<div class="col-md-1"><b>
|
||||||
|
<asp:TextBox ID="LtlSaldo" runat="server" Enabled="true" CssClass="TextBoxAsLabel" BorderStyle="None" BackColor="Transparent" ForeColor="#3c763d" Style="text-align: left"></asp:TextBox>
|
||||||
|
</b></div>
|
||||||
|
<div class="col-md-1" style="text-align: right;">
|
||||||
|
<asp:LinkButton ID="LnkLiberar" runat="server" CssClass="btn btn-xs btn-success" Text="Liberar" OnClick="LnkLiberar_Click" /></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -664,15 +668,25 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-4">
|
||||||
<div class="form-group form-md-line-input input-iconright">
|
<div class="form-group form-md-line-input input-iconright">
|
||||||
<asp:TextBox ID="TxtCantidadIE" CssClass="form-control" runat="server" Width="170px" />
|
<asp:TextBox ID="TxtCantidadIE" CssClass="form-control" runat="server" Width="170px" />
|
||||||
<asp:RegularExpressionValidator ID="RegularExpressionValidator1" runat="server" ControlToValidate="TxtCantidadIE" Display="None" ErrorMessage="El campo <b>''Dinero''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." ValidationExpression="^([1-9]{1}[\d]{0,2}(\,[\d]{3})*(\.[\d]{0,4})?|[1-9]{1}[\d]{0,}(\.[\d]{0,4})?|0(\.[\d]{0,2})?|(\.[\d]{1,4})?)$" ValidationGroup="GprIngresoEgreso"></asp:RegularExpressionValidator>
|
<asp:RegularExpressionValidator ID="RegularExpressionValidator1" runat="server" ControlToValidate="TxtCantidadIE" Display="None" ErrorMessage="El campo <b>''Dinero''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." ValidationExpression="^([1-9]{1}[\d]{0,2}(\,[\d]{3})*(\.[\d]{0,4})?|[1-9]{1}[\d]{0,}(\.[\d]{0,4})?|0(\.[\d]{0,2})?|(\.[\d]{1,4})?)$" ValidationGroup="GprIngresoEgreso"></asp:RegularExpressionValidator>
|
||||||
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender8" runat="server" HighlightCssClass="vco" TargetControlID="RegularExpressionValidator1" Width="300px"></ajax:ValidatorCalloutExtender>
|
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender8" runat="server" HighlightCssClass="vco" TargetControlID="RegularExpressionValidator1" Width="300px"></ajax:ValidatorCalloutExtender>
|
||||||
<label for="<%= TxtCantidadIE.ClientID.ToString()%>">Cantidad:</label>
|
<label for="<%= TxtCantidadIE.ClientID.ToString()%>">Cantidad:</label>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<asp:CheckBox ID="ChkAplicaGasto" runat="server" Text="Gasto" AutoPostBack="true" OnCheckedChanged="ChkAplicaGasto_CheckedChanged" />
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6" runat="server" visible="false" id="DivCuentaGasto">
|
||||||
|
<asp:DropDownList ID="DdlCuentaGasto" runat="server" CssClass="form-control input-sm select2me" DataTextField="NumCuentaMoneda" DataValueField="CveCuenta" Width="100%"></asp:DropDownList>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
<div class="form-group form-md-line-input input-iconright">
|
<div class="form-group form-md-line-input input-iconright">
|
||||||
<label for="<%= TxtDescripcionIE.ClientID.ToString()%>">Descripcion:</label>
|
<label for="<%= TxtDescripcionIE.ClientID.ToString()%>">Descripción:</label>
|
||||||
<asp:TextBox runat="server" ID="TxtDescripcionIE" CssClass="form-control" TextMode="MultiLine" Width="500px" />
|
<asp:TextBox runat="server" ID="TxtDescripcionIE" CssClass="form-control" TextMode="MultiLine" Width="500px" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ Partial Class Ventas_PVCobranza
|
|||||||
|
|
||||||
Private Sub CargaFiltros()
|
Private Sub CargaFiltros()
|
||||||
|
|
||||||
|
If UsuarioActual.CveRol <> 1 Then
|
||||||
|
ChkAplicaGasto.Visible = False
|
||||||
|
End If
|
||||||
|
|
||||||
DdlSubProyecto.DataSource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, -1, 1)
|
DdlSubProyecto.DataSource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, -1, 1)
|
||||||
DdlSubProyecto.DataBind()
|
DdlSubProyecto.DataBind()
|
||||||
|
|
||||||
@@ -64,6 +68,10 @@ Partial Class Ventas_PVCobranza
|
|||||||
DdlCuentaTarjetaDebito.DataSource = DtCC.FiltraParametros(String.Format("CveMoneda = {0} AND CveTipoCuenta = 1 AND TieneTerminal = 1", CveMon))
|
DdlCuentaTarjetaDebito.DataSource = DtCC.FiltraParametros(String.Format("CveMoneda = {0} AND CveTipoCuenta = 1 AND TieneTerminal = 1", CveMon))
|
||||||
DdlCuentaTransferencia.DataSource = DtCC.FiltraParametros(String.Format("CveMoneda = {0} AND CveTipoCuenta <> 1", CveMon))
|
DdlCuentaTransferencia.DataSource = DtCC.FiltraParametros(String.Format("CveMoneda = {0} AND CveTipoCuenta <> 1", CveMon))
|
||||||
|
|
||||||
|
DdlCuentaGasto.DataSource = DtCC.FiltraParametros(String.Format("CveMoneda = 1 AND CveTipoCuenta = 1", CveMon))
|
||||||
|
DdlCuentaGasto.DataBind()
|
||||||
|
DdlCuentaGasto.Items.Insert(0, New ListItem("Seleccione", "-1"))
|
||||||
|
|
||||||
DtCC.Dispose()
|
DtCC.Dispose()
|
||||||
|
|
||||||
DdlCuentaEfectivo.DataBind()
|
DdlCuentaEfectivo.DataBind()
|
||||||
@@ -581,17 +589,73 @@ Partial Class Ventas_PVCobranza
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub BtnAceptarIE_Click(sender As Object, e As EventArgs) Handles BtnAceptarIE.Click
|
Private Sub BtnAceptarIE_Click(sender As Object, e As EventArgs) Handles BtnAceptarIE.Click
|
||||||
Dim ObjPVenta As New ClsPuntoVenta
|
If TxtCantidadIE.Text.ToEntero() <= 0 Then
|
||||||
If TxtCantidadIE.Text.ToEntero() > 0 Then
|
Alert("La cantidad debe ser mayor a 0", TipoMensaje.MsgAdvertencia)
|
||||||
If ObjPVenta.AddVta_MovimientosCajas(CveCorte, UsuarioActual.CveUsuario, TxtCantidadIE.Text.ToDouble, TxtDescripcionIE.Text, HdnTipoMovimiento.Value.ToEntero(), NowADS()) Then
|
Exit Sub
|
||||||
TxtCantidadIE.Text = ""
|
|
||||||
TxtDescripcionIE.Text = ""
|
|
||||||
RegistraScript("$('#DivIngresoEgreso').modal('hide')", "divingresoegreso")
|
|
||||||
Alert("El movimiento se realizó correctamente")
|
|
||||||
UpIngresoEgreso.Update()
|
|
||||||
End If
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
Dim TieneError As Boolean = False
|
||||||
|
Dim ObjPVenta As New ClsPuntoVenta
|
||||||
|
Dim ObjIE As New ClsBancos(ObjPVenta.IniciaTransacSQL())
|
||||||
|
Dim ObjMov As New ClsContabilidad(ObjPVenta.IniciaTransacSQL())
|
||||||
|
Try
|
||||||
|
Dim CveMoneda As Integer = 1
|
||||||
|
Dim TipoCambio As Decimal = 1D
|
||||||
|
|
||||||
|
Dim Importe As Decimal = TxtCantidadIE.Text.ToDecimal()
|
||||||
|
If Not ObjPVenta.AddVta_MovimientosCajas(CveCorte, UsuarioActual.CveUsuario, Importe, TxtDescripcionIE.Text, HdnTipoMovimiento.Value.ToEntero(), NowADS()) Then
|
||||||
|
TieneError = True
|
||||||
|
End If
|
||||||
|
If ChkAplicaGasto.Checked Then
|
||||||
|
|
||||||
|
Dim CveTipoTransaccion As Integer = 2
|
||||||
|
Dim CvePrePoliza = ObjMov.AddPrePolizas("PVCobranza/Gasto ", 23, Importe, Importe, CveMoneda, Now, "Gasto", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
|
||||||
|
'TRANSFERENCIA BANCARIA
|
||||||
|
Dim EsAbonoEnCuenta As Boolean = False
|
||||||
|
Dim AplicaImpuestos As Boolean = False
|
||||||
|
Dim Folio As Long = ObjIE.GetNextFolio(DdlCuentaGasto.SelectedValue.ToEntero, CveTipoTransaccion)
|
||||||
|
|
||||||
|
Dim CveIE = ObjIE.AddBancos_IE(DdlCuentaGasto.SelectedValue.ToEntero, CveTipoTransaccion, Now, Folio.ToString(), "", Importe, CveMoneda,
|
||||||
|
TipoCambio, TxtDescripcionIE.Text.Trim(), "", EsAbonoEnCuenta, AplicaImpuestos, -1, CvePrePoliza, "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveCorte:=Me.CveCorte)
|
||||||
|
|
||||||
|
Dim TipoMovimiento As Boolean = True
|
||||||
|
|
||||||
|
Dim Importe30 As Decimal = TxtCantidadIE.Text.ToDecimal
|
||||||
|
|
||||||
|
If ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe, Importe30, 30, Folio.ToString(), Folio.ToString(), CveIE:=CveIE) Then
|
||||||
|
Dim IVA As Decimal = 0 ' TxtImporte.Text.ToDouble * HdnProvPorIVA.Value.ToDouble
|
||||||
|
'TEMPORAL - Préstamo Personal/Gasto por Comprobar
|
||||||
|
If ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe, Importe30, 28, Folio.ToString(), Folio.ToString(), CveIE:=CveIE, CvePersonal:=UsuarioActual.CvePersonal) Then
|
||||||
|
'If IVA > 0 AndAlso Not ObjMov.AddPrePolizasDetalle(CvePrePoliza, False, IVA, TxtImporte.Text.ToDecimal, 19, Ref, Conc, CveIE:=CveIE, CveCompra:=CveCompra, CveProveedor:=CveProveedor, CveOC:=CveOrdenCompra, CvePersonal:=CvePersonal, CveCreditoDetalle:=CveCreditoDetalle, CveCliente:=CveCliente, ImporteME:=tImporteMonedaExtranjera, CveIEDevolucion:=DDlCheques.SelectedValue.ToEntero) Then
|
||||||
|
' TieneError = True
|
||||||
|
'End If
|
||||||
|
Else
|
||||||
|
TieneError = True
|
||||||
|
End If
|
||||||
|
Else
|
||||||
|
TieneError = True
|
||||||
|
End If
|
||||||
|
|
||||||
|
End If
|
||||||
|
Catch ex As Exception
|
||||||
|
TieneError = True
|
||||||
|
End Try
|
||||||
|
|
||||||
|
If TieneError Then
|
||||||
|
ObjPVenta.RollBack()
|
||||||
|
Else
|
||||||
|
ObjPVenta.Commit()
|
||||||
|
End If
|
||||||
|
|
||||||
ObjPVenta.Dispose()
|
ObjPVenta.Dispose()
|
||||||
|
|
||||||
|
If Not TieneError Then
|
||||||
|
TxtCantidadIE.Text = ""
|
||||||
|
TxtDescripcionIE.Text = ""
|
||||||
|
RegistraScript("$('#DivIngresoEgreso').modal('hide')", "divingresoegreso")
|
||||||
|
Alert("El movimiento se realizó correctamente")
|
||||||
|
UpIngresoEgreso.Update()
|
||||||
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub ImpresionDirectaPDF(CveVenta As Integer)
|
Private Sub ImpresionDirectaPDF(CveVenta As Integer)
|
||||||
@@ -663,4 +727,9 @@ Partial Class Ventas_PVCobranza
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
Protected Sub ChkAplicaGasto_CheckedChanged(sender As Object, e As EventArgs)
|
||||||
|
DivCuentaGasto.Visible = ChkAplicaGasto.Checked
|
||||||
|
|
||||||
|
UpIngresoEgreso.Update()
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
Reference in New Issue
Block a user