.

2019-09-02 10:21:37 -07:00
parent c51668a7bc 3c84ad380f
commit 0a085332fc
5 changed files with 2888 additions and 86 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,267 @@
-################################################################################
-# Este archivo .gitignore ha sido creado automáticamente por Microsoft(R) Visual Studio.
-################################################################################
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+web.config
+*.txt
+[Mm]enu/
+[Tt]emp/
+[Ee]mpresas/
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates

-/Empresas
-/Menu
-/Web.config
-/Log.txt
-/LogTimbrado.txt
-/LogMail.txt
-/Bin/Microsoft.ReportViewer.WebForms.dll.refresh
-/Bin/Microsoft.ReportViewer.WebForms.dll
-/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh
-/Bin/Microsoft.ReportViewer.WebDesign.dll
-/Bin/Microsoft.ReportViewer.ProcessingObjectModel.dll.refresh
-/Bin/Microsoft.ReportViewer.ProcessingObjectModel.dll
-/Bin/Microsoft.ReportViewer.Design.dll.refresh
-/Bin/Microsoft.ReportViewer.Design.dll
-/Bin/Microsoft.ReportViewer.DataVisualization.dll.refresh
-/Bin/Microsoft.ReportViewer.DataVisualization.dll
-/Bin/Microsoft.ReportViewer.Common.dll.refresh
-/Bin/Microsoft.ReportViewer.Common.dll
-/.vs
-/Temp/637022536882545607-PLANTILLA CFE 2019 DISTRIBUCION.xlsx
-/Temp/637020871040720361-FormatoAlmacen (1).xlsx
-/Temp/637020865803848374-FormatoAlmacen (1).xlsx
-/Temp/637020863973072383-FormatoAlmacen (1).xlsx
-/Temp/637020854397859419-FormatoAlmacen (1).xlsx
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+*.sln
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+/Utilerias
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -59,6 +59,7 @@ Public Class ClsRH
        SqlAdapter = New SqlDataAdapter("", SqlConexion)
        Try
            SqlConexion.Open()
+            ConexionAdd()
        Catch ex As Exception
            OnError("Ocurrió un error al intentar conectarse a la base de datos.", ex)
        End Try
@@ -72,8 +73,47 @@ Public Class ClsRH
        End With
        Data = New DataTable
    End Sub
+    Private CveConexion As Integer = 0

+#Region "Conexiones"

+    Private Sub ConexionAdd()
+        If ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then
+
+            'DataAdapter(String.Format("INSERT INTO Sis_Conexiones (Clase,Modulo)  VALUES ('ClsRH','{0}')", "RH/CatMotivosBaja"), CommandType.Text) ' pendiente de terminar parra registrar el cveconexion, falta el rarámetro de módulo
+            DataAdapter("PA_Sis_RegistrarConexion")
+            With SqlAdapter.SelectCommand.Parameters
+                .Add("@Clase", SqlDbType.VarChar).Value = "ClsRH"
+                .Add("@Modulo", SqlDbType.VarChar).Value = HttpContext.Current.Request.Url.AbsolutePath.ToString
+                .Add("@IDConexion", SqlDbType.Int).Direction = ParameterDirection.Output
+            End With
+
+            Try
+                SqlAdapter.Fill(Data)
+                CveConexion = SqlAdapter.SelectCommand.Parameters("@IDConexion").Value.ToString.ToEntero
+            Catch ex As Exception
+                OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+            End Try
+
+        End If
+    End Sub
+
+    Private Sub ConexionClose()
+        If ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then
+
+            DataAdapter(String.Format("UPDATE Sis_Conexiones  SET FechaCierre = GETDATE() WHERE CveConexion = {0}", CveConexion), CommandType.Text)
+
+            Try
+                SqlAdapter.Fill(Data)
+
+            Catch ex As Exception
+                OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+            End Try
+
+        End If
+
+    End Sub
+#End Region

 #Region "ClsRHAsistenciasInasistencias"
    Public Function GetAsistenciasInasistencias() As Boolean
@@ -6695,6 +6735,7 @@ Public Class ClsRH
    ' Visual Basic agregó este código para implementar correctamente el modelo descartable.
    Public Sub Dispose() Implements IDisposable.Dispose
        ' No cambie este código. Coloque el código de limpieza en Dispose (ByVal que se dispone como Boolean).
+        ConexionClose()
        Dispose(True)
        GC.SuppressFinalize(Me)
    End Sub
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -1185,23 +1185,31 @@ Partial Class PopUpVerFactura
                Dim params As New List(Of ReportParameter)
                Dim SBDireccion As New StringBuilder()

+                params.Add(New ReportParameter("Empresa", UsuarioActual.Empresa.Empresa))
+                params.Add(New ReportParameter("Concepto", "Inventario Inicial"))
+                params.Add(New ReportParameter("Almacen", Almacen))
+                params.Add(New ReportParameter("Fecha", Fecha))
+                params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString("dd/MM/yyyy")))
+                params.Add(New ReportParameter("Folio", Folio))
+                params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
+                'params.Add(New ReportParameter("Descuentos", (dr("Descuentos").ToString.ToDouble).FormatoNumero(2)))
+                'params.Add(New ReportParameter("IVA", dr("IVA").ToString.FormatoNumero(2)))
+                'params.Add(New ReportParameter("Total", dr("Total").ToString.FormatoNumero(2)))
+                params.Add(New ReportParameter("NombreEntrego", String.Format("ENTREGÓ{0}{1}", vbCrLf, Capturo)))
+                params.Add(New ReportParameter("NombreRecibio", String.Format("RECIBIÓ{0}{1}", vbCrLf, Recibio)))
+
                If Archivo.Exists Then
-                    params.Add(New ReportParameter("Empresa", UsuarioActual.Empresa.Empresa))
-                    params.Add(New ReportParameter("Concepto", "Inventario Inicial"))
-                    params.Add(New ReportParameter("Almacen", Almacen))
-                    params.Add(New ReportParameter("Fecha", Fecha))
-                    params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString("dd/MM/yyyy")))
-                    params.Add(New ReportParameter("Folio", Folio))
-                    params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
-                    'params.Add(New ReportParameter("Descuentos", (dr("Descuentos").ToString.ToDouble).FormatoNumero(2)))
-                    'params.Add(New ReportParameter("IVA", dr("IVA").ToString.FormatoNumero(2)))
-                    'params.Add(New ReportParameter("Total", dr("Total").ToString.FormatoNumero(2)))
-                    params.Add(New ReportParameter("NombreEntrego", String.Format("ENTREGÓ{0}{1}", vbCrLf, Capturo)))
-                    params.Add(New ReportParameter("NombreRecibio", String.Format("RECIBIÓ{0}{1}", vbCrLf, Recibio)))
-
                    ImprimirPDF(UsuarioActual.Empresa.Ruta & "Formatos/Inicial.rdlc", DtMovimientos, params, String.Format("Inventario Inicial - {0}", Folio), RDSName:="DsInventarios")
-                End If
+                Else
+                    Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
+                    If Imagen.Exists Then
+                        params.Add(New ReportParameter("LogoPath", logouri))
+                    Else
+                        params.Add(New ReportParameter("LogoPath", ""))
+                    End If

+                    ImprimirPDF("Empresas/Grales/Formatos/Inicial.rdlc", DtMovimientos, params, String.Format("Inventario Inicial - {0}", Folio), RDSName:="DsInventarios")
+                End If

            Case 2, 32, 33  ' E N T R A D A S

--- a/Empresas/Grales/Formatos/Inicial.rdlc
+++ b/Empresas/Grales/Formatos/Inicial.rdlc
--- a/localhost.sln
+++ b/localhost.sln
@@ -1,45 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "http://localhost", "http://localhost", "{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}"
-	ProjectSection(WebsiteProperties) = preProject
-		SccProjectName = ""$/localhost", CAAAAAAA"
-		SccAuxPath = ""
-		SccLocalPath = "."
-		SccProvider = "MSSCCI:Microsoft Visual SourceSafe"
-		UseIISExpress = "false"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6"
-		Debug.AspNetCompiler.VirtualPath = "/localhost"
-		Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\inetpub\SIGIT\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost"
-		Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\inetpub\SIGIT\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		SlnRelativePath = "..\..\..\..\..\inetpub\SIGIT\"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B4590109-7BF9-411C-A1AE-792C02707CE6}
-	EndGlobalSection
-EndGlobal