Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
<asp:LinkButton runat="server" ID="BtnDescargaSabana" OnClick="BtnDescargaSabana_Click" data-toggle="tooltip" data-placement="left" title="Descargar Sabana de Venta" Text="<i class='fa fa-download'></i> Descargar Sabana de Venta"></asp:LinkButton>
|
||||
</li>
|
||||
<li>
|
||||
<asp:LinkButton runat="server" ID="BtnImprimir" OnClick="BtnImprimir_Click" data-toggle="tooltip" data-placement="left" title="Agregar un Defecto" Text="<i class='fa fa-file-pdf-o'></i> Imprimir"></asp:LinkButton>
|
||||
<asp:LinkButton runat="server" ID="BtnImprimir" OnClick="BtnImprimir_Click" data-toggle="tooltip" data-placement="left" title="PDF" Text="<i class='fa fa-file-pdf-o'></i> PDF"></asp:LinkButton>
|
||||
</li>
|
||||
</ContentTemplate>
|
||||
<Triggers>
|
||||
|
||||
@@ -9,6 +9,7 @@ Partial Class Acumuladores_RepEntradasUsados
|
||||
|
||||
Private DiasSemana(7) As String
|
||||
Private Meses(12) As String
|
||||
Private Cargado As Integer = 0
|
||||
|
||||
Private Property DatosEntradasUsados() As DataTable
|
||||
Get
|
||||
@@ -25,8 +26,6 @@ Partial Class Acumuladores_RepEntradasUsados
|
||||
txtFechaF.Text = Today
|
||||
CargarDatos()
|
||||
CargarCombos()
|
||||
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -36,14 +35,18 @@ Partial Class Acumuladores_RepEntradasUsados
|
||||
End Sub
|
||||
|
||||
Protected Sub CargarCombos()
|
||||
Dim ObjAcum As New ClsAcumuladores
|
||||
Dim fecha As Date = Date.Now.AddMonths(-1)
|
||||
ObjAcum.GetAñosVentas(UsuarioActual.CveEmpresa)
|
||||
DdlAño.DataSource = ObjAcum.DtResultados
|
||||
DdlAño.DataBind()
|
||||
DdlAño.SelectedValue = fecha.Year.ToEntero
|
||||
ObjAcum.Dispose()
|
||||
Dim Años As New ListItem
|
||||
Dim i As Integer
|
||||
If Cargado = 0 Then
|
||||
For i = Date.Now.Year.ToEntero To (fecha.Year.ToEntero - 5) Step -1
|
||||
Años = New ListItem(i, i)
|
||||
DdlAño.Items.Add(Años)
|
||||
Next
|
||||
End If
|
||||
Cargado = 1
|
||||
|
||||
DdlAño.SelectedValue = fecha.Year.ToEntero
|
||||
DdlMes.SelectedValue = fecha.Month.ToEntero
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<asp:UpdatePanel ID="UpAcciones" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<li>
|
||||
<asp:LinkButton runat="server" ID="BtnImprimir" OnClick="BtnImprimir_Click" data-toggle="tooltip" data-placement="left" title="Agregar un Defecto" Text="<i class='fa fa-file-pdf-o'></i>Imprimir"></asp:LinkButton>
|
||||
<asp:LinkButton runat="server" ID="BtnImprimir" OnClick="BtnImprimir_Click" data-toggle="tooltip" data-placement="left" title="PDF" Text="<i class='fa fa-file-pdf-o'></i> PDF"></asp:LinkButton>
|
||||
</li>
|
||||
</ContentTemplate>
|
||||
<Triggers>
|
||||
@@ -39,7 +39,7 @@
|
||||
<asp:CheckBox ID="chkexpand" CssClass="hidden" runat="server" />
|
||||
</div>
|
||||
<div class="titlefiltros caption">
|
||||
<div class="col-md-1 truncate v-center" style="text-align: right!important">Almacen:</div>
|
||||
<div class="col-md-1 truncate v-center" style="text-align: right!important">Almacén:</div>
|
||||
<div class="col-md-2 v-center">
|
||||
<asp:ListBox ID="DdlAlmacen" CssClass="form-control input-sm select2me" DataTextField="Almacen" DataValueField="CveAlmacen" Style="width: 100%;" runat="server"></asp:ListBox>
|
||||
</div>
|
||||
|
||||
@@ -1206,20 +1206,6 @@ Public Class ClsAcumuladores
|
||||
Return Retorno
|
||||
End Function
|
||||
|
||||
Public Function GetAñosVentas(CveEmprea As Integer) As Boolean
|
||||
Dim Retorno As Boolean = False
|
||||
SqlDataAdapter(String.Format("select top 6 year(Fecha) as Año from Ventas where CveEmpresa = {0} group by year(Fecha) Order by year(Fecha) desc", CveEmprea.ToString), CommandType.Text)
|
||||
|
||||
Try
|
||||
SqlAdapter.Fill(Data)
|
||||
Retorno = True
|
||||
Catch ex As Exception
|
||||
OnError(String.Format("Ocurrió un error al consultar los año de venta"), ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
|
||||
End Try
|
||||
Return Retorno
|
||||
|
||||
End Function
|
||||
|
||||
|
||||
#Region " IDisposable Support "
|
||||
' IDisposable
|
||||
|
||||
@@ -49,8 +49,8 @@ Partial Class Contabilidad_PolizasImpresion
|
||||
Dim params As New List(Of ReportParameter)
|
||||
params.Add(New ReportParameter("Empresa", UsuarioActual.Empresa.Empresa))
|
||||
params.Add(New ReportParameter("TipoPoliza", dr("TipoPoliza").ToString))
|
||||
params.Add(New ReportParameter("Finicio", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
params.Add(New ReportParameter("FFin", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
params.Add(New ReportParameter("Finicio", TxtFechaInicio.Text))
|
||||
params.Add(New ReportParameter("FFin", TxtFechaFin.Text))
|
||||
params.Add(New ReportParameter("Fecha", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
'params.Add(New ReportParameter("Nombre", dr("Cuenta").ToString))
|
||||
'params.Add(New ReportParameter("Cuenta", dr("Codigo").ToString))
|
||||
|
||||
@@ -51,8 +51,8 @@ Partial Class Contabilidad2_PolizasImpresion
|
||||
Dim params As New List(Of ReportParameter)
|
||||
params.Add(New ReportParameter("Empresa", UsuarioActual.Empresa.Empresa))
|
||||
params.Add(New ReportParameter("TipoPoliza", dr("TipoPoliza").ToString))
|
||||
params.Add(New ReportParameter("Finicio", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
params.Add(New ReportParameter("FFin", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
params.Add(New ReportParameter("Finicio", TxtFechaInicio.Text))
|
||||
params.Add(New ReportParameter("FFin", TxtFechaFin.Text))
|
||||
params.Add(New ReportParameter("Fecha", dr("Fecha").ToString.ToDate.ToShortDateString))
|
||||
'params.Add(New ReportParameter("Nombre", dr("Cuenta").ToString))
|
||||
'params.Add(New ReportParameter("Cuenta", dr("Codigo").ToString))
|
||||
|
||||
Reference in New Issue
Block a user