diff --git a/.gitignore b/.gitignore
index 9f8cee2fb..dc964f860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,4 +274,7 @@ __pycache__/
/App_WebReferences/WSRDLC
/wwwSIGGIT.rar
/Front
+/PortalCliente/ePagos/
+
+vwd.webinfo
/Bin.rar
diff --git a/App_Code/ClsGPS.vb b/App_Code/ClsGPS.vb
index 4f24d2b76..d19cb9541 100644
--- a/App_Code/ClsGPS.vb
+++ b/App_Code/ClsGPS.vb
@@ -5466,6 +5466,108 @@ Public Class ClsGPS
End Function
+#End Region
+
+#Region "K I M B E R L Y - C L A R K"
+ Public Function AddKimberlyClarkTracking(Dominio As String, Codigo As String, Serie As String, CveDispositivo As Integer, CveUsuarioIngreso As Integer, CveCliente As Integer, CveEmpresa As Integer) As Integer
+ Dim retorno As Integer = -1
+ DataAdapter("PA_GPS_KimberlyClarkTrackingAdd", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@Dominio", SqlDbType.VarChar).Value = Dominio
+ .Add("@Codigo", SqlDbType.VarChar).Value = Codigo
+ .Add("@Serie", SqlDbType.VarChar).Value = Serie
+ .Add("@CveDispositivo", SqlDbType.Int).Value = CveDispositivo
+ .Add("@CveUsuarioIngreso", SqlDbType.Int).Value = CveUsuarioIngreso
+ .Add("@CveCliente", SqlDbType.Int).Value = CveCliente
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@CveKimberlyClarkTracking", SqlDbType.Int).Direction = ParameterDirection.Output
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = SqlAdapter.SelectCommand.Parameters("@CveKimberlyClarkTracking").Value.ToString.ToEntero
+ Catch ex As Exception
+ OnError("Ocurrió un error al agregar un tracking.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+ End Function
+
+ Public Function UpdateKimberlyClarkTrackingEstatus(CveKimberlyClarkTracking As Integer, CveEstatus As Boolean, CveUsuarioModifico As Integer) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_GPS_KimberlyClarkTrackingUpdate", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveKimberlyClarkTracking", SqlDbType.Int).Value = CveKimberlyClarkTracking
+ .Add("@CveEstatus", SqlDbType.Bit).Value = CveEstatus
+ .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al actualizar un tracking.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+ End Function
+
+ Public Function GetKimberlyClarkTracking(CveKimberlyClarkTracking As Integer, CveDispositivo As Integer, CveEstatus As Integer, CveCliente As Integer, CveEmpresa As Integer, Optional FechaI As DateTime = ModExtensiones.MinFecha, Optional FechaF As DateTime = ModExtensiones.MaxFecha) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_GPS_KimberlyClarkTrackingGet", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveKimberlyClarkTracking", SqlDbType.Int).Value = CveKimberlyClarkTracking
+ .Add("@CveDispositivo", SqlDbType.Int).Value = CveDispositivo
+ .Add("@CveEstatus", SqlDbType.Int).Value = CveEstatus
+ .Add("@CveCliente", SqlDbType.Int).Value = CveCliente
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@FechaI", SqlDbType.DateTime).Value = FechaI
+ .Add("@FechaF", SqlDbType.DateTime).Value = FechaF
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al obtener un tracking.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+ End Function
+
+ Public Function GetKimberlyClarkTrackingDatos(CveKimberlyClarkTracking As Integer) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_GPS_KimberlyClarkTrackingGet", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveKimberlyClarkTracking", SqlDbType.Int).Value = CveKimberlyClarkTracking
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al obtener los datos de un tracking.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+ End Function
+
+ Public Function RemoveKimberlyClarkTracking(CveKimberlyClarkTracking As Integer) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_GPS_KimberlyClarkTrackingRemove", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveKimberlyClarkTracking", SqlDbType.Int).Value = CveKimberlyClarkTracking
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al eliminar un tracking.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+ End Function
#End Region
Protected Sub addParameters(name As String, tipo As SqlDbType, valor As Object)
diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb
index f7c161809..7b066db54 100644
--- a/App_Code/ClsInventarios.vb
+++ b/App_Code/ClsInventarios.vb
@@ -3928,7 +3928,8 @@ Public Class ClsInventarios
Return Retorno
End Function
- Public Function AddTrasladoSolicitudDetalle(CveTrasladoSolicitud As Integer, Cantidad As Integer, CveUM As Integer, CvePS As Integer, Precio As Double, Observaciones As String, CveContratoDetalle As Integer) As Boolean
+ Public Function AddTrasladoSolicitudDetalle(CveTrasladoSolicitud As Integer, Cantidad As Integer, CveUM As Integer, CvePS As Integer, Precio As Double, Observaciones As String,
+ CveContratoDetalle As Integer, Optional Serie As String = "-1") As Boolean
Dim Retorno As Boolean = False
Dim CveTraspasoSolicitud As Integer = 0
DataAdapter("PA_Inv_TraspasoSolicitudDetalleAdd")
@@ -3941,6 +3942,7 @@ Public Class ClsInventarios
.Add("@Precio", SqlDbType.Float).Value = Precio
.Add("@Observaciones", SqlDbType.VarChar).Value = Observaciones
.Add("@CveContratoDetalle", SqlDbType.Int).Value = CveContratoDetalle
+ .Add("@Serie", SqlDbType.NVarChar).Value = Serie
End With
Try
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 1be72d541..35bf0d9b8 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -4460,7 +4460,7 @@ Public Class ClsPaginas
PaginaDict.Add("/GPS/Shipments.aspx".ToUpper(), 673)
PaginaDict.Add("/GPS/RepGastos.aspx".ToUpper(), 685)
PaginaDict.Add("/GPS/RecursoConfiableTracking.aspx".ToUpper(), 692)
-
+ PaginaDict.Add("/GPS/KimberlyClarkTracking.aspx".ToUpper(), -1)
#End Region
'INVENTARIOS
#Region "Inventarios"
diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb
index b29e7d852..1ea810334 100644
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -4889,6 +4889,8 @@ Namespace Modelos
CveEstatus = 12
Case "Com"
CveEstatus = 9
+ Case "Ped", "DPe"
+ CveEstatus = 14
End Select
If CveEstatus.Contiene(4, 5) Then
diff --git a/App_WebReferences/WSKimberlyClark/Reference.svcmap b/App_WebReferences/WSKimberlyClark/Reference.svcmap
new file mode 100644
index 000000000..e8edb1371
--- /dev/null
+++ b/App_WebReferences/WSKimberlyClark/Reference.svcmap
@@ -0,0 +1,31 @@
+
+
+
+ false
+ true
+
+ false
+ false
+ false
+
+
+ true
+ Auto
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App_WebReferences/WSKimberlyClark/Service.disco b/App_WebReferences/WSKimberlyClark/Service.disco
new file mode 100644
index 000000000..f7c20e50e
--- /dev/null
+++ b/App_WebReferences/WSKimberlyClark/Service.disco
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App_WebReferences/WSKimberlyClark/Service.wsdl b/App_WebReferences/WSKimberlyClark/Service.wsdl
new file mode 100644
index 000000000..926141c97
--- /dev/null
+++ b/App_WebReferences/WSKimberlyClark/Service.wsdl
@@ -0,0 +1,1435 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Autenticacion necesaria para la operacion por parte de los prestadores
+
+
+
+
+ Cierre de sesion explicito por parte del prestador
+
+
+
+
+ Inserta un evento, reconoce el prestador por medio del login previo
+
+
+
+
+ Loguea e inserta multiples eventos en modo batch
+
+
+
+
+ Loguea e inserta un evento
+
+
+
+
+ Loguea e inserta un evento indicando ademas de incorporar los sensores
+
+
+
+
+
+
+
+
+ Retorna el primer comando de la lista
+
+
+
+
+ Indica que el comando ya fue procesado
+
+
+
+
+ Metodo para informar el estado del comando, retorna verdadero su fue insertado correctamente
+
+
+
+
+ Metodo para el cambio de clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Loguea cambia la clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+ Realiza el login y finaliza un comando
+
+
+
+
+ Realiza el login y actualiza el estado de un comando en proceso
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+
+
+ Autenticacion necesaria para la operacion por parte de los prestadores
+
+
+
+
+ Cierre de sesion explicito por parte del prestador
+
+
+
+
+ Inserta un evento, reconoce el prestador por medio del login previo
+
+
+
+
+ Loguea e inserta un evento
+
+
+
+
+
+
+
+
+ Retorna el primer comando de la lista
+
+
+
+
+ Indica que el comando ya fue procesado
+
+
+
+
+ Metodo para informar el estado del comando, retorna verdadero su fue insertado correctamente
+
+
+
+
+ Metodo para el cambio de clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Loguea cambia la clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+ Realiza el login y finaliza un comando
+
+
+
+
+ Realiza el login y actualiza el estado de un comando en proceso
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+
+
+ Autenticacion necesaria para la operacion por parte de los prestadores
+
+
+
+
+ Cierre de sesion explicito por parte del prestador
+
+
+
+
+ Inserta un evento, reconoce el prestador por medio del login previo
+
+
+
+
+ Loguea e inserta un evento
+
+
+
+
+
+
+
+
+ Retorna el primer comando de la lista
+
+
+
+
+ Indica que el comando ya fue procesado
+
+
+
+
+ Metodo para informar el estado del comando, retorna verdadero su fue insertado correctamente
+
+
+
+
+ Metodo para el cambio de clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Loguea cambia la clave, retorna verdadero si la clave es realmente cambiada.
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+ Realiza el login y finaliza un comando
+
+
+
+
+ Realiza el login y actualiza el estado de un comando en proceso
+
+
+
+
+ Realiza el login y retorna el primer comando de la lista
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App_WebReferences/WSKimberlyClark/configuration.svcinfo b/App_WebReferences/WSKimberlyClark/configuration.svcinfo
new file mode 100644
index 000000000..210b37bc7
--- /dev/null
+++ b/App_WebReferences/WSKimberlyClark/configuration.svcinfo
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App_WebReferences/WSKimberlyClark/configuration91.svcinfo b/App_WebReferences/WSKimberlyClark/configuration91.svcinfo
new file mode 100644
index 000000000..291b32d20
--- /dev/null
+++ b/App_WebReferences/WSKimberlyClark/configuration91.svcinfo
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+ ServiceSoap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ StrongWildcard
+
+
+
+
+
+ 65536
+
+
+
+
+
+
+
+
+ System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ System.Text.UTF8Encoding
+
+
+ Buffered
+
+
+
+
+
+ Text
+
+
+ System.ServiceModel.Configuration.BasicHttpSecurityElement
+
+
+ Transport
+
+
+ System.ServiceModel.Configuration.HttpTransportSecurityElement
+
+
+ None
+
+
+ None
+
+
+ System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement
+
+
+ Never
+
+
+ TransportSelected
+
+
+ (Collection)
+
+
+
+
+
+ System.ServiceModel.Configuration.BasicHttpMessageSecurityElement
+
+
+ UserName
+
+
+ Default
+
+
+
+
+
+
+ ServiceSoap1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ StrongWildcard
+
+
+
+
+
+ 65536
+
+
+
+
+
+
+
+
+ System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ System.Text.UTF8Encoding
+
+
+ Buffered
+
+
+
+
+
+ Text
+
+
+ System.ServiceModel.Configuration.BasicHttpSecurityElement
+
+
+ None
+
+
+ System.ServiceModel.Configuration.HttpTransportSecurityElement
+
+
+ None
+
+
+ None
+
+
+ System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement
+
+
+ Never
+
+
+ TransportSelected
+
+
+ (Collection)
+
+
+
+
+
+ System.ServiceModel.Configuration.BasicHttpMessageSecurityElement
+
+
+ UserName
+
+
+ Default
+
+
+
+
+
+
+ ServiceSoap12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ System.ServiceModel.Configuration.TextMessageEncodingElement
+
+
+ 64
+
+
+ 16
+
+
+ Soap12
+
+
+ System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ System.Text.UTF8Encoding
+
+
+ System.ServiceModel.Configuration.HttpsTransportElement
+
+
+ False
+
+
+ 524288
+
+
+ 65536
+
+
+ False
+
+
+ 00:00:00
+
+
+ Anonymous
+
+
+ False
+
+
+ True
+
+
+ StrongWildcard
+
+
+ True
+
+
+ 65536
+
+
+ 0
+
+
+ System.ServiceModel.Configuration.HttpMessageHandlerFactoryElement
+
+
+ (Collection)
+
+
+
+
+
+
+
+
+ Anonymous
+
+
+
+
+
+ Buffered
+
+
+ False
+
+
+ True
+
+
+ System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement
+
+
+ Never
+
+
+ TransportSelected
+
+
+ (Collection)
+
+
+ System.ServiceModel.Configuration.WebSocketTransportSettingsElement
+
+
+ Never
+
+
+ False
+
+
+ 00:00:00
+
+
+
+
+
+ False
+
+
+ 0
+
+
+ False
+
+
+
+
+
+
+
+
+ https://unigis2.unisolutions.com.ar/HUB/UNIGIS/MAPI/SOAP/GPS/Service.asmx
+
+
+
+
+
+ basicHttpBinding
+
+
+ ServiceSoap
+
+
+ WSKimberlyClark.ServiceSoap
+
+
+ System.ServiceModel.Configuration.AddressHeaderCollectionElement
+
+
+ <Header />
+
+
+ System.ServiceModel.Configuration.IdentityElement
+
+
+ System.ServiceModel.Configuration.UserPrincipalNameElement
+
+
+
+
+
+ System.ServiceModel.Configuration.ServicePrincipalNameElement
+
+
+
+
+
+ System.ServiceModel.Configuration.DnsElement
+
+
+
+
+
+ System.ServiceModel.Configuration.RsaElement
+
+
+
+
+
+ System.ServiceModel.Configuration.CertificateElement
+
+
+
+
+
+ System.ServiceModel.Configuration.CertificateReferenceElement
+
+
+ My
+
+
+ LocalMachine
+
+
+ FindBySubjectDistinguishedName
+
+
+
+
+
+ False
+
+
+ ServiceSoap
+
+
+
+
+
+
+
+
+
+
+
+
+ https://unigis2.unisolutions.com.ar/HUB/UNIGIS/MAPI/SOAP/GPS/Service.asmx
+
+
+
+
+
+ customBinding
+
+
+ ServiceSoap12
+
+
+ WSKimberlyClark.ServiceSoap
+
+
+ System.ServiceModel.Configuration.AddressHeaderCollectionElement
+
+
+ <Header />
+
+
+ System.ServiceModel.Configuration.IdentityElement
+
+
+ System.ServiceModel.Configuration.UserPrincipalNameElement
+
+
+
+
+
+ System.ServiceModel.Configuration.ServicePrincipalNameElement
+
+
+
+
+
+ System.ServiceModel.Configuration.DnsElement
+
+
+
+
+
+ System.ServiceModel.Configuration.RsaElement
+
+
+
+
+
+ System.ServiceModel.Configuration.CertificateElement
+
+
+
+
+
+ System.ServiceModel.Configuration.CertificateReferenceElement
+
+
+ My
+
+
+ LocalMachine
+
+
+ FindBySubjectDistinguishedName
+
+
+
+
+
+ False
+
+
+ ServiceSoap12
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Ashx/GenerarPDFFactura.ashx b/Ashx/GenerarPDFFactura.ashx
index d97b1c057..2e8cbae2d 100644
--- a/Ashx/GenerarPDFFactura.ashx
+++ b/Ashx/GenerarPDFFactura.ashx
@@ -22,12 +22,11 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
Public ReadOnly Property EsProduccion As Boolean
Get
- Return False
- 'If IsNothing(System.Configuration.ConfigurationManager.AppSettings("EsProduccion")) Then
- ' Return False
- 'Else
- ' Return (System.Configuration.ConfigurationManager.AppSettings("EsProduccion").ToString() = "1")
- 'End If
+ If IsNothing(System.Configuration.ConfigurationManager.AppSettings("EsProduccion")) Then
+ Return False
+ Else
+ Return (System.Configuration.ConfigurationManager.AppSettings("EsProduccion").ToString() = "1")
+ End If
End Get
End Property
@@ -160,7 +159,7 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
Dim objxml As XmlSatCFDI = XmlSatCFDI.readXML(RutaXml)
- Dim rutaReporte As String = "\Empresas\Grales\Formatos\FacturaSALI.rdlc"
+ Dim rutaReporte As String = "Empresas\Grales\Formatos\FacturaSALI.rdlc"
Dim QR As ClbNegBICFDv3_2.ClsNegCBBGenerar = New ClbNegBICFDv3_2.ClsNegCBBGenerar()
Dim cQr As Byte() = QR.GenerarCBBBytes(objxml.emisor.Rfc, objxml.receptor.Rfc, objxml.comprobante.Total, objxml.complemento.UUID)
@@ -199,6 +198,7 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
parametros.Add(New ReportParameter("complemento_SelloSAT", objxml.complemento.SelloSAT))
parametros.Add(New ReportParameter("complemento_UUID", objxml.complemento.UUID))
parametros.Add(New ReportParameter("complemento_CadenaOriginal", objxml.complemento.CadenaOriginal))
+ parametros.Add(New ReportParameter("Observaciones", datos.Factura.Observaciones))
Dim ds As New List(Of ReportDataSource)
@@ -222,34 +222,30 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
ltotales.Add(New utilValores("Total", objxml.comprobante.Total.ToString("N2")))
rdsTotales.Name = "dsTotales"
- rdsTotales.Value = ltotales
+ rdsTotales.Value = ltotales.QueryToDataTable(True)
ds.Add(rdsTotales)
Dim rds2 As ReportDataSource = New ReportDataSource()
Dim limagenes As List(Of utilImage) = New List(Of utilImage)()
limagenes.Add(New utilImage(cQr))
rds2.Name = "dsImagenes"
- rds2.Value = limagenes
+ rds2.Value = limagenes.QueryToDataTable(True)
ds.Add(rds2)
Dim rdsrelacionados As ReportDataSource = New ReportDataSource()
rdsrelacionados.Name = "dsRelacionados"
- rdsrelacionados.Value = objxml.cFDIRelacionados
+ rdsrelacionados.Value = objxml.cFDIRelacionados.QueryToDataTable(True)
ds.Add(rdsrelacionados)
Dim rds1 As ReportDataSource = New ReportDataSource()
rds1.Name = "dsConceptos"
- rds1.Value = objxml.GetConceptosforpdf()
+ rds1.Value = objxml.GetConceptosforpdf().QueryToDataTable(True)
ds.Add(rds1)
- Try
- bytes = StreamPDF(context, rutaReporte, ds, parametros)
+ bytes = StreamPDF(context, rutaReporte, ds, parametros)
- System.IO.File.Delete(RutaXml)
- Catch ex As Exception
-
- End Try
+ System.IO.File.Delete(RutaXml)
Return bytes
@@ -269,8 +265,8 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
If EsProduccion Then
- Dim CveUsuario As Integer = -1
- Dim CveEmpresa As Integer = -1
+ Dim CveUsuario As Integer = 100
+ Dim CveEmpresa As Integer = 1
Dim wsreport As New WSRDLC.WebServiceSoapClient
Dim params As New List(Of WSRDLC.ReportParameter)
@@ -285,12 +281,14 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
dt.TableName = rpds.Name
ds.Tables.Add(dt)
Next
+
For Each rpds As ReportParameter In Parametros
Dim param As New WSRDLC.ReportParameter
param.Name = rpds.Name
param.Values = {rpds.Values(0)}
params.Add(param)
Next
+
Bytes = wsreport.StreamPDFBytes(RutaReporte, ds, params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario)
wsreport = Nothing
params = Nothing
diff --git a/Contabilidad2/RepAnexoCatalogoAnual.aspx b/Contabilidad2/RepAnexoCatalogoAnual.aspx
index bb0921343..4e64fa231 100644
--- a/Contabilidad2/RepAnexoCatalogoAnual.aspx
+++ b/Contabilidad2/RepAnexoCatalogoAnual.aspx
@@ -104,22 +104,28 @@
-
+
+
+
+
-
+
+
+
+
+
+ Nombre
+
+
+
-
-
- Nombre
-
-
-
-
-
@@ -221,7 +227,7 @@
-
+
@@ -256,7 +262,7 @@
-
+
@@ -267,15 +273,15 @@