Merge branch 'master' of http://rpimienta@192.168.10.111:8383/SIG.git

2019-09-02 14:58:05 -07:00
parent c90ef7263c 7d0d6aa1aa
commit 92b179384b
13 changed files with 3189 additions and 250 deletions
--- 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
--- 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"
--- 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
--- 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)
--- 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/Inventarios/EntradasSalidas.aspx.vb
+++ b/Inventarios/EntradasSalidas.aspx.vb
@@ -1089,7 +1089,7 @@ Partial Class Inventarios_EntradasSalidas
                If ObjConta IsNot Nothing Then ObjConta.RollBack()
                Inv.RollBack()

-                Alert("Ocurrió un error al eliminar el movimiento. Por favor vuelva a intetar.", TipoMensaje.MsgError)
+                Alert("Ocurrió un error al eliminar el movimiento. Por favor vuelva a intentar.", TipoMensaje.MsgError)
            End If
            CveMovimiento = 0

--- a/Nomina/Finiquito.aspx
+++ b/Nomina/Finiquito.aspx
@@ -188,6 +188,10 @@
                                        </asp:DropDownList>
                                        <asp:Label runat="server" Text="Concepto:" AssociatedControlID="DdlConcepto"></asp:Label>
                                    </div>
+                                    <div class="form-group form-md-line-input input-iconright">
+                                        <asp:TextBox ID="TxtImporte" CssClass="form-control" runat="server"></asp:TextBox>
+                                        <asp:Label runat="server" Text="Concepto:" AssociatedControlID="DdlConcepto"></asp:Label>
+                                    </div>
                                </div>
                                <div class="modal-footer">
                                    <asp:UpdatePanel runat="server" UpdateMode="Conditional">
@@ -228,6 +232,10 @@
                                            </asp:DropDownList>
                                            <asp:Label runat="server" Text="Motivo de Baja: " AssociatedControlID="DdlMotivoBaja"></asp:Label>
                                        </div>
+                                        <div class="">
+                                            ¿es Liquidación?
+                                            <asp:CheckBox ID="ChkesLiquidacion" CssClass="chksino" Text=" " runat="server" />
+                                        </div>
                                        <div class="row">
                                            <div class="col-md-6" style="padding-right: 0px">
                                                <div class="form-group form-md-line-input input-iconright">
@@ -285,6 +293,22 @@
 <asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
    <%--"<tr class=\"thTituloConcepto\"> <th scope=\"col\" colspan=\"2\">Percepciones</th><th scope=\"col\" colspan=\"2\">Deducciones</th> </tr>"--%>
    <script>
+        function insertParam(key, value) {
+            key = encodeURIComponent(key); value = encodeURIComponent(value);
+
+            var s = document.location.search;
+            var kvp = key + "=" + value;
+
+            var r = new RegExp("(&|\\?)" + key + "=[^\&]*");
+
+            s = s.replace(r, "$1" + kvp);
+
+            if (!RegExp.$1) { s += (s.length > 0 ? '&' : '?') + kvp; };
+
+            //again, do what you will here
+            document.location.search = s;
+        }
+
        function ADSBegin() {
            if ($('.thTituloConcepto').length == 0) {
                $('.GvConceptos').prepend("<tr class=\"thTituloConcepto\"> <th scope=\"col\" colspan=\"2\">Percepciones</th><th scope=\"col\" colspan=\"2\">Deducciones</th> </tr>");
--- a/Nomina/Finiquito.aspx.vb
+++ b/Nomina/Finiquito.aspx.vb
@@ -130,7 +130,7 @@ Partial Class Nomina_Finiquito
                        obj.EstatusD = dtD.Rows(index)("Estatus").ToString().ToEntero()
                    ElseIf index = noD Then
                        obj.EstatusD = -1
-                        obj.ConceptoD  = "Agregar"
+                        obj.ConceptoD = "Agregar"
                    End If
                    listaconceptos.Add(obj)
                Next
@@ -155,7 +155,7 @@ Partial Class Nomina_Finiquito
            objT.CveConcepto = 0
            objT.Concepto = ""
            objT.Estatus = -3
-            objT.ImporteD = objST.Importe - objT.Importe
+            objT.ImporteD = objST.Importe + objST.ImporteD
            objT.CveConceptoD = 0
            objT.ConceptoD = "Total"
            objT.EstatusD = -3
@@ -188,6 +188,20 @@ Partial Class Nomina_Finiquito
            ViewState("DTConceptos") = Value
        End Set
    End Property
+
+
+    Private Property esLiquidacion As Boolean
+        Get
+            If Not IsNothing(ViewState("esLiquidacion")) Then
+                Return CBool(ViewState("esLiquidacion"))
+            Else
+                Return False
+            End If
+        End Get
+        Set
+            ViewState("esLiquidacion") = Value
+        End Set
+    End Property
 #End Region
    Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
        If Not Page.IsPostBack Then
@@ -217,7 +231,7 @@ Partial Class Nomina_Finiquito
    End Sub
    Private Sub CargaDdlPersonal()
        Dim ObjPersonal As New ClsRH
-        If ObjPersonal.GetPersonal(-1, "-1", "-1", "-1", "-1", -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, "-1", -1, -1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", UsuarioActual.CveEmpresa) Then
+        If ObjPersonal.GetPersonal(-1, UsuarioActual.CveEmpresa) Then
            DdlPersonal.DataSource = ObjPersonal.DtResultados
            DdlPersonal.DataBind()
        End If
@@ -227,29 +241,40 @@ Partial Class Nomina_Finiquito
    Private Function CargaDatosFiniquito() As Boolean
        Dim retorno As Boolean = True
        If CvePersonal > 0 Then
+
            DdlPersonal.SelectedValueExist(CvePersonal.ToString())
            Dim Nombre As String = ""
            Dim FechaBaja As String = ""
-            Dim MotivoBaja As String = ""
            Dim EstatusPersonal As String = ""
            CvePeriodoFiniquito = 0
            CveTipoPeriodo = 0
+            esLiquidacion = False
            pnlupValoresFiniquito.Visible = False
-            Dim ObjPersonal As New ClsRH
-            If ObjPersonal.GetPersonal(CvePersonal, "-1", "-1", "-1", "-1", -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, "-1", -1, -1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", UsuarioActual.CveEmpresa) AndAlso ObjPersonal.DtResultados.Rows.Count > 0 Then
-                Nombre = ObjPersonal.DtResultados.Rows(0)("Nombre").ToString()
-                FechaBaja = String.Format("{0:dd/MM/yyyy}", ObjPersonal.FechaBaja)
-                MotivoBaja = String.Format("{0}", ObjPersonal.DtResultados.Rows(0)("MotivoBaja"))
-                EstatusPersonal = String.Format("{0}", ObjPersonal.DtResultados.Rows(0)("EstatusPersonal"))
-                CvePeriodoFiniquito = ObjPersonal.DtResultados.Rows(0)("CvePeriodoFiniquito").ToString().ToEntero()
-                CveTipoPeriodo = ObjPersonal.DtResultados.Rows(0)("CveTipoPeriodo").ToString().ToEntero()
-            End If
-            ObjPersonal.Dispose()
+            DdlMotivoBaja.SelectedValue = "-1"
+            Using ObjPersonal As New ClsRH()
+                If ObjPersonal.GetPersonal(CvePersonal, UsuarioActual.CveEmpresa) AndAlso ObjPersonal.DtResultados.Rows.Count > 0 Then
+                    Nombre = ObjPersonal.DtResultados.Rows(0)("Nombre").ToString()
+                    FechaBaja = String.Format("{0:dd/MM/yyyy}", ObjPersonal.FechaBaja)
+                    EstatusPersonal = String.Format("{0}", ObjPersonal.DtResultados.Rows(0)("EstatusPersonal"))
+                    CveTipoPeriodo = ObjPersonal.DtResultados.Rows(0)("CveTipoPeriodo").ToString().ToEntero()
+                End If
+                If ObjPersonal.GetPersonalAltas(CvePersonal) AndAlso ObjPersonal.DtResultados.Rows.Count > 0 Then
+                    CvePeriodoFiniquito = ObjPersonal.DtResultados.Rows(0)("CvePeriodoFiniquito").ToString().ToEntero()
+                    FechaBaja = String.Format("{0:dd/MM/yyyy}", ObjPersonal.DtResultados.Rows(0)("FechaFin"))
+                    DdlMotivoBaja.SelectedValueExist(ObjPersonal.DtResultados.Rows(0)("CveMotivoBaja").ToString().ToEntero())
+                    Dim stringesliquidacion = ObjPersonal.DtResultados.Rows(0)("esLiquidacion").ToString()
+                    esLiquidacion = (stringesliquidacion = "True" OrElse stringesliquidacion = "1")

+                End If
+            End Using
+            If DdlMotivoBaja.SelectedValue.ToEntero() > 0 Then
+                LblMotivoBaja.Text = DdlMotivoBaja.SelectedItem.Text
+            Else
+                LblMotivoBaja.Text = ""
+            End If
            HypEmpleado.Text = Nombre
            HypEmpleado.NavigateUrl = String.Format("/RH/Personal.aspx?CvePersonal={0}", CvePersonal)
            LblFechaBaja.Text = FechaBaja
-            LblMotivoBaja.Text = MotivoBaja
            LblEstatus.Text = EstatusPersonal
            TxtFechaBaja.Text = FechaBaja
            If CvePeriodoFiniquito <= 0 Then
@@ -257,11 +282,11 @@ Partial Class Nomina_Finiquito
                retorno = False
                pnlupValoresFiniquito.Visible = True
            End If
-            Dim ObjNom As New ClsNominas
-            If ObjNom.GetFiniquitosPersonal(CvePersonal, UsuarioActual.CveEmpresa) Then
-                DTConceptosPersonal = ObjNom.DtResultados
-            End If
-            ObjNom.Dispose()
+            Using ObjNom As New ClsNominas()
+                If ObjNom.GetFiniquitosPersonal(CvePersonal, UsuarioActual.CveEmpresa) Then
+                    DTConceptosPersonal = ObjNom.DtResultados
+                End If
+            End Using
            GvConceptos.DataSource = ConceptsPersonas
            GvConceptos.DataBind()
        Else
@@ -273,6 +298,13 @@ Partial Class Nomina_Finiquito

    Protected Sub LnkCampiarEmpleado_Click(sender As Object, e As EventArgs)
        CvePersonal = DdlPersonal.SelectedValue.ToEntero()
+
+
+        Using ObjPersonal As New ClsRH()
+            If ObjPersonal.UpPersonalAltas(CvePersonal, "", TxtFechaBaja.Text.ToDateTime().ToString("yyyy/MM/dd"), DdlPeriodo.SelectedValue.ToEntero(), DdlMotivoBaja.SelectedValue.ToEntero(), ChkesLiquidacion.Checked) AndAlso ObjPersonal.DtResultados.Rows.Count > 0 Then
+
+            End If
+        End Using
        If pnlupValoresFiniquito.Visible Then

        End If
@@ -295,7 +327,9 @@ Partial Class Nomina_Finiquito

    End Sub
    Protected Sub DdlPersonal_SelectedIndexChanged(sender As Object, e As EventArgs)
-
+        Response.Redirect($"/Nomina/Finiquito.aspx?CvePersonal={DdlPersonal.SelectedValue}")
+        'Alert($"insertParam('CvePersonal','{DdlPersonal.SelectedValue}')")
+        'RegistraScript($"insertParam('CvePersonal','{DdlPersonal.SelectedValue}')")
    End Sub
    Protected Sub DdlTipoPeriodo_SelectedIndexChanged(sender As Object, e As EventArgs)
        Dim CveTipoPeriodoactual As Integer = If(DdlTipoPeriodo.SelectedValue.ToEntero() > 0, DdlTipoPeriodo.SelectedValue.ToEntero(), CveTipoPeriodo)
@@ -354,24 +388,24 @@ Partial Class Nomina_Finiquito
            End If

            If Estatus = -1 Then
-                    LtlConcepto.Visible = False
-                ElseIf Estatus > 0 Then
-                    LtlImporte.Visible = False
-                End If
-
-                If EstatusD = -1 Then
-                    LtlConceptoD.Visible = False
-                ElseIf EstatusD > 0 Then
-                    LtlImporteD.Visible = False
-                End If
-
-
-                LnkConcepto.Visible = Not LtlConcepto.Visible
-                LnkConceptoD.Visible = Not LtlConceptoD.Visible
-                LnkImporte.Visible = Not LtlImporte.Visible
-                LnkImporteD.Visible = Not LtlImporteD.Visible
-
+                LtlConcepto.Visible = False
+            ElseIf Estatus > 0 Then
+                LtlImporte.Visible = False
            End If
+
+            If EstatusD = -1 Then
+                LtlConceptoD.Visible = False
+            ElseIf EstatusD > 0 Then
+                LtlImporteD.Visible = False
+            End If
+
+
+            LnkConcepto.Visible = Not LtlConcepto.Visible
+            LnkConceptoD.Visible = Not LtlConceptoD.Visible
+            LnkImporte.Visible = Not LtlImporte.Visible
+            LnkImporteD.Visible = Not LtlImporteD.Visible
+
+        End If
    End Sub

    Protected Sub LnkConcepto_Click(sender As Object, e As EventArgs)
--- a/Sistemas/ConfiguracionEmpresa.aspx
+++ b/Sistemas/ConfiguracionEmpresa.aspx
@@ -54,8 +54,69 @@
                                                        <asp:ListItem Value="2"><label><b>Global</b></label></asp:ListItem>
                                                    </asp:RadioButtonList>
                                                </td>
+                                                <td>
+                                                    <asp:DropDownList ID="DdlCtaContableClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                </td>
                                            </tr>
                                            <tr>
+                                                <td>Proveedores:</td>
+                                                <td>
+                                                    <asp:RadioButtonList ID="RadioButtonList4" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="50">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>Individual</b></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>Global</b></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
+                                                <td>
+                                                    <asp:DropDownList ID="DropDownList1" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Deudores:</td>
+                                                <td>
+                                                    <asp:RadioButtonList ID="RadioButtonList5" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="50">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>Individual</b></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>Global</b></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
+                                                <td>
+                                                    <asp:DropDownList ID="DropDownList2" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Almacen:</td>
+                                                <td>
+                                                    <asp:RadioButtonList ID="RadioButtonList6" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="50">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>Individual</b></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>Global</b></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
+                                                <td>
+                                                    <asp:DropDownList ID="DropDownList3" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Costo:</td>
+                                                <td>
+                                                    <asp:RadioButtonList ID="RadioButtonList7" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="50">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>Individual</b></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>Global</b></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
+                                                <td>
+                                                    <asp:DropDownList ID="DropDownList4" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                </td>
+                                            </tr>
+<%--                                            <tr>
                                                <td>Clave de Empresa:</td>
                                                <td>
                                                    <asp:TextBox ID="TxtCveEmpresa" runat="server" MaxLength="50" Width="60px"></asp:TextBox>
@@ -70,27 +131,73 @@
                                                    <asp:RequiredFieldValidator ID="RFVEmpresa" runat="server" ControlToValidate="TxtEmpresa" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Nombre de la Empresa''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
                                                    <ajax:ValidatorCalloutExtender ID="VCEEmpresa" runat="server" HighlightCssClass="vco" TargetControlID="RFVEmpresa" Width="300px"></ajax:ValidatorCalloutExtender>
                                                </td>
+                                            </tr>--%>
+                                        </table>
+                                    </div>
+                                </div>
+
+                                <div class="portlet light smmallpadding bordered">
+                                    <div class="portlet-title">
+                                        <div class="caption font-green">
+                                            <i class="icon-pin font-green"></i>
+                                            <span class="caption-subject bold uppercase">Clasificaciones</span>
+                                        </div>
+                                        <div class="actions">
+                                            <div class="btn-group">
+                                            </div>
+                                        </div>
+                                        <div class="tools">
+                                            <a href="javascript:;" class="collapse"></a>
+                                        </div>
+                                    </div>
+                                    <div class="portlet-body">
+                                        <table border="0">
+                                            <tr>
+                                                <td>
+                                                    <asp:RadioButtonList ID="RadioButtonList3" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="100">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>Ingreso por Clasificación de IVA</b><tr></tr></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>Ingreso por Clasificación de IVA + Clasificación</b></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                            <div class="col-md-6">
+                                <div class="portlet light smmallpadding bordered">
+                                    <div class="portlet-title">
+                                        <div class="caption font-green">
+                                            <i class="icon-pin font-green"></i>
+                                            <span class="caption-subject bold uppercase">Impuestos</span>
+                                        </div>
+                                        <div class="actions">
+                                            <div class="btn-group">
+                                            </div>
+                                        </div>
+                                        <div class="tools">
+                                            <a href="javascript:;" class="collapse"></a>
+                                        </div>
+                                    </div>
+                                    <div class="portlet-body">
+                                        <table border="0">
+                                            <tr>
+                                                <td>IVA Trasladado:<tr></tr>
+                                                    <asp:RadioButtonList ID="RadioButtonList2" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" CssClass="input-group" CellSpacing="100">
+                                                        <asp:ListItem Value="1" Selected="True"><label><b>0%</b><tr></tr></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>8%</b><tr></tr></label></asp:ListItem>
+                                                        <asp:ListItem Value="2"><label><b>16%</b><tr></tr></label></asp:ListItem>
+                                                    </asp:RadioButtonList>
+                                                </td>
                                            </tr>
                                        </table>
                                    </div>
                                </div>
                            </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
                        </div>

-
                    </ContentTemplate>
                </ajax:TabPanel>
            </ajax:TabContainer>
--- a/Sistemas/ConfiguracionEmpresa.aspx.vb
+++ b/Sistemas/ConfiguracionEmpresa.aspx.vb
@@ -17,7 +17,46 @@ Partial Class Sistemas_ConfiguracionEmpresa
    Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
        If Not IsPostBack Then

+            CargaCuentaClIente()

        End If
    End Sub
+
+    Private Sub CargaCuentaCliente()
+        Dim ObjCompaq As New ClsContPAQi(UsuarioActual.Empresa)
+        Dim ObjContabilidad As New ClsContabilidad
+
+        If RblTipo.SelectedValue = "SIG" Then
+            If ObjContabilidad.GetCuentas(-1, "-1", 1, UsuarioActual.CveEmpresa) Then
+                DdlCtaContableClientes.Items.Clear()
+                DdlCtaContableClientes.Items.Add(New ListItem("Seleccione", "0"))
+                DdlCtaContableClientes.DataSource = ObjContabilidad.DtResultados
+                DdlCtaContableClientes.DataBind()
+            End If
+        Else
+                If ObjCompaq.GetCuentas(-1, "-1", 1) Then
+                DdlCtaContableClientes.Items.Clear()
+                DdlCtaContableClientes.Items.Add(New ListItem("Seleccione", "0"))
+                DdlCtaContableClientes.DataSource = ObjCompaq.DtResultados
+                DdlCtaContableClientes.DataBind()
+            End If
+        End If
+
+    End Sub
+
+    Protected Sub RblTipo_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RblTipo.SelectedIndexChanged
+        CargaCuentaCliente()
+    End Sub
+
+    Protected Sub BtnGuardar_Click(sender As Object, e As System.EventArgs) Handles BtnGuardar.Click
+        Dim ObjEmpresas As New ClsSisEmpresas
+        ObjEmpresas.IniciaTransacSQL()
+
+
+
+
+
+        ObjEmpresas.Dispose()
+
+    End Sub
 End Class
--- a/Ventas/ProductosServicios.aspx
+++ b/Ventas/ProductosServicios.aspx
@@ -209,7 +209,15 @@
                                            <ajax:ValidatorCalloutExtender ID="VCClasificacion" runat="server" HighlightCssClass="vco" TargetControlID="RFVClasificacion" Width="300px"></ajax:ValidatorCalloutExtender>
                                            <i></i>
                                        </div>
-
+                                       
+                                                <div class="form-group form-md-line-input input-iconright" id="DivClasificacionDetalle" runat="server" visible="false">
+                                                    <asp:DropDownList ID="DropDownList1" CssClass="form-control input-sm select2me " Width="70%" runat="server" AppendDataBoundItems="true" CausesValidation="true" DataTextField="ClasificacionDetalle" DataValueField="CveClasificacionDetalle" Enabled="true">
+                                                        <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                    </asp:DropDownList>
+                                                    <label for="<%= DdlTipoPSDes.ClientID.ToString()%>">Tipo:</label>
+                                                    <asp:LinkButton ID="LinkButton1" runat="server" OnClick="BtnAddClasificacionDetalle_Click" CssClass="btn btn-default btn-circle btn-xs " data-toggle="tooltip" title="Registrar un Tipo"><i class='fa fa-plus' style="color:black" ></i></asp:LinkButton>
+                                                </div>
+                                            
                                        <div class="form-group form-md-line-input input-iconright" id="DvTamanio" runat="server" visible="false">
                                            <asp:DropDownList ID="DdlTamanio" CssClass="form-control input-sm select2me" runat="server" AppendDataBoundItems="true" CausesValidation="true" DataTextField="Tamaño" DataValueField="CveTamaño" Width="350px">
                                                <asp:ListItem Value="-1">Seleccione</asp:ListItem>
--- 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