diff --git a/App_Code/DtDatos.xsd b/App_Code/DtDatos.xsd index 799552e6a..f4839bec3 100644 --- a/App_Code/DtDatos.xsd +++ b/App_Code/DtDatos.xsd @@ -235,6 +235,24 @@ + + + + + + + + + + + + + + + + + + @@ -271,22 +289,8 @@ - - - - - - - - - - - - - - - - + + diff --git a/App_Code/DtDatos.xss b/App_Code/DtDatos.xss index 6fa884b50..3d21fe6c6 100644 --- a/App_Code/DtDatos.xss +++ b/App_Code/DtDatos.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -16,9 +16,9 @@ - - - + + + \ No newline at end of file diff --git a/Empresas/Grales/Formatos/RepIVA.rpt b/Empresas/Grales/Formatos/RepIVA.rpt index 6052ad0c0..9010bd468 100644 Binary files a/Empresas/Grales/Formatos/RepIVA.rpt and b/Empresas/Grales/Formatos/RepIVA.rpt differ diff --git a/Empresas/Grales/Formatos/RepIVAAcreditable.rpt b/Empresas/Grales/Formatos/RepIVAAcreditable.rpt index 9d2cf8b80..eb0fede9e 100644 Binary files a/Empresas/Grales/Formatos/RepIVAAcreditable.rpt and b/Empresas/Grales/Formatos/RepIVAAcreditable.rpt differ diff --git a/Inventarios/Fletes.aspx b/Inventarios/Fletes.aspx index ca81061e9..5e83888b3 100644 --- a/Inventarios/Fletes.aspx +++ b/Inventarios/Fletes.aspx @@ -8,6 +8,9 @@ Costo Indirecto +
  • + PDF +
    • diff --git a/Inventarios/Fletes.aspx.vb b/Inventarios/Fletes.aspx.vb index d77beff73..d0d318b96 100644 --- a/Inventarios/Fletes.aspx.vb +++ b/Inventarios/Fletes.aspx.vb @@ -3,6 +3,8 @@ Option Strict On Imports System.Data Imports Extensiones +Imports Microsoft.Reporting.WebForms + Partial Class Compras_Fletes Inherits ClsPaginas @@ -402,6 +404,30 @@ Partial Class Compras_Fletes #End Region + Protected Sub LnkPdf_Click(sender As Object, e As EventArgs) + + Dim Archivo As New System.IO.FileInfo(String.Format("{0}Formatos/Fletes.rdlc", UsuarioActual.Empresa.Ruta)) + + If Archivo.Exists Then + Dim ImporteGrid As Double = DtCompras.SUM("SubTotal") + Dim ImporteStr As String = LbOCImporte.Text.Split(" "c)(0) + Dim ImporteData As Double = ImporteStr.ToDouble() + + Dim params As New List(Of ReportParameter) + params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre)) + params.Add(New ReportParameter("Folio", LblFolio.Text)) + params.Add(New ReportParameter("Descripcion", TxtDescripcion.Text)) + params.Add(New ReportParameter("Fecha", TxtFecha.Text)) + params.Add(New ReportParameter("Modalidad", If(DdlModalidad.SelectedValue = "-1", "Por Orden de Compra", "Factura de Compra"))) + params.Add(New ReportParameter("Proveedor", LbOCProveedor.Text)) + params.Add(New ReportParameter("FolioModalidad", HLOCFolio.Text)) + params.Add(New ReportParameter("Importe", (ImporteGrid + ImporteData).ToString())) + + ImprimirPDF(UsuarioActual.Empresa.Ruta & "Formatos/Fletes.rdlc", DtCompras, params, String.Format("Costo Indirecto - {0}", LblFolio.Text), RDSName:="DataSet1") + End If + + End Sub + diff --git a/Inventarios/RepFletes.aspx b/Inventarios/RepFletes.aspx index bbe24707c..0c39960a0 100644 --- a/Inventarios/RepFletes.aspx +++ b/Inventarios/RepFletes.aspx @@ -81,7 +81,7 @@ - +
    FleteFacturas de Costo Indirecto Documento (OC/Compra)