diff --git a/.gitignore b/.gitignore index e3e70ef3d..937cf5c78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,127 +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 -/.vs/localhost/v14/.suo -/LogMail.txt -/.vs -/packages -/Temp/637019018406489106-FormatoPS (1).xlsx -/Temp/637025911245561139-FormatoAlmacenTest2.xlsx -/Temp/637025910298823073-FormatoAlmacenTest2.xlsx -/Temp/637025890843842072-FormatoAlmacenTest.xlsx -/Temp/637025890070124286-FormatoAlmacenTest.xlsx -/Temp/637025889649837823-FormatoAlmacenTest.xlsx -/Temp/637025888979809566-FormatoAlmacenTest.xlsx -/Temp/637025888317991027-FormatoAlmacenTest.xlsx -/Temp/637025886969280729-FormatoAlmacenTest.xlsx -/Temp/637025883478481189-FormatoAlmacenTest.xlsx -/Temp/637025881893726971-FormatoAlmacenTest.xlsx -/Temp/637025875318390368-FormatoAlmacenTest.xlsx -/Temp/637025873461693799-FormatoAlmacenTest.xlsx -/Temp/637025867243299753-FormatoAlmacenTest.xlsx -/Temp/637025866028329141-FormatoAlmacenTest.xlsx -/Temp/637025858967837880-FormatoAlmacen (8).xlsx -/Temp/637025856623805153-FormatoAlmacenTest.xlsx -/Temp/637025854225974598-FormatoAlmacenTest.xlsx -/Temp/637025850746443741-FormatoAlmacenTest.xlsx -/Temp/637025849906896827-FormatoAlmacenTest.xlsx -/Temp/637025811751064573-FormatoAlmacen (9).xlsx -/Temp/637025802306385270-FormatoAlmacen (9).xlsx -/Temp/637024955677385188-FormatoAlmacen (8).xlsx -/Temp/637024223339157610-FormatoAlmacen (8).xlsx -/Temp/637024211080831453-FormatoAlmacen (8).xlsx -/Temp/637024208748075824-FormatoAlmacen (8).xlsx -/Temp/637024206124827330-FormatoAlmacen (8).xlsx -/Temp/637024198603668842-FormatoAlmacen (8).xlsx -/Temp/637024194937999485-FormatoAlmacen (8).xlsx -/Temp/637024187194477421-FormatoAlmacen (8).xlsx -/Temp/637024175396114926-FormatoAlmacen(1).xlsx -/Temp/637024174152414578-FormatoAlmacen(1).xlsx -/Temp/637024172516905613-FormatoAlmacen(1).xlsx -/Temp/637024172339379953-FormatoAlmacen(1).xlsx -/Temp/637024168678743644-FormatoAlmacen(1).xlsx -/Temp/637024167899990250-FormatoAlmacen(1).xlsx -/Temp/637024163796303799-FormatoAlmacen(1).xlsx -/Temp/637024162382548932-FormatoAlmacen(1).xlsx -/Temp/637024154734150595-FormatoAlmacen(1).xlsx -/Temp/637024152618695056-FormatoAlmacen(1).xlsx -/Temp/637024129146071459-FormatoAlmacen(1).xlsx -/Temp/637024111695874769-FormatoAlmacen(1).xlsx -/Temp/637022418959236013-FormatoAlmacen (4).xlsx -/Temp/637022412610855769-FormatoAlmacen (4).xlsx -/Temp/637022411585353362-FormatoAlmacen (4).xlsx -/Temp/637022404788752537-FormatoAlmacen (3).xlsx -/Temp/637022403501450734-FormatoAlmacen (3).xlsx -/Temp/637022402924630398-FormatoAlmacen (3).xlsx -/Temp/637022401250489074-FormatoAlmacen (5).xlsx -/Temp/637022398545213986-FormatoAlmacen (3).xlsx -/Temp/637022382214133336-FormatoAlmacen (5).xlsx -/Temp/637022380557097080-FormatoAlmacen (5).xlsx -/Temp/637022379412790662-FormatoAlmacen (5).xlsx -/Temp/637022378793902185-FormatoAlmacen (5).xlsx -/Temp/637021654534481890-FormatoAlmacen (3).xlsx -/Temp/637021651345315739-FormatoAlmacen (3).xlsx -/Temp/637021616508913486-FormatoAlmacen (3).xlsx -/Temp/637021593875864770-FormatoAlmacen (3).xlsx -/Temp/637021592631992296-FormatoAlmacen (3).xlsx -/Temp/637021592488982043-FormatoAlmacen (3).xlsx -/Temp/637021560097934922-FormatoAlmacen (3).xlsx -/Temp/637021554559110062-FormatoPS (1).xlsx -/Temp/637021550053083909-FormatoAlmacen (3).xlsx -/Temp/637021547214247040-FormatoAlmacen (3).xlsx -/Temp/637021545638924577-FormatoAlmacen (3).xlsx -/Temp/637021527971651311-FormatoAlmacen (3).xlsx -/Temp/637021527073950270-FormatoAlmacen (3).xlsx -/Temp/637021526064707043-FormatoAlmacen (3).xlsx -/Temp/637021522586485282-FormatoAlmacen (3).xlsx -/Temp/637021521403851473-FormatoAlmacen (3).xlsx -/Temp/637021519837377736-FormatoAlmacen (3).xlsx -/Temp/637021515778751967-FormatoAlmacen (3).xlsx -/Temp/637020728341171393-FormatoAlmacen (2).xlsx -/Temp/637020724850629405-FormatoAlmacen (2).xlsx -/Temp/637020723186758192-FormatoAlmacen (2).xlsx -/Temp/637020721382428289-FormatoAlmacen (2).xlsx -/Temp/637019818530193505-FormatoPS (1).xlsx -/Temp/637019811169546741-FormatoPS (1).xlsx -/Temp/637019803848526814-FormatoPS (1).xlsx -/Temp/637019796396388291-FormatoPS (1).xlsx -/Temp/637019783731773074-FormatoPS (1).xlsx -/Temp/637019781961714106-FormatoPS (1).xlsx -/Temp/637019780290041928-FormatoPS (1).xlsx -/Temp/637019777705293557-FormatoPS (1).xlsx -/Temp/637019766664551609-FormatoPS (1).xlsx -/Temp/637019765307733182-FormatoPS (1).xlsx -/Temp/637019764041447352-FormatoPS (1).xlsx -/Temp/637019759922681271-FormatoPS (1).xlsx -/Temp/637019028539049368-FormatoPS (1).xlsx -/Temp/637019027752495331-FormatoPS (1).xlsx -/Temp/637019026870914833-FormatoPS (1).xlsx -/Temp/637019020024023961-FormatoPS (1).xlsx -/Temp/637019018783282466-FormatoPS (1).xlsx -/Temp/637025921934403738-FormatoAlmacen (4)(1).xlsx -/Temp/637025871940254054-FormatoAlmacenTest.xlsx -/Temp/637025819297716436-FormatoAlmacen (9).xlsx -/Temp/637025813094826506-FormatoAlmacen (9).xlsx -/Temp/637025803627482072-FormatoAlmacen (9).xlsx -/Temp/637024210197949659-FormatoAlmacen (8).xlsx -/Temp/637024207387517397-FormatoAlmacen (8).xlsx -/Temp/637024203939520361-FormatoAlmacen (8).xlsx -/Temp/637024200918571845-FormatoAlmacen (8).xlsx -/Temp/637024199786848948-FormatoAlmacen (8).xlsx -/Temp/637024188637374314-FormatoAlmacen (8).xlsx -/Temp/637024170730017118-FormatoAlmacen(1).xlsx -/Temp/637024164939543846-FormatoAlmacen(1).xlsx -/Temp/637024164072145623-FormatoAlmacen(1).xlsx -/Temp/637024156159485931-FormatoAlmacen(1).xlsx -/Temp/637024153420640718-FormatoAlmacen(1).xlsx -/Temp/637024148711869965-FormatoAlmacen(1).xlsx -/Temp/637022414752610497-FormatoAlmacen (4).xlsx -/Temp/637021629396074854-FormatoAlmacen (3).xlsx -/Temp/637021627402424201-FormatoAlmacen (3).xlsx -/Temp/637021547606916146-FormatoAlmacen (3).xlsx -/Temp/637021529455078900-FormatoAlmacen (3).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 diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 653c048d5..e498feb95 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -4124,7 +4124,7 @@ Public Class ClsPaginas PaginaDict.Add("/Nomina/CatSatRegimenContratacion.aspx".ToUpper(), 257) PaginaDict.Add("/Nomina/CatSatTipoIncapacidad.aspx".ToUpper(), 258) PaginaDict.Add("/Nomina/CatSatRiesgoPuesto.aspx".ToUpper(), 259) - PaginaDict.Add("/Nomina/Utilidades.aspx".ToUpper(), 870) + PaginaDict.Add("/Nomina/ReportePTU.aspx".ToUpper(), 870) #End Region 'Ordenes de Servicios #Region "OS" diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index c6400cce7..228bd9b3f 100644 --- 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 @@ -1984,6 +2024,28 @@ Public Class ClsRH Return Retorno End Function + Public Function UpPersonalAltas(CvePersonal As Integer, fechaInicio As String, fechaFin As String, CvePeriodoFiniquito As Integer, CveMotivoBaja As Integer, esLiquidacion As Boolean) As Boolean + Dim Retorno As Boolean = False + SqlDataAdapter("PA_RH_PersonalAltasUp") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal + .Add("@fechaInicio", SqlDbType.VarChar).Value = fechaInicio + .Add("@fechaFin", SqlDbType.VarChar).Value = fechaFin + .Add("@CvePeriodoFiniquito", SqlDbType.Int).Value = CvePeriodoFiniquito + .Add("@CveMotivoBaja", SqlDbType.Int).Value = CveMotivoBaja + .Add("@esLiquidacion", SqlDbType.Int).Value = If(esLiquidacion, 1, 0) + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener el reporte de Altas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function + Public Function GetPersonalAltas(CvePersonal As Integer) As Boolean Dim Retorno As Boolean = False SqlDataAdapter("PA_RH_PersonalAltasGet") @@ -6673,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 diff --git a/App_Code/Timbrado.vb b/App_Code/Timbrado.vb index ef77aa206..9ccf49d07 100644 --- a/App_Code/Timbrado.vb +++ b/App_Code/Timbrado.vb @@ -634,7 +634,7 @@ Public Class Timbrado 'Retorno = TimbrarFacturaProFact(UsuarioActual, Ventas, TmpDTConceptos, TmpDTImpuestos, TmpDTComplementos, Ruta, LstFordASN, FordGSDBM, ObjV) Case 4 - Dim Ret As String = TimbrarFacturaGoCFDIv33(Ventas, UsuarioActual) + Dim Ret As String = TimbrarFacturaGoCFDIv33(Ventas, UsuarioActual, CvePACEspecial) Retorno = If(Ret = "", True, False) End Select @@ -1571,7 +1571,10 @@ Public Class Timbrado 'GC.Collect() Return Retorno End Function - Public Function TimbrarFacturaGoCFDIv33(Ventas As Modelos.Factura, UsuarioActual As Usuario) As String + Public Function TimbrarFacturaGoCFDIv33(Ventas As Modelos.Factura, UsuarioActual As Usuario, Optional CvePACEspecial As Integer = -1) As String + If CvePACEspecial = -1 Then + CvePACEspecial = UsuarioActual.Empresa.CvePAC + End If Dim sw As New Diagnostics.Stopwatch Dim swmili As Long = 0 Dim swTiempo As New StringBuilder @@ -1581,8 +1584,8 @@ Public Class Timbrado ' 'Sucursal matriz de la empresa Dim ArchivoLLave As String = String.Format("{0}Certificados\{1}", UsuarioActual.Empresa.Ruta, UsuarioActual.Empresa.ArchivoKey) Dim ArchivoCertificado As String = String.Format("{0}Certificados\{1}", UsuarioActual.Empresa.Ruta, UsuarioActual.Empresa.ArchivoCer) - Dim UsuarioServicio As String = If(UsuarioActual.Empresa.CvePAC = 2, UsuarioActual.Empresa.RFC, "rene.molina@adsistemas.mx") - Dim ClaveServicio As String = If(UsuarioActual.Empresa.CvePAC = 2, UsuarioActual.Empresa.RFC.ToLower, "rene2018") + Dim UsuarioServicio As String = If(CvePACEspecial = 2, UsuarioActual.Empresa.RFC, "rene.molina@adsistemas.mx") + Dim ClaveServicio As String = If(CvePACEspecial = 2, UsuarioActual.Empresa.RFC.ToLower, "rene2018") Dim Clave As String = UsuarioActual.Empresa.ContraseñaKey Dim EmisorRFC As String = UsuarioActual.Empresa.RFC Dim UrlServicio As String = "" ' Produccion @@ -1591,8 +1594,7 @@ Public Class Timbrado Dim SubTotal As Decimal = 0 Dim TimbraProduccion As Boolean = True If Not Directory.Exists(RutaArchivo) Then Directory.CreateDirectory(RutaArchivo) - - Select Case UsuarioActual.Empresa.CvePAC + Select Case CvePACEspecial Case 2 UrlServicio = "http://generacfdi.com.mx/rvltimbrado/service1.asmx?WSDL" Case 4 @@ -1606,7 +1608,7 @@ Public Class Timbrado ArchivoCertificado = $"{UsuarioActual.Empresa.Ruta}Certificados\CSD01_AAA010101AAA.cer" Clave = "12345678a" TimbraProduccion = False - Select Case UsuarioActual.Empresa.CvePAC + Select Case CvePACEspecial Case 2 UsuarioServicio = "fgomez" ClaveServicio = "12121212" @@ -2090,7 +2092,7 @@ Public Class Timbrado Using ObjVentas As New ClsVentas() - If ObjVentas.UpdateEstatusFactura(3, FolioFiscal, "", ObjCFDITimbre.Comprobante.Fecha, Ventas.CveVenta, CvePAC:=UsuarioActual.Empresa.CvePAC) Then + If ObjVentas.UpdateEstatusFactura(3, FolioFiscal, "", ObjCFDITimbre.Comprobante.Fecha, Ventas.CveVenta, CvePAC:=CvePACEspecial) Then Retorno = "" Else Retorno = "Error" @@ -2113,7 +2115,7 @@ Public Class Timbrado If ObjCFDITimbre.Comprobante.TipoComprobante = "N" Then Using ObjNomina2 As New ClsNominas() - If ObjNomina2.UpdateEstatusNomNominas(3, UsuarioActual.Empresa.CvePAC, FolioFiscal, "", ("01/01/2000").ToDate, ObjCFDITimbre.Nomina.CveNomina, 0, 0, 0, 0, 0) Then + If ObjNomina2.UpdateEstatusNomNominas(3, CvePACEspecial, FolioFiscal, "", ("01/01/2000").ToDate, ObjCFDITimbre.Nomina.CveNomina, 0, 0, 0, 0, 0) Then Retorno = "" Else Retorno = "Error" @@ -2159,7 +2161,7 @@ Public Class Timbrado End If #End Region - GuardaLogTimbrado(swTiempo.ToString, UsuarioActual.Empresa.CvePAC) + GuardaLogTimbrado(swTiempo.ToString, CvePACEspecial) Return Retorno End Function Public Sub GuardaLogTimbrado(Str As String, CvePAC As Integer) diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 2aea5300e..2f77eac63 100644 --- 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 diff --git a/Empresas/Grales/Formatos/Inicial.rdlc b/Empresas/Grales/Formatos/Inicial.rdlc new file mode 100644 index 000000000..934b1673f --- /dev/null +++ b/Empresas/Grales/Formatos/Inicial.rdlc @@ -0,0 +1,2559 @@ + + + + + + + + + 1.1404cm + + + 2.59197cm + + + 7.63545cm + + + 2.5cm + + + 1.42465cm + + + 1.28983cm + + + 1.83539cm + + + + + 0.38833cm + + + + + true + true + + + + + Cant. + + + + + + + Textbox7 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Código + + + + + + + Textbox9 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Descripción + + + + + + + Textbox11 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Serie/Lote + + + + + + + Textbox10 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Unidad Medida + + + + + + + Textbox13 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Precio + + + + + + + Textbox17 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Importe + + + + + + + Textbox19 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36717cm + + + + + true + true + + + + + =Fields!Cantidad.Value + + + + + + + Cantidad + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!Codigo.Value + + + + + + + Codigo + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!PS.Value + + + + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SerieLote.Value + + + + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!UnidadMedida.Value + + + + + + + UnidadMedida + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!PU.Value + + + + + + + PU + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!Total.Value + + + + + + + Total + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DsInventarios + 0.17639cm + 0.12931cm + 0.7555cm + 18.41769cm + + + + + + true + true + + + + + Total + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Total.Value) + + + + + + + Textbox12 + 1.27677cm + 15.95999cm + 0.6cm + 2.5cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + 1.21412cm + 0.17882cm + 0cm + 18.36818cm + 3 + + + + + + 3.76877cm + 1.05758cm + 0cm + 4.95004cm + 4 + + + + + + true + true + + + + + =Parameters!NombreRecibio.Value + + + + Textbox31 + 3.94516cm + 0.57924cm + 0.6cm + 5.95755cm + 5 + + + 2pt + 2pt + 2pt + 2pt + + + + 3.76877cm + 12.49668cm + 0cm + 4.95004cm + 6 + + + + + + true + true + + + + + =Parameters!Almacen.Value + + + + Textbox31 + 3.90988cm + 12.09981cm + 0.6cm + 5.95755cm + 7 + + + 2pt + 2pt + 2pt + 2pt + + + + 1.83333in + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Folio: + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Fecha: + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Almacen.Value + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Folio.Value + + + + + + + Textbox31 + 1.91947cm + 16.37332cm + 0.59999cm + 2.17368cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Fecha.Value + + + + + + + Textbox32 + 2.54185cm + 16.37332cm + 0.59999cm + 2.17368cm + 5 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Concepto.Value + + + 2pt + 2pt + 2pt + 2pt + + + + External + =Parameters!LogoPath.Value + FitProportional + 0.0704in + 0.72792in + 0.86019in + 7 + + + + + + + + + + + 1.11126cm + true + true + + + true + true + + + + + Usuario: + + + + =Parameters!UsuarioImprimio.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Fecha Impresión: + + + + =Parameters!FechaImpresion.Value + + + + + + + Textbox31 + 0.20284cm + 8.79781cm + 0.41981cm + 6.02198cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ="Página " & Globals.PageNumber & " de " & Globals.TotalPages + + + + + + + Textbox35 + 0.20284cm + 15.42178cm + 0.41981cm + 3.12522cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 27.94cm + 21.59cm + 1cm + 1cm + 1cm + 1cm + 0.13cm +