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:
rrene
2022-12-20 19:27:02 -07:00
parent b2cb32c00b 76c803b3d3
commit 1cb1b19799
4 changed files with 3842 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App_Code/ClsPaginas.vb
View File

@@ -7696,7 +7696,7 @@ Public Class ClsPaginas
params.Add(New ReportParameter("Entrega", Vta.Entrega))
params.Add(New ReportParameter("Vigencia", Vta.Vigencia.ToString("dd/MMMM/yyyy")))
params.Add(New ReportParameter("Sucursal", Vta.SubProyecto.SubProyecto))
params.Add(New ReportParameter("SucursalCliente", If(Vta.ClienteSucursal.Sucursal.ToString Is Nothing, "", Vta.ClienteSucursal.Sucursal.ToString)))
params.Add(New ReportParameter("SucursalCliente", If(Vta.ClienteSucursal.Sucursal Is Nothing, "", Vta.ClienteSucursal.Sucursal.ToString)))
params.Add(New ReportParameter("CveMoneda", Vta.CveMoneda.ToString))
params.Add(New ReportParameter("FormaEntrega", Vta.CondicionEntrega))

3840
Empresas/2/Formatos/Factura2.rdlc
View File

File diff suppressed because it is too large Load Diff

2
Inicio.aspx.vb
View File

@@ -76,6 +76,8 @@ Partial Class Inicio
Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
If Not IsPostBack Then
If Not IsNothing(Request("logout")) AndAlso Request("logout").ToString() = "1" Then
Usuario.CerrarSession()
Exit Sub

75
Ventas/Ventas.aspx.vb
View File

@@ -10139,11 +10139,20 @@ Partial Class Ventas
If ChkEnviarFacturaCRM.Checked AndAlso CorreoContactoCRM.Trim.Length > 0 Then
Try
'MANDA CORREO
Dim strURLHOST = String.Format("{0}://{1}:{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Host, HttpContext.Current.Request.Url.Port)
Dim Factura = New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, EsCancelacion:=False, CargaDTDetalle:=False, CargaDatosCliente:=False, CargaDatosRelacionados:=False)
Dim Hilo As New System.Threading.Thread(Sub() GeneraPDFFactura(True, Factura, UsuarioActual, strURLHOST, CorreoCRM:=CorreoContactoCRM))
Hilo.Start()
Dim pdfCRM As Byte() = Nothing
'If CveVenta > 0 Then
' ObjFactura = New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, EsCancelacion:=False)
'End If
pdfCRM = PdfFactura(ObjFactura)
If pdfCRM IsNot Nothing Then
Dim SerieFolioCRM As String = ObjFactura.SerieFolio
Dim TipoDoctoCRM As String = ObjFactura.TipoDocto
GeneraPDFCotizacion(True, CorreoContactoCRM:=CorreoContactoCRM, pdfCRM:=pdfCRM, SerieFolioCRM:=SerieFolioCRM, TipoDoctoCRM:=TipoDoctoCRM)
End If
Catch ex As Exception
OnError("Ocurrió un error al enviar el PDF", ex)
End Try
@@ -15840,39 +15849,56 @@ Partial Class Ventas
End If
End Sub
Private Sub GeneraPDFCotizacion(EnviaCorreo As Boolean)
Dim pdf As Byte() = Nothing
Private Sub GeneraPDFCotizacion(EnviaCorreo As Boolean, Optional CorreoContactoCRM As String = "", Optional pdfCRM As Byte() = Nothing,
Optional SerieFolioCRM As String = "", Optional TipoDoctoCRM As String = "")
Dim pdf As Byte() = Nothing
'GUARDA PDF
Dim LocalSerieFolio As String = String.Empty
Dim LocalTipoDocto As String = String.Empty
'TIMBRADO NUEVO
Try
If CveVenta > 0 Then
ObjFactura = New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, EsCancelacion:=False)
End If
pdf = PdfFactura(ObjFactura)
Catch ex As Exception
OnError("Ocurrió un error al generar el PDF", ex)
End Try
If CorreoContactoCRM.Trim.Length > 0 Then
pdf = pdfCRM
LocalSerieFolio = SerieFolioCRM
LocalTipoDocto = TipoDoctoCRM
Else
Try
If CveVenta > 0 Then
ObjFactura = New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, EsCancelacion:=False)
End If
pdf = PdfFactura(ObjFactura)
LocalSerieFolio = ObjFactura.SerieFolio
LocalTipoDocto = ObjFactura.TipoDocto
Catch ex As Exception
OnError("Ocurrió un error al generar el PDF", ex)
End Try
End If
LocalSerieFolio = ObjFactura.SerieFolio
LocalTipoDocto = ObjFactura.TipoDocto
'MANDA CORREO
If EnviaCorreo Then
Dim ArchivoAdjunto As String = ""
Dim ArchivoXML = ""
Dim ArchivoPDF = String.Format("{0}PDF\{1}\{2}.pdf", UsuarioActual.Empresa.Ruta, LocalTipoDocto, LocalSerieFolio)
If Adjunto <> "" Then
ArchivoAdjunto = String.Format("{0}Ventas\{1}", UsuarioActual.Empresa.Ruta, Adjunto)
End If
Try
' BytesPdfCotizacion(CveVenta)
Dim Hilo As New System.Threading.Thread(Sub() MandaMails(UsuarioActual, CveVenta, DdlTipoComprobante.SelectedValue.ToString(), LocalSerieFolio, ChkEnviarFactura.Checked, ArchivoXML, ArchivoPDF, ArchivoAdjunto))
Dim Hilo As New System.Threading.Thread(Sub() MandaMails(UsuarioActual, CveVenta, DdlTipoComprobante.SelectedValue.ToString(), LocalSerieFolio, ChkEnviarFactura.Checked, ArchivoXML, ArchivoPDF, ArchivoAdjunto, CorreoContactoCRM:=CorreoContactoCRM))
Hilo.Start()
Catch ex As Exception
OnError("Ocurrió error al mandar Mail", ex)
@@ -21010,12 +21036,21 @@ Partial Class Ventas
#End Region
#Region " MANDA CORREO "
Private Sub MandaMails(UsuarioActual As Usuario, CveVenta As Integer, TipoDocto As String, SerieFolio As String, EnviarFactura As Boolean, XML As String, PDF As String, Adjunto As String, Optional CorreoCRM As String = "")
Private Sub MandaMails(UsuarioActual As Usuario, CveVenta As Integer, TipoDocto As String, SerieFolio As String, EnviarFactura As Boolean, XML As String, PDF As String, Adjunto As String, Optional CorreoContactoCRM As String = "")
Dim ObjMail As New ClsSisMail()
Dim ResultadoMail As Integer = 0
Dim CorreoDestino As String = If(CorreoCRM.Trim.Length > 0, CorreoCRM, Mail)
Dim CorreoDestino As String = ""
If CorreoContactoCRM.Trim.Length > 0 Then
CorreoDestino = CorreoContactoCRM
ViewState("MailCC") = ""
End If
Try