diff --git a/App_Code/ClsOS.vb b/App_Code/ClsOS.vb
index 102870404..c4148db68 100644
--- a/App_Code/ClsOS.vb
+++ b/App_Code/ClsOS.vb
@@ -59,6 +59,10 @@ Public Class ClsOS
Public Property CveSubProyecto As Integer
Public Property CveOSDetalle As Integer
Public Property CveOSTipo As Integer
+ Public Property Telefono As String = ""
+ Public Property CveModeloAuto As Integer = -1
+ Public Property Año As String = ""
+
Private Class Especificaciones
Public CveValor As Integer
Public CvePSCaracteristica As Integer
@@ -516,6 +520,10 @@ Public Class ClsOS
Me.UsuarioEntrego = Data.Rows(0)("UsuarioEntrego").ToString
Me.CveSubProyecto = Data.Rows(0)("CveSubproyecto").ToString
Me.CveOSTipo = Data.Rows(0)("CveOrdenServicioTipo").ToString.ToEntero
+
+ Me.Telefono = Data.Rows(0)("TelefonoContacto").ToString
+ Me.CveModeloAuto = Data.Rows(0)("CveModeloAuto").ToString.ToEntero
+ Me.Año = Data.Rows(0)("Año").ToString
End If
Retorno = True
Catch ex As Exception
@@ -569,7 +577,7 @@ Public Class ClsOS
End Function
Public Function AddOrdenesServicios(CveCliente As Integer, CveSubProyecto As Integer, PersonaSolicito As String, FechaRecepcion As Date, Descripcion As String, CveUsuarioRecibio As Integer, CveEstatusOrdenServicio As Integer,
CveUsuario As Integer, CveEmpresa As Integer, CveCotizacion As Integer, CveVenta As Integer, CveOSPadre As Integer, CveOSTipo As Integer, Optional CveClienteSucursal As Integer = -1,
- Optional Direccion As String = "-1") As Boolean
+ Optional Direccion As String = "-1", Optional Telefono As String = "", Optional CveModeloAuto As Integer = -1, Optional Año As String = "-1") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OS_OrdenesServiciosAdd")
@@ -591,6 +599,10 @@ Public Class ClsOS
.Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal
.Add("@Direccion", SqlDbType.VarChar).Value = Direccion
+ .Add("@Telefono", SqlDbType.VarChar).Value = Telefono
+ .Add("@CveModeloAuto", SqlDbType.Int).Value = CveModeloAuto
+ .Add("@Año", SqlDbType.VarChar).Value = Año
+
.Add("@CveOS", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@vFolio", SqlDbType.Int).Direction = ParameterDirection.Output
End With
@@ -633,7 +645,8 @@ Public Class ClsOS
Return Retorno
End Function
Public Function UpdateOrdenesServicios(PersonaSolicito As String, FechaRecepcion As String, Descripcion As String, CveUsuarioRecibio As Integer, CveEstatusOrdenServicio As Integer, CveOS As Integer, CveUsuarioModifico As Integer,
- CveOSTipo As Integer, Optional CveClienteSucursal As Integer = -1, Optional Direccion As String = "-1") As Boolean
+ CveOSTipo As Integer, Optional CveClienteSucursal As Integer = -1, Optional Direccion As String = "-1",
+ Optional Telefono As String = "", Optional CveModeloAuto As Integer = -1, Optional Año As String = "-1") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OS_OrdenesServiciosUpdate")
@@ -649,6 +662,11 @@ Public Class ClsOS
.Add("@CveOS", SqlDbType.Int).Value = CveOS
.Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal
.Add("@Direccion", SqlDbType.VarChar).Value = Direccion
+
+ .Add("@Telefono", SqlDbType.VarChar).Value = Telefono
+ .Add("@CveModeloAuto", SqlDbType.Int).Value = CveModeloAuto
+ .Add("@Año", SqlDbType.VarChar).Value = Año
+
End With
Try
diff --git a/Bancos/ConciliacionesBancarias.aspx.vb b/Bancos/ConciliacionesBancarias.aspx.vb
index 1bb67144a..05a6e20ff 100644
--- a/Bancos/ConciliacionesBancarias.aspx.vb
+++ b/Bancos/ConciliacionesBancarias.aspx.vb
@@ -551,8 +551,9 @@ Partial Class Bancos_ConciliacionesBancariasaspx
End Sub
Protected Sub GeneraPDF(Formato As String)
Dim params As List(Of ReportParameter) = New List(Of ReportParameter)()
+
Dim Imagen As System.IO.FileInfo = New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
- Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
+
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString()))
@@ -662,7 +663,7 @@ Partial Class Bancos_ConciliacionesBancariasaspx
params.Add(New ReportParameter("Filtros", Filtros))
If Imagen.Exists Then
- params.Add(New ReportParameter("LogoPath", logouri))
+ params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If
diff --git a/Empresas/172/Formatos/OC.rdlc b/Empresas/172/Formatos/OC.rdlc
index e9580c58c..2920340b9 100644
--- a/Empresas/172/Formatos/OC.rdlc
+++ b/Empresas/172/Formatos/OC.rdlc
@@ -682,6 +682,7 @@
DsOC
+ 0cm
0.04788in
0.36752in
8.15357in
@@ -1702,7 +1703,7 @@
- Citrus Game, S.A. de C.V.
+ CITRUS GAME S.A.P.I. DE C.V.