Merge branch 'master' of http://192.168.10.111:8383/SIG

App_Code/ClsGenerales.vb

@@ -4018,7 +4018,7 @@ Public Class ClsGenerales
         End Try
         Return Retorno
     End Function
-    Public Function CancelarTimbreTimbrado(CveTimbre As Integer, FechaCancelacion As DateTime, CvePACCancelacion As Integer, SelloCancelacion As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean
+    Public Function CancelarTimbreTimbrado(CveTimbre As Integer, FechaCancelacion As DateTime, CvePACCancelacion As Integer, SelloCancelacion As String, CveUsuario As Integer, CveEmpresa As Integer, Optional RegenerarTimbre As Boolean = False) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Gral_TimbreTimbradoCancelar")
 
@@ -4030,6 +4030,27 @@ Public Class ClsGenerales
             .Add("@SelloCancelacion", SqlDbType.VarChar).Value = SelloCancelacion
             .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+            .Add("@RegenerarTimbre", SqlDbType.Bit).Value = RegenerarTimbre
+        End With
+
+        Try
+            SqlAdapter.Fill(Data)
+            Retorno = True
+        Catch ex As Exception
+            OnError("Ocurrió un error al actualizar el timbrado", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+        End Try
+        Return Retorno
+    End Function
+
+    Public Function ReactivarTimbreEntregaAlmacen(CveTimbre As Integer, CveEntregaAlmacen As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean
+        Dim Retorno As Boolean = False
+        DataAdapter("PA_Gral_TimbreReactivarUpdate")
+
+        With SqlAdapter.SelectCommand.Parameters
+            .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre
+            .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen
+            .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
+            .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
         End With
 
         Try
@@ -4040,6 +4061,7 @@ Public Class ClsGenerales
         End Try
         Return Retorno
     End Function
+
     Public Function RemoveGralTimbre(CveTimbre As Integer, CveEmpresa As Integer) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Gral_TimbreRemove")

Ventas/Ventas.aspx.vb

@@ -37655,7 +37655,7 @@ Partial Class Ventas
 
         Try
             Using wc As New HttpClient()
-                Dim Url As New Uri("http://polizavirtual.com.mx/webservice/api/Venta")
+                Dim Url As New Uri("https://polizavirtual.com.mx/webservice/api/Venta")
 
                 Dim Parametros As New List(Of KeyValuePair(Of String, String))