diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index bf94a8a1c..e2691714f 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -5487,6 +5487,8 @@ Public Class ClsPaginas
Vta.Procedimiento = dtVentas(0)("Procedimiento").ToString
Vta.Alfa1 = dtVentas(0)("Alfa1").ToString
Vta.FechaEjecucion = dtVentas(0)("FechaEjecucion").ToString.ToDateTime
+ Vta.Paciente = dtVentas(0)("Paciente").ToString
+ Vta.Episodio = dtVentas(0)("Episodio").ToString
Vta.RefDocto = dtVentas(0)("Ref").ToString
Vta.CveVenta = dtVentas(0)("CveVenta").ToString.ToEntero
@@ -7016,6 +7018,9 @@ Public Class ClsPaginas
params.Add(New ReportParameter("Medico", Vta.Medico))
params.Add(New ReportParameter("Procedimiento", Vta.Procedimiento))
params.Add(New ReportParameter("FechaCirugia", Vta.FechaEjecucion.ToString("dd/MM/yyyy HH:mm")))
+ params.Add(New ReportParameter("Paciente", Vta.Paciente))
+ params.Add(New ReportParameter("Episodio", Vta.Episodio))
+
End If
'VSH
If UsuarioActual.CveEmpresa.Contiene(4, 7, 11, 12, 122, 145) Then
@@ -7071,6 +7076,8 @@ Public Class ClsPaginas
params.Add(New ReportParameter("Medico", Vta.Medico))
params.Add(New ReportParameter("Procedimiento", Vta.Procedimiento))
params.Add(New ReportParameter("FechaCirugia", Vta.FechaEjecucion.ToString("dd/MM/yyyy HH:mm")))
+ params.Add(New ReportParameter("Paciente", Vta.Paciente))
+ params.Add(New ReportParameter("Episodio", Vta.Episodio))
End If
RutaFormato = String.Format("{0}Formatos\{1}.rdlc", UsuarioActual.Empresa.Ruta, NombreArchivo)
@@ -7179,6 +7186,8 @@ Public Class ClsPaginas
params.Add(New ReportParameter("Medico", Vta.Medico))
params.Add(New ReportParameter("Procedimiento", Vta.Procedimiento))
params.Add(New ReportParameter("FechaCirugia", Vta.FechaEjecucion.ToString("dd/MM/yyyy HH:mm")))
+ params.Add(New ReportParameter("Paciente", Vta.Paciente))
+ params.Add(New ReportParameter("Episodio", Vta.Episodio))
End If
RutaFormato = String.Format("{0}Formatos\{1}.rdlc", UsuarioActual.Empresa.Ruta, NombreArchivo)
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 1a8c895aa..f321aa17e 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -14285,7 +14285,7 @@ Partial Class Compras_Compras
If DrTipoGasto IsNot Nothing Then
CveTipoGasto = DrTipoGasto("CveTipoGasto").ToString.ToEntero
TipoGasto = DrTipoGasto("TipoGasto").ToString
- End If
+ End IfclsVa
End If
AddPS(Cantidad, CveUM, UM, CveClasificacion, Clasificacion, CvePS, PS, CveTipoPS, CveSubProyectoContrato, SubProyecto, Proyecto, CveProyecto, Obs, PU, Total, IVA, RetIVA, RetISR, IEPSPS, IEPSPSIVA, Descuento, CveOrdenCompraDetalle, False,
diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index a152c3fcc..e4ad33fc3 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -3390,14 +3390,12 @@ Partial Class PopUpVerFactura
If CveCliente = 819998 Then
RutaFormato = "{0}Formatos\TrasladoAngeles.rdlc"
-
- If Consola <> "-1" And Consola.Trim.Length > 0 Then
- RutaFormato = "{0}Formatos\Consola.rdlc"
- params.Add(New ReportParameter("Consola", Consola))
- End If
-
End If
+ If Consola <> "-1" And Consola.Trim.Length > 0 Then
+ RutaFormato = "{0}Formatos\Consola.rdlc"
+ params.Add(New ReportParameter("Consola", Consola))
+ End If
@@ -3426,6 +3424,8 @@ Partial Class PopUpVerFactura
+
+
End If
ObjVentas.Dispose()
diff --git a/Empresas/186/Formatos/Factura.mrt b/Empresas/186/Formatos/Factura.mrt
index e0b6b1496..b65cacf34 100644
--- a/Empresas/186/Formatos/Factura.mrt
+++ b/Empresas/186/Formatos/Factura.mrt
@@ -85,7 +85,7 @@
-
+
ReportParameters,ClienteCodigo,ClienteCodigo,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0035_4a879e0a10d464ba2f01e0372efb9ca
ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db
ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1
@@ -177,6 +177,8 @@
ReportParameters,Procedimiento,Procedimiento,,System.String,,False,False,False,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0033_83e3da2e960473d89a38fac783c32ff
ReportParameters,Documentacion,Documentacion,,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0033_12f72ea65ee44119514073452da3478
ReportParameters,FechaCirugia,FechaCirugia,,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0039_11bc963c59b4b6cb4b0ce36a86c40e1
+ ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
EngineV2
@@ -394,7 +396,7 @@ Tipo de Cambio: {TipoCambio}
Transparent
True
- 4.8,0,8.88,1.55
+ 4.8,0,8.88,2.35
Myriad Pro,8,Regular,Point,False,0
@@ -405,9 +407,9 @@ Tipo de Cambio: {TipoCambio}
SMS SMART MEDICAL SOLUTIONS
SSM1908213A0
NEBRASKA 157, Col. NAPOLES
-BENITO JUAREZ
-C.P. 03810
-CIUDAD DE MEXICO
+BENITO JUAREZ, C.P. 03810
+CIUDAD DE MEXICO
+Teléfono: +52 551 563 3271 Correo:support@smsmedicalsolutions.com
[0:0:0]
,,,,WordWrap=True,A=0
Expression
@@ -429,14 +431,9 @@ CIUDAD DE MEXICO
Cliente: {ClienteCodigo} - {ClienteNombre}.<br>
Sucursal: {ClienteSucursal}. RFC: {ClienteRFC}.<br>
Calle:{ClienteCalle} {ClienteNoExt}. Colonia: {ClienteColonia}. Ciudad: {ClienteCiudad}.<br>
-Estado: {ClienteEstado}.<br> Municipio y/o Delegación: {ClienteMunicipio}. CP: {ClienteCP}.<br>
-Regimen Fiscal Receptor: {ClienteRegimenFiscal}.<br>
-<b>
-{IIF(Medico != "", "Médico:" + Medico + ".<br>" , "")}
-{IIF(Medico != "", "Procedimiento:" + Procedimiento + ".<br>", "")}
-{IIF(Medico != "", "Fecha Cirugia:" + FechaCirugia + ".<br>", "")}
-{IIF(Documentacion != "", "Proveedor:" + Documentacion + ".", "")}
-<b/>
+Estado: {ClienteEstado}.<br> Municipio y/o Delegación: {ClienteMunicipio}. CP: {ClienteCP}.<br>Regimen Fiscal Receptor: {ClienteRegimenFiscal}.<br>
+{IIF(Documentacion != "", "Proveedor:" + Documentacion + ".", "")}<br>
+{IIF(Medico != "", "Médico:" + Medico + "." , "")}<br>{IIF(Medico != "", "Procedimiento:" + Procedimiento + ".", "")}
Black
,,,,WordWrap=True,A=0
Wysiwyg
@@ -452,7 +449,7 @@ Regimen Fiscal Receptor: {ClienteRegimenFiscal}.<br>
Transparent
True
- 0,20.88,21.1,12
+ 0,26.36,21.1,12
Transparent
@@ -1108,8 +1105,8 @@ Sello digital del SAT:
Transparent
- 0,9.12,21.1,5.8
-
+ 0,9.12,21.1,7
+
Bottom;Transparent;5;Solid;False;4;Black;True
Transparent
@@ -1365,30 +1362,12 @@ Sello digital del SAT:
Black
Expression
-
- Transparent
- True
- 0,2.28,21.05,0.88
-
-
- Myriad Pro,6.5,Bold,Point,False,0
- Center
- 2,2,2,2
- Textbox26
-
-
- OnlyLastPage
- "REVISAR SU FACTURA Y SUS PRODUCTOS AL MOMENTO DE RECIBIRLAS,YA QUE NO SE REALIZARAN CAMBIOS EN FACTURA NI SE ACEPTARAN DEVOLUCIONES DE MERCANCIA
-DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
- Black
- Expression
-
-
+
Top, Bottom;[156:195:229];5;Solid;False;4;[227:108:9]
Transparent
- 0.2,3.48,20.6,2.2
+ 0.2,4.68,20.6,2.2
-
+
Transparent
0.2,0.8,7,0.4
@@ -1397,12 +1376,12 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text11
-
+
Tipo Operacion:{CETipoOperacion}
Black
Expression
-
+
Transparent
0.2,1.2,7,0.4
@@ -1411,12 +1390,12 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text12
-
+
Incoterm:{CEIncoterm}
Black
Expression
-
+
Transparent
7.2,0.8,6.6,0.4
@@ -1425,12 +1404,12 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text14
-
+
Clave Pedimento:{CEClavePedimento}
Black
Expression
-
+
Transparent
7.2,1.2,6.6,0.4
@@ -1439,12 +1418,12 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text15
-
+
Num Reg IdTrib:{CEId}
Black
Expression
-
+
Transparent
5.2,0.2,10,0.4
@@ -1454,12 +1433,12 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text16
-
+
COMERCIO EXTERIOR
Black
Expression
-
+
Transparent
13.8,0.8,6.6,0.4
@@ -1468,7 +1447,7 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
0,0,0,0
Text17
-
+
Tipo Cambio:{Format("${0:N4} MXN", CETipoCambio)}
Black
Expression
@@ -1483,7 +1462,7 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
-
+
[156:195:229]
True
15.8,1.28,5.29,0.14
@@ -1497,6 +1476,40 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
OnlyLastPage
Black
+
+ Transparent
+ 0,2.68,14.6,0.8
+
+
+ Myriad Pro,9,Regular,Point,False,0
+ 179a957f89d04921b856805a4c2e9d49
+ 0,0,0,0
+ Text9
+
+
+ Paciente: {Paciente}
+Episodio: {Episodio}
+ Black
+ Expression
+
+
+ Transparent
+ True
+ 0,3.68,20.85,0.88
+
+
+ Myriad Pro,6.5,Bold,Point,False,0
+ Center
+ 2,2,2,2
+ Textbox26
+
+
+ OnlyLastPage
+ "REVISAR SU FACTURA Y SUS PRODUCTOS AL MOMENTO DE RECIBIRLAS,YA QUE NO SE REALIZARAN CAMBIOS EN FACTURA NI SE ACEPTARAN DEVOLUCIONES DE MERCANCIA
+DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
+ Black
+ Expression
+
@@ -1529,8 +1542,8 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN"
Factura
1/18/2024 9:39:09 AM
7/11/2022 2:49:19 PM
- C:\inetpub\wwwSIGGIT\Empresas\186\Formatos\Factura.mrt
- 728378886519409195a7506a0b6d6331
+ Factura.mrt
+ 4a902ea660c34d0baeae36e92ea35edd
Factura
Centimeters
2022.4.5.0
diff --git a/Empresas/186/Formatos/Pedido.mrt b/Empresas/186/Formatos/Pedido.mrt
index aa5dd3c6a..f009bae59 100644
--- a/Empresas/186/Formatos/Pedido.mrt
+++ b/Empresas/186/Formatos/Pedido.mrt
@@ -54,7 +54,7 @@
-
+
ReportParameters,ClienteCodigo,ClienteCodigo,ReportParameter1,System.String,_x0030_2,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0035_4a879e0a10d464ba2f01e0372efb9ca
ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db
ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1
@@ -133,10 +133,12 @@
ReportParameters,TipoRelacionTexto,TipoRelacionTexto,ReportParameter1,System.String,,False,False,True,False,,_x0034_17b8382f8e448a5b21018e50590835b
ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd
ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7
- ReportParameters,Documentacion,Documentacion,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C__x002F_StiSerializer_x003E_
- ReportParameters,Medico,Medico,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_
- ReportParameters,Procedimiento,Procedimiento,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_
- ReportParameters,FechaCirugia,FechaCirugia,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Documentacion,Documentacion,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Medico,Medico,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Procedimiento,Procedimiento,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,FechaCirugia,FechaCirugia,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
EngineV2
@@ -392,7 +394,7 @@ Vendedor: {VendedorNombre}
Text8
- PEDIDO
+ PRE-REMISION
Black
Expression
@@ -518,7 +520,7 @@ Fecha Cirugia: {FechaCirugia}
Transparent
0,0.4,21,0.5
-
+
[156:195:229]
True
@@ -549,25 +551,10 @@ Fecha Cirugia: {FechaCirugia}
UNIDAD
[255:255:255]
-
+
[156:195:229]
True
- 3.09,0.03,1.97,0.5
-
-
- Microsoft Sans Serif,9,Bold,Point,False,0
- Center
- 2,2,2,2
- Textbox29
-
-
- CLAVE SAT
- [255:255:255]
-
-
- [156:195:229]
- True
- 5.06,0.03,9.08,0.5
+ 3.06,0.03,11.08,0.5
Microsoft Sans Serif,9.5,Bold,Point,False,0
@@ -579,7 +566,7 @@ Fecha Cirugia: {FechaCirugia}
DESCRIPCIÓN
[255:255:255]
-
+
[156:195:229]
True
15.6,0.03,1.5,0.5
@@ -594,7 +581,7 @@ Fecha Cirugia: {FechaCirugia}
DESC.
[255:255:255]
-
+
[156:195:229]
True
17.1,0.03,1.57,0.5
@@ -609,7 +596,7 @@ Fecha Cirugia: {FechaCirugia}
IVA
[255:255:255]
-
+
[156:195:229]
True
18.62,0.03,2.51,0.5
@@ -624,7 +611,7 @@ Fecha Cirugia: {FechaCirugia}
TOTAL
[255:255:255]
-
+
[156:195:229]
True
14,0.03,1.7,0.5
@@ -647,13 +634,13 @@ Fecha Cirugia: {FechaCirugia}
-
+
Transparent
True
0,1.7,21,0.42
-
-
+
+
Transparent
True
0,0,1.4,0.37
@@ -665,14 +652,14 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Cantidad1
-
+
{DtDetalle.Cantidad}
Black
-
+
n2
-
+
Transparent
True
1.4,0,1.69,0.37
@@ -683,30 +670,15 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
UM
-
- {DtDetalle.UMCalculada}
+
+ {DtDetalle.UM}
Black
DataColumn
-
+
Transparent
True
- 3.09,0,1.97,0.37
-
-
- Myriad Pro,7.5,Regular,Point,False,0
- True
- 2,2,2,2
- SATClaveProdServ
-
-
- {DtDetalle.SATClaveProdServ}
- Black
-
-
- Transparent
- True
- 5.06,0,8.88,0.37
+ 3.06,0,10.88,0.37
Myriad Pro,7.5,Regular,Point,False,0
@@ -714,12 +686,12 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
PS
-
+
{DtDetalle.PSCalculado}
Black
DataColumn
-
+
Transparent
True
13.94,0,1.86,0.37
@@ -731,14 +703,14 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
PU
-
+
{DtDetalle.PU}
Black
-
+
#,0.00;-#,0.00;'-'
-
+
Transparent
True
15.8,0,1.3,0.37
@@ -750,14 +722,14 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Descuento2
-
+
{DtDetalle.Descuento}
Black
-
+
#,0.00;-#,0.00;'-'
-
+
Transparent
True
17.1,0,1.57,0.37
@@ -769,14 +741,14 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
ImporteIVA
-
+
{DtDetalle.ImporteIVA}
Black
-
+
#,0.00;-#,0.00;'-'
-
+
Transparent
True
18.87,0,2.22,0.42
@@ -788,10 +760,10 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
TiempoEntrega
-
+
{DtDetalle.Total}
Black
-
+
#,0.00
DataColumn
@@ -806,24 +778,24 @@ Fecha Cirugia: {FechaCirugia}
-
+
Transparent
- 0,2.92,21,2.2
-
-
+ 0,2.92,21,3.4
+
+
Bottom;Transparent;5;Solid;False;4;Black;True
Transparent
True
True
15.8,0.38,5.2,0.65
-
+
None;[247:150:70];1;Solid;False;8;[247:150:70]
Transparent
0,0.4,5.2,0.4
-
+
Transparent
True
0,0,1.48,0.37
@@ -834,13 +806,13 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Text2
-
+
{DtTotales.ImpuestoLocal}
Black
DataColumn
Bottom
-
+
Transparent
True
1.4,0,3.88,0.37
@@ -851,10 +823,10 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Text22
-
+
{DtTotales.Importe}
Black
-
+
2
,
1
@@ -863,7 +835,7 @@ Fecha Cirugia: {FechaCirugia}
DataColumn
Bottom
-
+
[156:195:229]
True
0.2,0.3,5.09,0.14
@@ -873,7 +845,7 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Text3
-
+
OnlyLastPage
Black
@@ -885,7 +857,7 @@ Fecha Cirugia: {FechaCirugia}
DataBand1
-
+
@@ -894,9 +866,9 @@ Fecha Cirugia: {FechaCirugia}
True
Panel3
-
+
-
+
[156:195:229]
True
0,0.08,21.09,0.14
@@ -906,11 +878,11 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Text21
-
+
OnlyLastPage
Black
-
+
Transparent
True
True
@@ -923,22 +895,22 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Text6
-
+
OnlyLastPage
{ImporteLetra}
Black
Expression
-
+
Transparent
True
0,0.28,5.2,1
-
+
Transparent
0,0.4,5.2,0.6
-
+
[156:195:229]
True
0,0,2,0.5
@@ -949,11 +921,11 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Textbox25
-
+
IMPUESTO
[255:255:255]
-
+
[156:195:229]
True
2,0,1.47,0.5
@@ -964,11 +936,11 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Textbox19
-
+
TASA
[255:255:255]
-
+
[156:195:229]
True
3.47,0,1.63,0.5
@@ -979,7 +951,7 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Textbox33
-
+
IMPORTE
[255:255:255]
@@ -988,14 +960,14 @@ Fecha Cirugia: {FechaCirugia}
HeaderBand2
-
+
-
+
Transparent
0,1.8,5.2,0
-
+
Transparent
True
0,0,2,0.37
@@ -1007,11 +979,11 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Cantidad2
-
+
{DtImpuestos.Impuesto}
Black
-
+
Transparent
True
2,0,1.48,0.37
@@ -1023,11 +995,11 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
UM2
-
+
{DtImpuestos.tasa}
Black
-
+
Transparent
True
3.48,0,1.62,0.37
@@ -1039,10 +1011,10 @@ Fecha Cirugia: {FechaCirugia}
2,2,2,2
Codigo2
-
+
{DtImpuestos.Importe}
Black
-
+
#,0.00
@@ -1053,7 +1025,7 @@ Fecha Cirugia: {FechaCirugia}
DataBand8
-
+
OnlyLastPage
@@ -1062,10 +1034,10 @@ Fecha Cirugia: {FechaCirugia}
Panel2
-
+
OnlyLastPage
-
+
Transparent
5.2,0.28,10.6,1
@@ -1074,11 +1046,27 @@ Fecha Cirugia: {FechaCirugia}
0,0,0,0
Text4
-
+
{Observaciones}
Black
Expression
+
+ Transparent
+ 0,2.48,13.2,0.8
+
+
+ Myriad Pro,9,Regular,Point,False,0
+ 1891a87e013d48868bd75b5710529e30
+ 0,0,0,0
+ Text13
+
+
+ Paciente: {Paciente}
+Episodio: {Episodio}
+ Black
+ Expression
+
@@ -1127,7 +1115,7 @@ Fecha Cirugia: {FechaCirugia}
10/11/2022 8:18:55 PM
7/11/2022 2:49:19 PM
Pedido.mrt
- cb0c4a26c29e4eaea6e5fdce45abd03e
+ 0cc1edf03db74e0d9e9a189fff847c85
Report
Centimeters
2022.4.5.0
diff --git a/Empresas/186/Formatos/Remision.mrt b/Empresas/186/Formatos/Remision.mrt
index e29b95e86..71ce5fc92 100644
--- a/Empresas/186/Formatos/Remision.mrt
+++ b/Empresas/186/Formatos/Remision.mrt
@@ -54,7 +54,7 @@
-
+
ReportParameters,ClienteCodigo,ClienteCodigo,ReportParameter1,System.String,_x0030_2,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0035_4a879e0a10d464ba2f01e0372efb9ca
ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db
ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1
@@ -134,6 +134,8 @@
ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd
ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7
ReportParameters,Documentacion,Documentacion,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
+ ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_
EngineV2
@@ -802,8 +804,8 @@ Vendedor: {VendedorNombre}
Transparent
- 0,2.92,21,2.2
-
+ 0,2.92,21,4.6
+
Bottom;Transparent;5;Solid;False;4;Black;True
Transparent
@@ -1073,6 +1075,22 @@ Vendedor: {VendedorNombre}
Black
Expression
+
+ Transparent
+ 0,2.48,10.6,1
+
+
+ Myriad Pro,9,Regular,Point,False,0
+ fca703f575e74a9f8bc6628424c9a960
+ 0,0,0,0
+ Text13
+
+
+ Paciente: {Paciente}
+Episodio: {Episodio}
+ Black
+ Expression
+
@@ -1120,8 +1138,8 @@ Vendedor: {VendedorNombre}
Report
10/11/2022 8:18:55 PM
7/11/2022 2:49:19 PM
- C:\inetpub\WWWSigGit\Empresas\186\Formatos\Remision.mrt
- a4badd41106c4719ac060f1e52338936
+ Remision.mrt
+ 49b2dec77fe542ea952b501bf54fafb1
Report
Centimeters
2022.4.5.0
diff --git a/Inventarios/EntregaAlmacen.aspx b/Inventarios/EntregaAlmacen.aspx
index 323447b51..787910cdd 100644
--- a/Inventarios/EntregaAlmacen.aspx
+++ b/Inventarios/EntregaAlmacen.aspx
@@ -134,6 +134,9 @@
|
|
+
+
+ |
| Folio: |
@@ -141,18 +144,23 @@
<%----%>
+
+
+ |
| Observaciones Grales: |
|
+ |
| Observaciones Almacén: |
|
+ |
| Dirección Envío: |
@@ -160,12 +168,16 @@
+ |
+
+
+
diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb
index e16742721..7e9b55a25 100644
--- a/Inventarios/EntregaAlmacen.aspx.vb
+++ b/Inventarios/EntregaAlmacen.aspx.vb
@@ -350,6 +350,21 @@ Partial Class Inventarios_EntregaAlmacen
+ Private Property Adjunto As String
+ Get
+ If ViewState("Adjunto") Is Nothing Then
+ ViewState("Adjunto") = ""
+ End If
+ Return ViewState("Adjunto").ToString()
+ End Get
+
+ Set(value As String)
+ ViewState("Adjunto") = value
+ End Set
+ End Property
+
+
+
#End Region
Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
@@ -617,7 +632,11 @@ Partial Class Inventarios_EntregaAlmacen
CveVentaAD = -2
CargaVentaPorSurtir(DdlFolio.SelectedValue.ToEntero())
End Sub
- Private Sub CargaVentaPorSurtir(CveVenta As Integer, Optional CveAlmacen As Integer = -1, Optional CveOS As Integer = -1)
+ Private Sub CargaVentaPorSurtir(CveVenta As Integer, Optional CveAlmacen As Integer = -1, Optional CveOS As Integer = -1)
+
+ Adjunto = ""
+ BtnArchivoAdjunto.Visible = False
+
LbSurtida.Visible = False
CveContrato = -1
CveSubProyecto = -1
@@ -701,8 +720,26 @@ Partial Class Inventarios_EntregaAlmacen
'ClienteEntregaPersonal(CveCliente)
CveSubProyecto = drE("CveSubProyecto").ToString().ToEntero()
EsInterno = CBool(DtDatos.Rows(0)("EsInterno").ToString())
- CveDireccionEnvio = drE("CveDireccionEnvio").ToString.ToEntero
-
+ CveDireccionEnvio = drE("CveDireccionEnvio").ToString.ToEntero
+
+
+ Adjunto = drE("Adjunto").ToString()
+
+ If Adjunto.Trim.Length > 0 Then
+
+ Dim ruta As String = HttpContext.Current.Request.ApplicationPath
+ ruta = String.Format("{0}Ventas", UsuarioActual.Empresa.Ruta)
+ ruta += $"/{Adjunto}"
+
+ If File.Exists(ruta) Then
+ BtnArchivoAdjunto.Visible = True
+ BtnArchivoAdjunto.Text = $"Adjunto: {Adjunto}"
+ End If
+
+
+
+ End If
+
If CveDireccionEnvio > 0 Then
trDireccionEnvio.Visible = True
'carga la dirección de envío
@@ -870,6 +907,8 @@ Partial Class Inventarios_EntregaAlmacen
If CveAlmacen <= 0 Then CargaGvDatos()
+ UpVenta.Update()
+
End Sub
Private Sub CargaTraspasoPorSurtir(CveTraspaso As Integer)
LbSurtida.Visible = False
@@ -4540,5 +4579,36 @@ Partial Class Inventarios_EntregaAlmacen
End Function
+ Protected Sub BtnArchivoAdjunto_Click(sender As Object, e As System.EventArgs) Handles BtnArchivoAdjunto.Click
+ Dim ruta As String = HttpContext.Current.Request.ApplicationPath
+ ruta = String.Format("{0}Ventas", UsuarioActual.Empresa.Ruta)
+ ruta += $"/{Adjunto}"
+
+ Dim Archivo As New System.IO.FileInfo(ruta)
+
+ Try
+ If Archivo IsNot Nothing Then
+ If Archivo.Exists Then
+
+ HttpContext.Current.Response.Clear()
+ HttpContext.Current.Response.ClearContent()
+ HttpContext.Current.Response.ContentType = "application/octet-stream"
+ HttpContext.Current.Response.AppendHeader("Content-disposition", String.Format("attachment; filename={0}", Archivo.Name))
+ HttpContext.Current.Response.AddHeader("Content-Length", Archivo.Length.ToString())
+ HttpContext.Current.Response.TransmitFile(ruta)
+ Response.Flush() ' send it to the client to download
+ HttpContext.Current.Response.SuppressContent = True
+ HttpContext.Current.ApplicationInstance.CompleteRequest()
+ Response.End()
+
+ Else
+ Alert("El archivo no existe", TipoMensaje.MsgAdvertencia)
+ End If
+
+ End If
+ Catch ex As Exception
+ End Try
+ End Sub
+
End Class
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index fcf6cc18e..fd2f49563 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -34706,9 +34706,6 @@ Partial Class Ventas
End If
Catch ex As Exception
End Try
-
-
-
End Sub
Protected Sub BtnEliminarAdjunto_Click(sender As Object, e As System.EventArgs) Handles BtnEliminarAdjunto.Click
@@ -36610,7 +36607,8 @@ Partial Class Ventas
If RBLTipoVenta.SelectedValue.Contiene("2") Then 'si es pago directo es factura
- DdlTipoComprobante.SelectedValueExist("Ing")
+ 'DdlTipoComprobante.SelectedValueExist("Ing")
+ DdlTipoComprobante.SelectedValueExist("Ped")
TrVentasMedicas1.Visible = True
TrVentasMedicas2.Visible = True