--

App_Code/ClsOS.vb

@@ -73,7 +73,7 @@ Public Class ClsOS
     Public Property CveVenta As Integer = -1
     Public Property Paciente As String
     Public Property IdentificadorCliente As String
-
+    Public Property FolioAdicional As String
     Private Class Especificaciones
         Public CveValor As Integer
         Public CvePSCaracteristica As Integer
@@ -595,6 +595,7 @@ Public Class ClsOS
                 Me.Paciente = Data.Rows(0)("Paciente").ToString
                 Me.IdentificadorCliente = Data.Rows(0)("IdentificadorCliente").ToString
                 Me.CveVenta = Data.Rows(0)("CveVenta").ToString.ToEntero
+                Me.FolioAdicional = Data.Rows(0)("FolioAdicional").ToString
 
             End If
             Retorno = True
@@ -1308,7 +1309,7 @@ Public Class ClsOS
 
         Return Retorno
     End Function
-    Public Function UpdateVentaOS(CveVenta As Integer, CveOS As Integer, Optional Paciente As String = "-1", Optional Episodio As String = "-1") As Boolean
+    Public Function UpdateVentaOS(CveVenta As Integer, CveOS As Integer, Optional Paciente As String = "-1", Optional Episodio As String = "-1", Optional FolioAdicional As String = "") As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_OS_UpdateVentaOS")
@@ -1318,6 +1319,7 @@ Public Class ClsOS
             .Add("@CveOS", SqlDbType.Int).Value = CveOS
             .Add("@Paciente", SqlDbType.VarChar).Value = Paciente
             .Add("@Episodio", SqlDbType.VarChar).Value = Episodio
+            .Add("@FolioAdicional", SqlDbType.VarChar).Value = FolioAdicional
         End With
 
         Try

App_Code/ClsPaginas.vb

@@ -7078,6 +7078,7 @@ Public Class ClsPaginas
                         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))
+                        params.Add(New ReportParameter("Alfa1", Vta.Alfa1))
                     End If
 
                     RutaFormato = String.Format("{0}Formatos\{1}.rdlc", UsuarioActual.Empresa.Ruta, NombreArchivo)

App_Code/Modelos.vb

@@ -1024,9 +1024,11 @@ Namespace Modelos
                                                     Dim ObjTimbrado As New Timbrado
                                                     'DOCUMENTO ACTUAL
                                                     If DebeTimbrar Then
+                                                        Dim CvePAC As Integer = -1
                                                         If Me.EmitirCartaPorte AndAlso CveTimbreCartaPorte > 0 Then
                                                             Dim RespCartaPorte As Timbres.MMensajeCartaPorte = Timbres.PreParaCartaPorteFactura(CveTimbreCartaPorte, UsuarioActual)
                                                             If Not RespCartaPorte.TieneError Then
+                                                                CvePAC = 4 'código temporal. para que se timbre PAC 4
                                                                 Me.Timbre.Complementos.CartaPorte = RespCartaPorte.CartaPorte
                                                             Else
                                                                 DebeTimbrar = False
@@ -1034,7 +1036,7 @@ Namespace Modelos
                                                             End If
                                                         End If
 
-                                                        SeTimbro = ObjTimbrado.TimbrarFactura(UsuarioActual, Me)
+                                                        SeTimbro = ObjTimbrado.TimbrarFactura(UsuarioActual, Me, CvePACEspecial:=CvePAC)
 
                                                         'NOTA DE CREDITO - REFACTURADA - CASO ESPECIAL, TIMBRADO E IMPRESION
                                                         If Not IsNothing(Obj2) AndAlso Obj2.Count > 0 Then
@@ -5231,6 +5233,7 @@ Namespace Modelos
                 Dim ObjVentas As New ClsVentas()
                 Dim ObjTransportes As New ClsTransportes(ObjVentas.IniciaTransacSQL())
                 Dim ObjConta As New ClsContabilidad(ObjVentas.IniciaTransacSQL())
+                Dim ObjEventos As New ClsOIEventos(ObjVentas.IniciaTransacSQL())
 
                 Try
                     Dim Row As DataRow = Me.DtDetalle.Select($"CveViajePasajero={CveViajePasajero}").FirstOrDefault()
@@ -5256,6 +5259,9 @@ Namespace Modelos
                                 TieneError = True
                             End If
                         End If
+                        If Not ObjEventos.AddEventoBitacora("se canceló el boleto:" & Row("Obs").ToString(), "-1", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveVenta:=CveVenta) Then
+                            ErrorList.Add("Ocurrió un error al agregar la bitacora de cancelación de boleto.")
+                        End If
 
                         If Not TieneError Then
                             TieneError = Not RegenerarPrePolizas(ObjVentas.IniciaTransacSQL())

Empresas/186/Formatos/Factura.mrt

@@ -161,8 +161,8 @@
       <value>ReportParameters,TipoRelacionTexto,TipoRelacionTexto,ReportParameter1,System.String,,False,False,True,False,,_x0034_17b8382f8e448a5b21018e50590835b</value>
       <value>ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd</value>
       <value>ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7</value>
-      <value>ReportParameters,ClienteRegimenFiscal,ClienteRegimenFiscal,,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_,_x0039_1ba9c0c606c4c9c91b0a3c474923a17</value>
+      <value>ReportParameters,ClienteRegimenFiscal,ClienteRegimenFiscal,,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_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_,_x0039_1ba9c0c606c4c9c91b0a3c474923a17</value>
-      <value>ReportParameters,RegimenFiscalEmpresa,RegimenFiscalEmpresa,,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_,_x0031_83669d21a064447aec68b70e6e9f841</value>
+      <value>ReportParameters,RegimenFiscalEmpresa,RegimenFiscalEmpresa,,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_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_,_x0031_83669d21a064447aec68b70e6e9f841</value>
       <value>ReportParameters,CETipoOperacion,CETipoOperacion,,System.String,,False,False,False,False,,_x0031_5eed660ac744a4ea8ff2def382d4e8f</value>
       <value>ReportParameters,CEClavePedimento,CEClavePedimento,,System.String,,False,False,False,False,,_x0033_74ae691709a46e99b587fd5194810b6</value>
       <value>ReportParameters,CEId,CEId,,System.String,,False,False,False,False,,_x0034_9895fd395f04bf5b132398e38d61ec4</value>
@@ -171,14 +171,14 @@
       <value>ReportParameters,CETipoCambio,CETipoCambio,,System.Decimal,,False,False,False,False,,eb01224dc6154496ae383a9d1d5eeefb</value>
       <value>ReportParameters</value>
       <value>ReportParameters,TieneDocumentosRelacionados,TieneDocumentosRelacionados,,System.String,,False,False,False,False,,b459ea8cfee54f1086e6dcf35b40c796</value>
-      <value>ReportParameters,ClienteSucursal,ClienteSucursal,,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_,b352e6ce96df41019eb768e9fb17225d</value>
+      <value>ReportParameters,ClienteSucursal,ClienteSucursal,,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_,b352e6ce96df41019eb768e9fb17225d</value>
       <value>ReportParameters,UsaProductoAlterno,UsaProductoAlterno,,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_,f550a471365c4133bed822c3c4aa6e17</value>
-      <value>ReportParameters,Medico,Medico,,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_,_x0038_4917cceaa5a42a7882c182510f8d56f</value>
+      <value>ReportParameters,Medico,Medico,,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_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_,_x0038_4917cceaa5a42a7882c182510f8d56f</value>
-      <value>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</value>
+      <value>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_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_,_x0033_83e3da2e960473d89a38fac783c32ff</value>
       <value>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</value>
-      <value>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</value>
+      <value>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_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_,_x0039_11bc963c59b4b6cb4b0ce36a86c40e1</value>
-      <value>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_</value>
+      <value>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_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_</value>
-      <value>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_</value>
+      <value>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_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_</value>
     </Variables>
   </Dictionary>
   <EngineVersion>EngineV2</EngineVersion>
@@ -1481,7 +1481,7 @@ Sello digital  del SAT:
               <ClientRectangle>0,2.68,14.6,0.8</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Expressions isList="true" count="0" />
-              <Font>Myriad Pro,8,Regular,Point,False,0</Font>
+              <Font>Myriad Pro,6.5,Regular,Point,False,0</Font>
               <Guid>179a957f89d04921b856805a4c2e9d49</Guid>
               <Margins>0,0,0,0</Margins>
               <Name>Text9</Name>

Empresas/186/Formatos/Pedido.mrt

@@ -133,12 +133,12 @@
       <value>ReportParameters,TipoRelacionTexto,TipoRelacionTexto,ReportParameter1,System.String,,False,False,True,False,,_x0034_17b8382f8e448a5b21018e50590835b</value>
       <value>ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd</value>
       <value>ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7</value>
-      <value>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_</value>
+      <value>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_</value>
-      <value>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_</value>
+      <value>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_</value>
-      <value>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_</value>
+      <value>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_</value>
-      <value>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_</value>
+      <value>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_</value>
-      <value>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_</value>
+      <value>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_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_</value>
-      <value>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_</value>
+      <value>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_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_</value>
     </Variables>
   </Dictionary>
   <EngineVersion>EngineV2</EngineVersion>
@@ -1056,7 +1056,7 @@ Fecha Cirugia:  {FechaCirugia}</Text>
                       <ClientRectangle>0,2.48,13.2,0.8</ClientRectangle>
                       <Conditions isList="true" count="0" />
                       <Expressions isList="true" count="0" />
-                      <Font>Myriad Pro,8,Regular,Point,False,0</Font>
+                      <Font>Myriad Pro,6.5,Regular,Point,False,0</Font>
                       <Guid>1891a87e013d48868bd75b5710529e30</Guid>
                       <Margins>0,0,0,0</Margins>
                       <Name>Text13</Name>
@@ -1114,7 +1114,7 @@ Episodio: {Episodio}</Text>
   <ReportAlias>Report</ReportAlias>
   <ReportChanged>10/11/2022 8:18:55 PM</ReportChanged>
   <ReportCreated>7/11/2022 2:49:19 PM</ReportCreated>
-  <ReportFile>Pedido.mrt</ReportFile>
+  <ReportFile>C:\inetpub\WWWSigGit\Empresas\186\Formatos\Pedido.mrt</ReportFile>
   <ReportGuid>0cc1edf03db74e0d9e9a189fff847c85</ReportGuid>
   <ReportName>Report</ReportName>
   <ReportUnit>Centimeters</ReportUnit>

Empresas/186/Formatos/Remision.mrt

@@ -54,7 +54,7 @@
     <Relations isList="true" count="0" />
     <Report isRef="0" />
     <Resources isList="true" count="0" />
-    <Variables isList="true" count="81">
+    <Variables isList="true" count="82">
       <value>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</value>
       <value>ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db</value>
       <value>ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1</value>
@@ -133,9 +133,10 @@
       <value>ReportParameters,TipoRelacionTexto,TipoRelacionTexto,ReportParameter1,System.String,,False,False,True,False,,_x0034_17b8382f8e448a5b21018e50590835b</value>
       <value>ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd</value>
       <value>ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7</value>
-      <value>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_</value>
+      <value>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_</value>
-      <value>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_</value>
+      <value>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_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_</value>
-      <value>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_</value>
+      <value>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_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_</value>
+      <value>ReportParameters,Alfa1,Alfa1,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_</value>
     </Variables>
   </Dictionary>
   <EngineVersion>EngineV2</EngineVersion>
@@ -1080,14 +1081,15 @@ Vendedor: {VendedorNombre}</Text>
                       <ClientRectangle>0,2.48,10.6,1</ClientRectangle>
                       <Conditions isList="true" count="0" />
                       <Expressions isList="true" count="0" />
-                      <Font>Myriad Pro,8,Regular,Point,False,0</Font>
+                      <Font>Myriad Pro,6.7,Regular,Point,False,0</Font>
                       <Guid>fca703f575e74a9f8bc6628424c9a960</Guid>
                       <Margins>0,0,0,0</Margins>
                       <Name>Text13</Name>
                       <Page isRef="5" />
                       <Parent isRef="44" />
                       <Text>Paciente: {Paciente}
-Episodio: {Episodio}</Text>
+Episodio: {Episodio}
+Folio Remisión: {Alfa1}</Text>
                       <TextBrush>Black</TextBrush>
                       <Type>Expression</Type>
                     </Text13>

Inventarios/EntradasSalidas.aspx.vb

@@ -406,6 +406,7 @@ Partial Class Inventarios_EntradasSalidas
             EsConsumoInterno = False
             EsNuevoMov = False
             CvePrePoliza = -1
+            CveEntregaAlmacen = -1
 
             CreaDT()
             CargaCombos()

Inventarios/EntregaAlmacenRuta.aspx.cs

@@ -209,7 +209,7 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas
                 {
                     Timbres ObjTimbres = new Timbres("Ent", cvetimbre, UsuarioActual);
                     MensajeAlert.AppendFormat("Folio: <b>{0}</b> &nbsp;", ObjTimbres.ObjFactura.SerieFolio);
-                    if (ObjTimbres.Timbrar())
+                    if (ObjTimbres.Timbrar(4))
                     {
 
                         MensajeAlert.AppendFormat("<a class='texto' style='color:#337ab7' href='/Compras/PopUpVerFactura.aspx?P={0}' target='_blank'>XML &nbsp;<i class='fa fa-file'></i></i></a>&nbsp;&nbsp;", ModExtensiones.Encripta(String.Format("OP=DesXmlTra&CveTimbre={0}&EXT={1}&FOLIO={2}&TIPODOCTO={3}", cvetimbre, "XML", ObjTimbres.ObjFactura.SerieFolio, ObjTimbres.ObjFactura.TipoDocto)));                        
@@ -349,7 +349,7 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas
             {
                 Timbres ObjTimbres = new Timbres("Rec", cvetimbre, UsuarioActual);
 
-                if (ObjTimbres.Timbrar())
+                if (ObjTimbres.Timbrar(4))
                 {
                     
                     MensajeAlert.AppendFormat("Folio: <b>{0}</b> &nbsp;", ObjTimbres.ObjFactura.SerieFolio);

Inventarios/PaquetesArmadoDesarmado.aspx

@@ -220,26 +220,42 @@
                                             DataKeyNames="Cantidad,CvePS,CveUM,Consec,AplicaSeccion,AplicaSerie,AplicaCaducidad,AplicaLote,CodigoPS" runat="server" AutoGenerateColumns="false" 
                                             EmptyDataText="No se encontraron datos con los filtros especificados" CssClass="table table-striped table-hover  Widthall" BorderColor="#D3D3D3"     GridLines="None">
                                             <Columns>
-                                                <asp:BoundField HeaderText="Cant. Necesaria" DataField="Cantidad" ItemStyle-Width="15%" DataFormatString="{0:###,###,###,##0.##}" ItemStyle-HorizontalAlign="Right" />
+                                                <%--0--%>
-                                                <asp:BoundField HeaderText="Cant. Disponible" DataField="CantidadDisponible2" ItemStyle-Width="15%" DataFormatString="{0:###,###,###,##0.##}" ItemStyle-HorizontalAlign="Right" />
+                                                <asp:BoundField HeaderText="Cant. Necesaria" DataField="Cantidad" ItemStyle-Width="30px" DataFormatString="{0:###,###,###,##0.##}" ItemStyle-HorizontalAlign="Right"  />
+                                                <%--1--%>
+                                                <asp:BoundField HeaderText="Cant. Disponible" DataField="CantidadDisponible2" ItemStyle-Width="30px" DataFormatString="{0:###,###,###,##0.##}" ItemStyle-HorizontalAlign="Right" />
+                                                <%--2--%>
                                                 <asp:BoundField HeaderText="Producto/Servicio" DataField="CodigoPS" ItemStyle-Width="40%" />
+                                                <%--3--%>
                                                 <asp:BoundField HeaderText="Unidad Medida" DataField="UnidadMedida" ItemStyle-Width="20%" />
+                                                <%--4--%>
                                                 <asp:TemplateField HeaderText="Serie">
                                                     <ItemTemplate>
                                                         <asp:Button Text="Serie" ID="BtnSerie" OnClick="BtnSerie_Click" CssClass="btn btn-xs btn-primary" runat="server" Style="float: left;" />
                                                         <asp:LinkButton Text="<i class='fa fa-star'></i>" ID="BtnSeriePaquete" OnClick="BtnSeriePaquete_Click" CssClass="btn btn-xs btn-primary" runat="server" Style="float: left;" data-toggle="tooltip" title="Seleccionar como serie del paquete" />
                                                     </ItemTemplate>
                                                 </asp:TemplateField>
+                                                <%--5--%>
                                                 <asp:TemplateField HeaderText="Sección">
                                                     <ItemTemplate>
                                                         <asp:DropDownList ID="DdlSeccionAlmacen" DataTextField="SeccionAlmacen" AppendDataBoundItems="true" DataValueField="CveSeccionAlmacen" CssClass="select2me" runat="server" />
                                                     </ItemTemplate>
                                                 </asp:TemplateField>
+                                                 <%--6--%>
+                                                <asp:TemplateField HeaderText="Lote/Caducidad" ItemStyle-HorizontalAlign="Left" Visible="false" ItemStyle-Width="270px">
+                                                    <ItemTemplate>
+                                                        <asp:DropDownList ID="DdlCaducidadProducto" CssClass="select2me" Width="100%" runat="server" CausesValidation="true" AutoPostBack="true" OnSelectedIndexChanged="DdlCaducidadProducto_SelectedIndexChanged">
+                                                            <asp:ListItem Selected="True" Text="-" Value="|"></asp:ListItem>
+                                                        </asp:DropDownList>
+                                                    </ItemTemplate>
+                                                </asp:TemplateField>
+                                                <%--7--%>
                                                 <asp:TemplateField HeaderText="Lote">
                                                     <ItemTemplate>
                                                         <asp:TextBox ID="TxtLote" CssClass="form-control input-sm" runat="server" Width="80px" Style="text-align: right;"></asp:TextBox>
                                                     </ItemTemplate>
                                                 </asp:TemplateField>
+                                               <%--8--%>
                                                 <asp:TemplateField HeaderText="Fecha Caducidad">
                                                     <ItemTemplate>
 
@@ -273,6 +289,7 @@
 
                                                     </ItemTemplate>
                                                 </asp:TemplateField>
+                                                <%--9--%>
                                                 <asp:TemplateField HeaderText="Dividir " ItemStyle-Width="80px" ItemStyle-HorizontalAlign="Center" Visible="True">                                                  
                                                     <ItemTemplate>                                                      
                                                         <asp:TextBox runat="server" ID="TxtDividir" Width="30px" onkeydown="return evitarPostBack(event);"></asp:TextBox>                                                      

Inventarios/PaquetesArmadoDesarmado.aspx.vb

@@ -363,8 +363,15 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
 
         GvDatosArmado.Columns(4).Visible = DtDatosArmado.MAX("AplicaSerie", "") = "True"
         GvDatosArmado.Columns(5).Visible = DtDatosArmado.MAX("AplicaSeccion") = "True"
-        GvDatosArmado.Columns(6).Visible = DtDatosArmado.MAX("AplicaLote") = "True"
+        GvDatosArmado.Columns(7).Visible = DtDatosArmado.MAX("AplicaLote") = "True"
-        GvDatosArmado.Columns(7).Visible = DtDatosArmado.MAX("AplicaCaducidad") = "True"
+        GvDatosArmado.Columns(8).Visible = DtDatosArmado.MAX("AplicaCaducidad") = "True"
+
+        If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+            GvDatosArmado.Columns(6).Visible = True
+            GvDatosArmado.Columns(7).Visible = False
+            GvDatosArmado.Columns(8).Visible = False
+        End If
+
 
         'If ErrorExistencias Then
         '    GvDatosArmado.Columns(4).Visible = False
@@ -476,6 +483,13 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
         GvDatosArmado.Columns(6).Visible = DtDatosDesArmado.MAX("AplicaLote") = "True"
         GvDatosArmado.Columns(7).Visible = DtDatosDesArmado.MAX("AplicaCaducidad") = "True"
 
+
+        If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+            GvDatosArmado.Columns(6).Visible = True
+            GvDatosArmado.Columns(7).Visible = False
+            GvDatosArmado.Columns(8).Visible = False
+        End If
+
         BtnGuadarDesarmado.Visible = True
 
         TotalDesarmado.Visible = True
@@ -534,21 +548,48 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
 
                     End If
 
-                    If gvr.DataKey("AplicaLote") = "True" Then
+                    If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
-                        If gvr.FCTextBox("TxtLote").Text.Trim = "" Then
+
-                            Alert("Es necesario ingresas todos los lotes de los componentes.", TipoMensaje.MsgAdvertencia)
+                        Dim DdlCaducidadProducto As DropDownList = gvr.FCDropDownList("DdlCaducidadProducto")
-                            Exit Sub
+                        Dim ArrayCaducidad As String() = DdlCaducidadProducto.SelectedValue.Split("|"c)
+                        Dim Lote As String = ArrayCaducidad(0)
+                        Dim FechaCaducidad As String = ArrayCaducidad(1)
+
+                        If gvr.DataKey("AplicaLote") = "True" Then
+                            If Lote = "" Then
+                                Alert("Es necesario ingresas todos los lotes de los componentes.", TipoMensaje.MsgAdvertencia)
+                                Exit Sub
+                            End If
+                        End If
+
+                        If gvr.DataKey("AplicaCaducidad") = "True" Then
+
+                            If FechaCaducidad.ToDate <= MinFecha Then
+                                Alert("Es necesario ingresas todos las fechas de caducidad de los componentes.", TipoMensaje.MsgAdvertencia)
+                                Exit Sub
+                            End If
+
+                        End If
+
+                    Else
+                        If gvr.DataKey("AplicaLote") = "True" Then
+                            If gvr.FCTextBox("TxtLote").Text.Trim = "" Then
+                                Alert("Es necesario ingresas todos los lotes de los componentes.", TipoMensaje.MsgAdvertencia)
+                                Exit Sub
+                            End If
+                        End If
+
+                        If gvr.DataKey("AplicaCaducidad") = "True" Then
+
+                            If gvr.FCTextBox("TxtCaducidad").Text.ToDate <= MinFecha Then
+                                Alert("Es necesario ingresas todos las fechas de caducidad de los componentes.", TipoMensaje.MsgAdvertencia)
+                                Exit Sub
+                            End If
+
                         End If
                     End If
 
-                    If gvr.DataKey("AplicaCaducidad") = "True" Then
 
-                        If gvr.FCTextBox("TxtCaducidad").Text.ToDate <= MinFecha Then
-                            Alert("Es necesario ingresas todos las fechas de caducidad de los componentes.", TipoMensaje.MsgAdvertencia)
-                            Exit Sub
-                        End If
-
-                    End If
 
                 Next
             Case 2 ' DESARMADO
@@ -645,6 +686,15 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
                 FechaCaducidad = If(CBool(GvRow.DataKey("AplicaCaducidad")) AndAlso GvRow.FCTextBox("TxtCaducidad").ToString().ToDate > MinFecha, GvRow.FCTextBox("TxtCaducidad").Text.ToDate, MinFecha)
                 Lote = If(CBool(GvRow.DataKey("AplicaLote")), GvRow.FCTextBox("TxtLote").Text.Trim, "-1")
 
+                If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+
+                    Dim DdlCaducidadProducto As DropDownList = GvRow.FCDropDownList("DdlCaducidadProducto")
+                    Dim ArrayCaducidad As String() = DdlCaducidadProducto.SelectedValue.Split("|"c)
+                    Lote = ArrayCaducidad(0)
+                    FechaCaducidad = ArrayCaducidad(1).ToDate
+
+                End If
+
                 Dim Existencia As Decimal = ObjInventarioVal.GetExistenciasPS(GvRow.DataKey("CvePS").ToEntero, GvRow.DataKey("CveUM").ToEntero, UsuarioActual.CveEmpresa, CveAlmacen:=DdlAlmacenArmado.SelectedValue.ToEntero(), FechaMovto:=TxtFechaArmado.Text.ToDateTime.ToString("yyyy/MM/dd HH:mm"), Serie:="-1", Lote:=Lote, FechaCaducidad:=FechaCaducidad)
 
 
@@ -750,6 +800,16 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
                         If Gvr.DataKey("Cantidad").ToString.ToDouble > 0 Then
                             Dim Lote As String = If(Gvr.FCTextBox("TxtLote").Text = "", "-1", Gvr.FCTextBox("TxtLote").Text)
                             Dim FechaCaducidad As String = If(Gvr.FCTextBox("TxtCaducidad").Text = "", "-1", Gvr.FCTextBox("TxtCaducidad").Text)
+
+                            If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+
+                                Dim DdlCaducidadProducto As DropDownList = Gvr.FCDropDownList("DdlCaducidadProducto")
+                                Dim ArrayCaducidad As String() = DdlCaducidadProducto.SelectedValue.Split("|"c)
+                                Lote = ArrayCaducidad(0)
+                                FechaCaducidad = ArrayCaducidad(1)
+
+                            End If
+
                             Dim CveSeccionAlmacen As Integer = Gvr.FCDropDownList("DdlSeccionAlmacen").SelectedValue.ToEntero()
                             If CBool(Gvr.DataKey("AplicaSerie")) Then
                                 For Each Dr As DataRow In DtDatosDetalle.FiltraParametros(String.Format("ConsecId = {0}", Gvr.DataKey("Consec").ToEntero)).Rows
@@ -1134,10 +1194,64 @@ Partial Class Inventarios_PaquetesArmadoDesarmado
             e.Row.FCButton("BtnDividir").CommandArgument = e.Row.RowIndex.ToString()
             e.Row.FCTextBox("TxtDividir").Attributes.Add("onkeyup", String.Format("LimitaCantidad({0},this,'{1}');", e.Row.DBCampo("Cantidad"), e.Row.FCButton("BtnDividir").ClientID))
 
+
+            If Boolean.Parse(e.Row.DataKey("AplicaLote")) Or Boolean.Parse(e.Row.DataKey("AplicaCaducidad")) Then
+
+                CargarCaducidadProducto(e.Row.DataKey("CvePS").ToEntero, e.Row.FCDropDownList("DdlCaducidadProducto"))
+
+            End If
+
         End If
     End Sub
 
 
+    Protected Sub DdlCaducidadProducto_SelectedIndexChanged(sender As Object, e As EventArgs)
+
+        Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, DropDownList)).NamingContainer, GridViewRow)
+
+        Dim AplicaLote As Boolean = Boolean.Parse(GvRow.DataKey("AplicaLote"))
+        Dim AplicaCaducidad As Boolean = Boolean.Parse(GvRow.DataKey("AplicaCaducidad"))
+        Dim DdlCaducidadProducto As DropDownList = GvRow.FCDropDownList("DdlCaducidadProducto")
+
+        Dim ArrayCaducidad As String() = DdlCaducidadProducto.SelectedValue.Split("|"c)
+        Dim Lote As String = ArrayCaducidad(0)
+        Dim FechaCaducidad As String = ArrayCaducidad(1)
+
+
+
+        If AplicaLote Then
+            GvRow.FCTextBox("TxtLote").Text = Lote
+        End If
+
+        If AplicaCaducidad Then
+            GvRow.FCTextBox("TxtCaducidad").Text = FechaCaducidad
+        End If
+
+        UpDatosArmado.Update()
+
+    End Sub
+
+    Private Sub CargarCaducidadProducto(CvePS As Integer, ByRef DdlLoteFechaCaducidad As DropDownList)
+
+        Dim almacenes As String = DdlAlmacenArmado.SelectedValue
+        If almacenes = "" Then
+            almacenes = "-1"
+        End If
+
+        Dim ObjInventarios As New ClsInventarios
+
+        If ObjInventarios.GetExistenciasCaducidad(CvePS, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, almacenes) Then
+
+            For Each dr As DataRow In ObjInventarios.DtResultados.Rows
+                DdlLoteFechaCaducidad.Items.Add(New ListItem($"Lote: {dr("Lote").ToString} - Cad: {dr("FechaCaducidad").ToString.ToDate.ToString("dd/MM/yyyy")}", $"{dr("Lote").ToString}|{dr("FechaCaducidad").ToString.ToDate.ToString("dd/MM/yyyy")}"))
+            Next
+
+        End If
+        ObjInventarios.Dispose()
+
+    End Sub
+
+
     Protected Sub Dividir(sender As Object, e As EventArgs)
         Dim index2 As Integer = 0
 

OS/Asignaciones.aspx

@@ -234,6 +234,8 @@
                                                 </cc1:TimeSelector>
                                             </ItemTemplate>
                                         </asp:TemplateField>
+                                        <%--11--%>
+                                        <asp:BoundField DataField="SerieFolio" HeaderText="Folio Ped" ItemStyle-HorizontalAlign="Left" Visible="false" />
                                     </Columns>
                                 </asp:GridView>
                             </div>

OS/Asignaciones.aspx.vb

@@ -100,6 +100,7 @@ Partial Class OS_Asignaciones
 
             GvNA.Columns(7).Visible = True
             GvNA.Columns(8).Visible = True
+            GvNA.Columns(11).Visible = True
 
 
             GvNA.Columns(2).HeaderText = "Hospital"

OS/OrdenesServicios.aspx

@@ -290,6 +290,27 @@
 
                                         </div>
 
+                                          <div class="row" id="DivFolioAdicional" runat="server" visible="false">
+    
+                                            <div class="col-md-2" style="margin-top: 5px">
+                                                <b>Folio Adicional:</b>
+                                            </div>
+
+                                            <div class="col-md-4" style="margin-top: 5px; text-align: left">
+                                               <asp:Label runat="server" ID="LblFolioAdicional"></asp:Label>
+                                            </div>
+
+                                            <div class="col-md-2" style="margin-top: 5px">
+                                               
+                                            </div>
+
+                                            <div class="col-md-3" style="margin-top: 5px; text-align: left">
+                                               
+                                            </div>
+  
+
+                                        </div>
+
                                        
                                     </div>
                                 </div>
@@ -1321,6 +1342,7 @@
                                     </div>
                               </div>
                           </div>
+                    
                         <br />
                         <div class="row">
                             <div class="col-md-12">

OS/OrdenesServicios.aspx.vb

@@ -733,6 +733,10 @@ Partial Class OS_OrdenesServicios
 
                 TxtPaciente.Text = ObjOS.Paciente
                 TxtIdentificadorCliente.Text = ObjOS.IdentificadorCliente
+                LblFolioAdicional.Text = ObjOS.FolioAdicional
+                DivFolioAdicional.Visible = If(ObjOS.FolioAdicional.Trim.Length > 0, True, False)
+
+
 
                 CargaEventoBitacora()
                 CargaHistorial()
@@ -3314,7 +3318,7 @@ Partial Class OS_OrdenesServicios
                     ProcesoOK = False
                 End If
                 If ProcesoOK Then
-                    If Not ObjOS.UpdateVentaOS(Respuesta.CveVenta, CveOS, TxtPacienteModal.Text.Trim, TxtEpisodioModal.Text.Trim) Then
+                    If Not ObjOS.UpdateVentaOS(Respuesta.CveVenta, CveOS, TxtPacienteModal.Text.Trim, TxtEpisodioModal.Text.Trim, FolioAdicional:=TxtFolioRemisionModal.Text.Trim) Then
                         ProcesoOK = False
                     End If
                 End If

OS/RepOSMedicas.aspx

@@ -205,6 +205,10 @@
                     <asp:HyperLinkField HeaderText="Remisión" DataTextField="SerieFolioRemision" ControlStyle-CssClass="Texto" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" DataNavigateUrlFields="CveVentaRemision"  Target="_blank" />
                     <%--13--%>
                     <asp:BoundField HeaderText="Observaciones" DataField="Observaciones"  visible="false" /> 
+                    <%--14--%>
+                    <asp:BoundField HeaderText="Folio Adicional" DataField="FolioAdicional"  visible="false" /> 
+
+
                 </Columns>
                 
             </asp:GridView>
@@ -229,6 +233,7 @@
                               <tbody>
                                   <tr>
                                       <td style="text-align: left;"><asp:CheckBox ID="ChkObservaciones" runat="server" Text="&nbsp;Observaciones" Checked="false" /></td>
+                                      <td style="text-align: left;"><asp:CheckBox ID="ChkFolioAdicional" runat="server" Text="&nbsp;Folio Adicional" Checked="false" /></td>
                                   </tr>                             
  
                               </tbody>

OS/RepOSMedicas.aspx.vb

@@ -224,6 +224,7 @@ Partial Class OS_RepOSMedicas
 
     Private Sub Personaliza()
         GvDatos.Columns(13).Visible = ChkObservaciones.Checked
+        GvDatos.Columns(14).Visible = ChkFolioAdicional.Checked
         CargaDatos()
     End Sub
 

Styles/AjaxControlToolkit/Styles/Tabs.css

@@ -86,7 +86,7 @@
     border: 1px solid #999999;
     border-top: 0;
     font-family: verdana,tahoma,helvetica;
-    font-size: 10pt;
+    font-size: 12px;
     padding: 8px;
 }
 

Ventas/PVCobranza.aspx

@@ -815,7 +815,11 @@
     </div>
 </asp:Content>
 <asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
+    <script src="/Scripts/PrintJS/print.min.js"></script>
     <script type="text/javascript">
+        function impresionDirecta(urlPDF) {
+            printJS({ printable: urlPDF, type: 'pdf', showModal: true });
+        }
         function CalculaTotalPagoContado() {
             debugger;
             var totalEfectivo = ToDouble($get("TxtImporteEfectivo").value);

Ventas/PVCobranza.aspx.vb

@@ -234,16 +234,22 @@ Partial Class Ventas_PVCobranza
             Dim CveVenta As Integer = e.CommandArgument.ToString.ToEntero
             Dim ObjVentas As New ClsVentas
             ObjVentas.IniciaTransacSQL()
-            If Not ObjVentas.UpdateAsignaVentaCobranza(CveVenta, 1, UsuarioActual.CveUsuario, -1, "", Now) Then
+
+            Try
+                If Not ObjVentas.UpdateAsignaVentaCobranza(CveVenta, 1, UsuarioActual.CveUsuario, -1, "", Now) Then
+                    TieneError = True
+                End If
+                HdnCveVenta.Value = CveVenta.ToString
+                TxtImporteEfectivo.Text = GvRow.DataKey("Saldo").FormatoNumero
+                TxtImporteContado.Text = GvRow.DataKey("Saldo").FormatoNumero
+                HdnTotal.Value = GvRow.DataKey("Saldo")
+                TxtImporteEfectivo.Focus()
+                LtlNombre.Text = GvRow.DataKey("DescripcionVenta")
+                LtlSaldo.Text = GvRow.DataKey("Saldo").ToDecimal.FormatoNumero
+            Catch ex As Exception
                 TieneError = True
-            End If
+            End Try
-            HdnCveVenta.Value = CveVenta.ToString
+
-            TxtImporteEfectivo.Text = GvRow.DataKey("Saldo").FormatoNumero
-            TxtImporteContado.Text = GvRow.DataKey("Saldo").FormatoNumero
-            HdnTotal.Value = GvRow.DataKey("Saldo")
-            TxtImporteEfectivo.Focus()
-            LtlNombre.Text = GvRow.DataKey("DescripcionVenta")
-            LtlSaldo.Text = GvRow.DataKey("Saldo").ToDecimal.FormatoNumero
             'carga información para cobranza
 
             If Not TieneError Then
@@ -270,10 +276,15 @@ Partial Class Ventas_PVCobranza
         End If
 
         Dim CveVenta As Integer = HdnCveVenta.Value.ToEntero
+
+        Dim DbRowVenta As DataRow = Nothing
         Dim ObjVentas As New ClsVentas
         If ObjVentas.GetVenta(CveVenta, UsuarioActual.CveEmpresa) Then
-            Dim DbRowVenta As DataRow = ObjVentas.DtResultados.FiltroPrimero("")
+            DbRowVenta = ObjVentas.DtResultados.Copy().FiltroPrimero("")
+        End If
+        ObjVentas.Dispose()
 
+        If DbRowVenta IsNot Nothing Then
             Dim VentaActual As New Venta(UsuarioActual)
             VentaActual.CveVenta = CveVenta
 
@@ -293,54 +304,77 @@ Partial Class Ventas_PVCobranza
             VentaActual.UsuarioActual = UsuarioActual
             VentaActual.CveSubProyecto = DbRowVenta("CveSubProyecto").ToString.ToEntero
 
-            Dim ObjConta As New ClsContabilidad
-            Dim ObjIE As New ClsBancos(ObjConta.IniciaTransacSQL())
-            Dim ObjVentas2 As New ClsVentas(ObjConta.IniciaTransacSQL())
-
             Dim CvePrePoliza As Integer
             Dim Fecha As Date = NowADS()
             Dim PagoEfectivo As Decimal = TxtImporteEfectivo.Text.ToDecimal
-            Dim Mensaje As String = ""
+            Dim MsgError As String = ""
             Dim SaldoPendiente As Decimal = VentaActual.Total
 
-            CvePrePoliza = ObjConta.AddPrePolizas("PVCobranza", 5, 0, 0, 1, Fecha, $"Pago {VentaActual.SerieFolio}", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
+            Dim ObjConta As New ClsContabilidad
+            Dim ObjIE As New ClsBancos(ObjConta.IniciaTransacSQL())
+            Dim ObjVentas2 As New ClsVentas(ObjConta.IniciaTransacSQL())
+            Try
+                CvePrePoliza = ObjConta.AddPrePolizas("PVCobranza", 5, 0, 0, 1, Fecha, $"Pago {VentaActual.SerieFolio}", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
 
-            If CvePrePoliza > 0 Then
+                If CvePrePoliza > 0 Then
 
-                If PagoEfectivo > 0 Then
+                    If PagoEfectivo > 0 Then
-                    If PagoEfectivo > VentaActual.Total Then
+                        If PagoEfectivo > VentaActual.Total Then
-                        TxtCambio.Text = (VentaActual.Total - PagoEfectivo).FormatoNumero
+                            TxtCambio.Text = (VentaActual.Total - PagoEfectivo).FormatoNumero
-                        PagoEfectivo = VentaActual.Total
+                            PagoEfectivo = VentaActual.Total
+                        End If
+                        MsgError = RegistraIE(13, DdlCuentaEfectivo.SelectedValue.ToEntero, PagoEfectivo, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
+                    End If
+                    SaldoPendiente -= PagoEfectivo
+                    If SaldoPendiente > 0 AndAlso TxtImporteCredito.Text.ToDecimal > 0 Then
+                        MsgError = RegistraIE(12, DdlCuentaTarjetaCredito.SelectedValue.ToEntero, TxtImporteCredito.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
+                        PagoEfectivo = TxtImporteCredito.Text.ToDecimal
+                    End If
+                    SaldoPendiente -= PagoEfectivo
+                    If SaldoPendiente > 0 AndAlso TxtImporteDebito.Text.ToDecimal > 0 Then
+                        MsgError = RegistraIE(11, DdlCuentaTarjetaDebito.SelectedValue.ToEntero, TxtImporteDebito.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
+                        PagoEfectivo = TxtImporteDebito.Text.ToDecimal
+                    End If
+                    If SaldoPendiente > 0 AndAlso TxtImporteCheque.Text.ToDecimal > 0 Then
+                        MsgError = RegistraIE(3, DdlCuentaCheque.SelectedValue.ToEntero, TxtImporteCheque.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
+                        PagoEfectivo = TxtImporteCheque.Text.ToDecimal
                     End If
-                    Mensaje = RegistraIE(13, DdlCuentaEfectivo.SelectedValue.ToEntero, PagoEfectivo, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
-                End If
-                SaldoPendiente -= PagoEfectivo
-                If SaldoPendiente > 0 AndAlso TxtImporteCredito.Text.ToDecimal > 0 Then
-                    Mensaje = RegistraIE(12, DdlCuentaTarjetaCredito.SelectedValue.ToEntero, TxtImporteCredito.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
-                    PagoEfectivo = TxtImporteCredito.Text.ToDecimal
-                End If
-                SaldoPendiente -= PagoEfectivo
-                If SaldoPendiente > 0 AndAlso TxtImporteDebito.Text.ToDecimal > 0 Then
-                    Mensaje = RegistraIE(11, DdlCuentaTarjetaDebito.SelectedValue.ToEntero, TxtImporteDebito.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
-                    PagoEfectivo = TxtImporteDebito.Text.ToDecimal
-                End If
-                If SaldoPendiente > 0 AndAlso TxtImporteCheque.Text.ToDecimal > 0 Then
-                    Mensaje = RegistraIE(3, DdlCuentaCheque.SelectedValue.ToEntero, TxtImporteCheque.Text.ToDecimal, Fecha, CvePrePoliza, VentaActual, ObjIE, ObjConta, ObjVentas2)
-                    PagoEfectivo = TxtImporteCheque.Text.ToDecimal
-                End If
 
-            Else
+                Else
-                Mensaje = "Error al registrar prepólizas"
+                    MsgError = "Error al registrar prepólizas"
-            End If
+                End If
+            Catch ex As Exception
+                MsgError = "Error al registrar el pago"
+                GuardaLog(ex.ToString())
+            End Try
 
-            If Mensaje = "" Then
+            If MsgError = "" Then
-                PnlContado.Visible = False
                 ObjConta.Commit()
-                CargaDatos()
                 Alert($"Pago Registrado correctamente.<br/><br/> <a href=""/Compras/PopUpVerFactura.aspx?P={Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1&TICKET=1&REGENERAR=1", CveVenta))}"" class='Texto'>Imprimir ticket</a>", TipoMensaje.MsgInformacion)
             Else
                 ObjConta.RollBack()
+                Alert(MsgError, TipoMensaje.MsgError)
             End If
+
+            ObjConta.Dispose()
+            ObjIE.Dispose()
+            ObjVentas2.Dispose()
+
+            If MsgError = "" Then
+                Try
+                    If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
+                        ImpresionDirectaPDF(HdnCveVenta.Value.ToEntero)
+                    End If
+
+                    PnlContado.Visible = False
+                    HdnCveVenta.Value = ""
+                    CargaDatos()
+                Catch ex As Exception
+                    GuardaLog(ex.ToString())
+                End Try
+            End If
+        Else
+            Alert("Ocurrió un error al cargar la venta", TipoMensaje.MsgError)
         End If
 
     End Sub
@@ -498,4 +532,33 @@ Partial Class Ventas_PVCobranza
         End If
         ObjPVenta.Dispose()
     End Sub
+
+    Private Sub ImpresionDirectaPDF(CveVenta As Integer)
+        Dim ObjFactura As New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, CargaDTDetalle:=False, CargaDatosCliente:=False, CargaDatosRelacionados:=False, VerificaAlmacen:=False)
+
+        Dim ExistePDF As Boolean = False
+        Dim ArchivoPDF As String = String.Format("{0}/PDF/{1}/{2}.pdf", UsuarioActual.Empresa.Ruta, ObjFactura.TipoDocto, ObjFactura.SerieFolio)
+
+        If System.IO.File.Exists(ArchivoPDF) Then
+            ExistePDF = True
+        Else
+            'REGENERAR EL PDF
+            Try
+                GenerarPDFVenta(CveVenta, AplicaPagare:="1", GuardarPDF:=True, RegenerarPDF:=True, DescargarArchivo:=False)
+                If System.IO.File.Exists(ArchivoPDF) Then
+                    ExistePDF = True
+                End If
+            Catch ex As Exception
+                OnError("Ocurrió un error al regenerar el PDF", ex)
+            End Try
+        End If
+
+        If ExistePDF Then
+            Dim urlPDF As String = $"/Ashx/SIGDesc.ashx?metodo=descargarPDFVenta&CveVenta={CveVenta}"
+            RegistraScript($"impresionDirecta('{urlPDF}');", "Imprimir")
+        Else
+            Alert("No se pudo imprimir el pdf directamente. favor de descargar manualmente el pdf.", TipoMensaje.MsgAdvertencia)
+        End If
+
+    End Sub
 End Class

Ventas/RepVentas.aspx.vb

@@ -2,11 +2,8 @@
 Option Strict On
 
 Imports System.Data
-Imports System.Web.Compilation
 Imports Extensiones
 Imports Microsoft.Reporting.WebForms
-Imports System.Xml.Serialization
-Imports System.IO
 Imports System.Xml
 
 Partial Class Ventas_RepVentas
@@ -116,20 +113,6 @@ Partial Class Ventas_RepVentas
             If UsuarioActual.CveEmpresa = 72 AndAlso UsuarioActual.CveUsuario.Contiene(100, 1614, 1517) Then
                 liRepHP.Visible = True
             End If
-
-            'SI ES EL USUARIO SISTEMA MOSTRAR LA MODALIDAD CONTABLE (TEMPORAL)
-            'If UsuarioActual.CveUsuario = 100 Then
-            'divModalidadcontable.Visible = True
-            'End If
-
-            'Modalidad Cotizacion
-            If Opcion = "Cot" Then
-                DdlTipoComprobante.SelectedValuesIfExistM(Opcion)
-                DdlGrupo.SelectedValueExist("7")
-                DdlTipoComprobante_SelectedIndexChanged(DdlTipoComprobante, EventArgs.Empty)
-                'DdlEstatus.SelectedValue = "-1"
-            End If
-
             CargaGrupo()
 
             If UsuarioActual.CveVendedor > 0 AndAlso Not UsuarioActual.TienePermisoProceso(263) Then
@@ -147,8 +130,14 @@ Partial Class Ventas_RepVentas
                 DVServicioDomicilio.Visible = True
                 DivLblDistr.Visible = True
                 DivDistr.Visible = True
+                'Modalidad Cotizacion
+                If Opcion = "Cot" Then
+                    DdlTipoComprobante.SelectedValuesIfExistM(Opcion)
+                    DdlGrupo.SelectedValueExist("7")
+                    DdlTipoComprobante_SelectedIndexChanged(DdlTipoComprobante, EventArgs.Empty)
+                    DdlEstatus.ClearSelection()
+                End If
             End If
-
             PrePersonalizacion()
             CargaPersonalizacion()
 
@@ -297,11 +286,8 @@ Partial Class Ventas_RepVentas
         Agrupador = DdlGrupo.SelectedItem.Text
         CveProyecto = DdlProyecto.SelectedValue.ToEntero
         ObjVentas.Dispose()
-
-
         GvDatosDataBind()
 
-
         Primeracontsulta = False
     End Sub
 
@@ -998,22 +984,16 @@ Partial Class Ventas_RepVentas
 
     Protected Sub LnkDescargaCartaPorte_Click(sender As Object, e As EventArgs)
 
-
         Dim ObjVentas As New ClsVentas
         Dim DTDataos As New DataTable
         Dim CveSubProyectos As String = If(DdlSubProyecto.GetSelectedValuesM = "", "-1", DdlSubProyecto.GetSelectedValuesM)
 
-
         If ObjVentas.GetListadoCartaPorteRep(txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveSubProyectos, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then
             DTDataos = ObjVentas.DtResultados
         End If
 
         ObjVentas.Dispose()
-
-
         DTDataos.ExportToExcel("RepCartasPorte")
-
-
     End Sub
 
     Protected Sub ImgExcelPersonalizado_Click(sender As Object, e As EventArgs) Handles ImgExcelPersonalizado.Click

Ventas/Ventas.aspx

@@ -1256,7 +1256,7 @@
                                                             <asp:ListItem Selected="True" Text="Seleccione la Clasificación (Todas)" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
                                                         <asp:Literal ID="LtlPSEdit" runat="server" Visible="false" Text='<%# Eval("PS") %>'></asp:Literal>
-                                                        <ADS:Dropdownlost runat="server" ID="DdlPS" CssStyle="width: 100%;" CssClass="DdlPS" CssClassDdl="select2me " DataTextField="PSCodigo" DataValueField="CvePS" data-onresult="CargaExistenciaAlmacenes" />
+                                                        <ADS:Dropdownlost runat="server" ID="DdlPS" CssStyle="width: 100%;" CssClass="DdlPS" CssClassDdl="select2me " DataTextField="PSCodigo" DataValueField="CvePS" data-onresult="CargaExistenciaAlmacenes" Onselectedindexchange="DdlPSEdit_SelectedIndexChanged" />
                                                         <%--<asp:RequiredFieldValidator ID="RFVPS" runat="server" ControlToValidate="DdlPS" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto o Servicio''</b> es necesario, por favor seleccione uno." ValidationGroup="GprGV" CssClass="select2me"></asp:RequiredFieldValidator>--%>
                                                         <%--<ajax:ValidatorCalloutExtender ID="VCOPS" runat="server" HighlightCssClass="vco" TargetControlID="RFVPS" Width="300px"></ajax:ValidatorCalloutExtender>--%>
                                                     </EditItemTemplate>
@@ -1404,8 +1404,8 @@
                                                 <%--19--%>
                                                 <asp:TemplateField ItemStyle-HorizontalAlign="Center">
                                                     <ItemTemplate>
-                                                        <asp:LinkButton ID="LnkDescuentos" runat="server" Visible="false" AlternateText="Clonar" CausesValidation="False" CommandName="Descuento" CommandArgument='<%# GvPS.Rows.Count.ToString() %>'
+                                                        <asp:LinkButton ID="LnkDescuentos" runat="server" Visible="false" AlternateText="Descuento" CausesValidation="False" CommandName="Descuento" CommandArgument='<%# GvPS.Rows.Count.ToString() %>'
-                                                            CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-comment-o'></i>" />
+                                                            CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-percent'></i>" />
                                                         <asp:LinkButton ID="imgClone" runat="server" AlternateText="Clonar" CausesValidation="False" CommandName="Clonar" CommandArgument='<%# GvPS.Rows.Count.ToString() %>'
                                                             CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-clone'></i>" />
                                                     </ItemTemplate>
@@ -4336,6 +4336,7 @@
                         </div>
                         <div class="modal-body">
                             <asp:HiddenField ID="HdnDescPS" runat="server" ClientIDMode="Static" Value="0" />
+                            <asp:HiddenField ID="HdnIVADescPS" runat="server" ClientIDMode="Static" Value="0" />
                             <asp:HiddenField ID="HdnConsecPS" runat="server" ClientIDMode="Static" Value="-1" />
                             <asp:HiddenField ID="HdnTotalCompra" runat="server" ClientIDMode="Static" Value="0" />
                             <table style="width: 90%">
@@ -4350,16 +4351,16 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td>% Descuento</td>
+                                    <td>Descuento</td>
                                     <td>
                                         <asp:TextBox ID="TxtPorPS" runat="server" CausesValidation="true" ClientIDMode="Static" MaxLength="12" Text="0" ValidationGroup="GrpDescuentoP" Width="72px"></asp:TextBox>
                                         <asp:CompareValidator ID="CVPorPS" runat="server" ControlToValidate="TxtPorPS" Display="None" ErrorMessage="El campo <b>''Descuento por Porcentaje''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." Operator="DataTypeCheck" Type="Currency" ValidationGroup="GrpPorPS"></asp:CompareValidator>
                                         <ajax:ValidatorCalloutExtender ID="VCEPorPS" runat="server" HighlightCssClass="vco" TargetControlID="CVPorPS" Width="300px"></ajax:ValidatorCalloutExtender>
                                         &nbsp;(%)
                                     </td>
-                                    <td>IVA</td>
+                                    <td><label style="display:none;">IVA</label></td>
                                     <td>
-                                        <asp:Label ID="LblIVADescPS" runat="server" ClientIDMode="Static" Text="0.00"></asp:Label>
+                                        <asp:Label ID="LblIVADescPS" runat="server" ClientIDMode="Static" Text="0.00" style="display:none;"></asp:Label>
                                     </td>
                                 </tr>
                                 <tr>
@@ -9752,28 +9753,32 @@
                 var PorcentajeDescuento = parseFloat($get("TxtPorPS").value);
                 if (PorcentajeDescuento < 0 || PorcentajeDescuento > 99) {
                     alert("No se puede aplicar ese porcentaje de descuento");
+                    $get("TxtPorPS").value = "0";
                     return;
                 }
+                var ivaPor = parseFloat($get("HdnIVADescPS").value) ;
 
                 var subTotal = parseFloat($get("LblSubtotalDescPS").innerText.replace(",", "").replace(",", ""));
-                var Monto = parseFloat($get("LblTotalDescPS").innerText.replace(",", "").replace(",", ""));
 
-                var Total = Monto - ((Monto * PorcentajeDescuento) / 100);
+                $get("LblDescPS").innerText = formato_numero(((subTotal * PorcentajeDescuento) / 100), 2, '.', ',');
+
+                var descuento = parseFloat($get("LblDescPS").innerText.replace(",", "").replace(",", ""));
+               
+                $get("LblIVADescPS").innerText = formato_numero(((subTotal - descuento) * ivaPor), 2, '.', ','); 
+
+                var importeIVA =parseFloat($get("LblIVADescPS").innerText.replace(",", "").replace(",", ""));
+
+                var Total = (subTotal - descuento) + importeIVA;
 
                 $get("LblTotalFinalDescPS").innerText = formato_numero(Total, 2, '.', ',');
                
-                var TotalRedondeado = parseFloat($get("LblTotalFinalDescPS").innerText.replace(",", "").replace(",", ""));
-
-                var descuento = - ((TotalRedondeado - (subTotal * 1.16)) / 1.16);
-
-                $get("LblIVADescPS").innerText = formato_numero(((subTotal - descuento) * 0.16), 2, '.', ','); 
-
-                $get("LblDescPS").innerText = formato_numero(descuento, 2, '.', ',');
                 $get("HdnDescPS").value = descuento;   
                 
                 var totalCompra = parseFloat($get("HdnTotalCompra").value);
                 if (totalCompra > 0) {
-                    var utilidad  = ((TotalRedondeado - totalCompra) / TotalRedondeado) * 100;
+                    var totalRedondeado = parseFloat($get("LblTotalFinalDescPS").innerText.replace(",", "").replace(",", ""));
+                    var utilidad  = ((totalRedondeado - totalCompra) / totalRedondeado) * 100;
+
                     $get("LblUtilidadPorcentaje").innerText = formato_numero(utilidad, 2, '.', ',');                 
                 }
             }

Ventas/Ventas.aspx.vb

@@ -8069,7 +8069,7 @@ Partial Class Ventas
 
                 End If
 
-                If UsuarioActual.TienePermisoProceso(68) Then
+                If UsuarioActual.TienePermisoProceso(68) OrElse UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
                     e.Row.FCTextBox("TxtPrecio").Enabled = False
                     e.Row.FCTextBox("TxtDescuento").Enabled = False
                 End If
@@ -8393,7 +8393,7 @@ Partial Class Ventas
         DatarowPS = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=TmpDT.Rows(e.RowIndex)("CvePS").ToString().ToEntero()).FiltroPrimero("") ' Estado = -1
 
         'verifica si tiene ventaminima
-        If Cantidad > 0 AndAlso DatarowPS("VentaMinima").ToString().ToDecimal > 0 AndAlso (DdlTipoComprobante.SelectedValue = "Rem" Or DdlTipoComprobante.SelectedValue = "Ing") Then
+        If Cantidad > 0 AndAlso DatarowPS("VentaMinima").ToString().ToDecimal > 0 AndAlso (DdlTipoComprobante.SelectedValue.Contiene("Rem", "Ing", "PA")) Then
             'verifico que la cantidad sea multiplo de venta minima, es decir ventaminima =5, solo puede vender 5,10,15...
             If Cantidad Mod DatarowPS("VentaMinima").ToString().ToDecimal <> 0 Then
                 Alert(String.Format("El producto se vende solo en cantidades de {0}", DatarowPS("VentaMinima").ToString()))
@@ -12925,16 +12925,18 @@ Partial Class Ventas
             Timbre.Complementos.ComercioExterior.AplicaComercioExteriorSubProyecto = False
         End If
 
-        If ObjFactura.CveVenta > 0 AndAlso ObjFactura.EsFacturaGlobal Then
+        If Obj IsNot Nothing Then
-            Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {ObjFactura.CveSATMes}")
+            If Obj.CveVenta > 0 AndAlso Obj.EsFacturaGlobal Then
-            Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {ObjFactura.CveSATPeriodicidad}")
+                Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {Obj.CveSATMes}")
+                Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {Obj.CveSATPeriodicidad}")
 
-            Timbre.InformacionGlobal = New CFDIInformacionGlobal() With {
+                Timbre.InformacionGlobal = New CFDIInformacionGlobal() With {
-                .Año = ObjFactura.SATAnio.ToString(),
+                    .Año = Obj.SATAnio.ToString(),
-                .Meses = SATMes,
+                    .Meses = SATMes,
-                .Perioricidad = SATPerioricidad
+                    .Perioricidad = SATPerioricidad
-            }
+                }
 
+            End If
         End If
 
         Return Timbre
@@ -17093,6 +17095,35 @@ Partial Class Ventas
     Protected Sub DdlPS_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles DdlPS.selectedindexchange
         DdlPSIndexChange(DdlPS.SelectedValue.ToEntero(), DdlPS)
     End Sub
+
+    Protected Sub DdlPSEdit_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs)
+        If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
+            If GvPS.EditIndex >= 0 Then
+                Dim ddlPSEdit = DirectCast(sender, ADServerControl.Dropdownlost)
+                Dim GvRow = DirectCast(ddlPSEdit.NamingContainer, GridViewRow)
+
+                If (GvRow.RowState = DataControlRowState.Edit OrElse GvRow.RowState = 5) Then
+                    Dim CvePSParametro = ddlPSEdit.SelectedValue.ToEntero()
+
+                    Dim DrPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSParametro).FiltroPrimero("")
+                    If DrPS IsNot Nothing Then
+                        'SUGIERE PRECIO
+                        Dim PrecioSugerido As Decimal = 0
+                        Dim tPrecioSugerido As Decimal = 0
+                        tPrecioSugerido = DrPS("Precio").ToString().ToDecimal
+                        Dim ObjPrecioSugerido As Modelos.MPrecioSugerido = CalculaPrecioSugerido(CvePSParametro, DrPS("CveClasificacion").ToString().ToEntero())
+
+                        PrecioSugerido = ObjPrecioSugerido.PrecioSugerido
+
+                        If PrecioSugerido <= 0 Then PrecioSugerido = tPrecioSugerido
+
+                        GvRow.FCTextBox("TxtPrecio").Text = PrecioSugerido.ToString("#,###.####") ' que muestre hasta los 4 digitos si lo requiere
+                    End If
+                End If
+            End If
+        End If
+
+    End Sub
     Protected Sub DdlClasificacion_SelectedIndexChanged(sender As Object, e As System.EventArgs) Handles DdlClasificacion.SelectedIndexChanged
         CargaPS(DdlClasificacion.SelectedValue.ToEntero(), DdlPS)
         UpPS.Update()
@@ -23994,24 +24025,36 @@ Partial Class Ventas
         ElseIf e.CommandName = "Descuento" Then
             LblSubtotalDescPS.Text = ""
             LblTotalDescPS.Text = ""
+            LblTotalFinalDescPS.Text = ""
+
             LblTituloDesc.Text = "Descuento"
             HdnConsecPS.Value = "-1"
             HdnTotalCompra.Value = ""
             TxtPorPS.Text = ""
             LblIVADescPS.Text = ""
+            LblUtilidadPorcentaje.Text = ""
+            HdnIVADescPS.Value = "0"
 
             Dim GvRow As GridViewRow = GvPS.Rows(e.CommandArgument.ToString().ToEntero())
             LblTituloDesc.Text = $"Descuento: {GvRow.DataKey("PS")}"
             HdnConsecPS.Value = GvRow.DataKey("Consec")
             LblSubtotalDescPS.Text = (GvRow.DataKey("Total").ToDecimal()).FormatoNumero()
             LblTotalDescPS.Text = (GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal()).FormatoNumero()
+            LblTotalFinalDescPS.Text = (GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal()).FormatoNumero()
             LblIVADescPS.Text = GvRow.DataKey("ImporteIVA").FormatoNumero()
+            HdnIVADescPS.Value = GvRow.DataKey("IVA").FormatoNumero()
 
             Using ObjPS As New ClsProductosServicios
                 Dim PrecioCompra = ObjPS.GetUltimoPrecioCompra(UsuarioActual.CveEmpresa, GvRow.DataKey("CvePS").ToEntero())
                 If PrecioCompra > 0 Then
-                    HdnTotalCompra.Value = (PrecioCompra * GvRow.DataKey("Cantidad").ToDouble() * 1.16).ToString()
+                    Dim TotalCompra = (PrecioCompra * GvRow.DataKey("Cantidad").ToDouble() * (1 + GvRow.DataKey("IVA").ToDecimal()))
-                    LblPrecioCompra.Text = $"PU Compra: {(PrecioCompra * 1.16).FormatoNumero(2)}"
+                    HdnTotalCompra.Value = TotalCompra.ToString()
+                    LblPrecioCompra.Text = $"PU Compra: {(PrecioCompra).FormatoNumero(2)}"
+
+                    Dim TotalRedondeado = GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal()
+
+                    Dim PorUtilidad = ((TotalRedondeado - TotalCompra) / TotalRedondeado) * 100D
+                    LblUtilidadPorcentaje.Text = PorUtilidad.FormatoNumero(2)
                 End If
             End Using
 
@@ -36972,16 +37015,28 @@ Partial Class Ventas
         If HdnDescPS.Value.ToEntero() > 0 Then
             Dim RowUpdate As DataRow = TmpDT.Select($"Consec = {HdnConsecPS.Value}").FirstOrDefault()
             If RowUpdate IsNot Nothing Then
-                RowUpdate("Descuento") = HdnDescPS.Value.ToDecimal()
+                If HdnDescPS.Value.ToDecimal().RoundSQL(2) < RowUpdate("Total").ToString().ToDecimal() Then
-                RowUpdate("ImporteIVA") = LblIVADescPS.Text.ToDecimal()
+                    RowUpdate("Descuento") = HdnDescPS.Value.ToDecimal().RoundSQL(2)
+
+                    Dim TotalCalculableImpuestos = (RowUpdate("Cantidad").ToString().ToDecimal * RowUpdate("PU").ToString().ToDecimal) - RowUpdate("Descuento").ToString().ToDecimal()
+                    Dim TotalCalculableImpuestosIVA As Decimal = (TotalCalculableImpuestos * (1 + RowUpdate("PorcentajeIEPS").ToString().ToDecimal))
+
+                    Dim ImporteIVA = (RowUpdate("PorcentajeIVA").ToString().ToDouble * TotalCalculableImpuestosIVA).RoundSQL(NumeroDecimales)
+
+                    RowUpdate("ImporteIVA") = ImporteIVA
+
+                    CalculaTotalesVenta()
+                    RegistraScript("$('#ModalDescPS').modal('hide');")
+                Else
+                    Alert("El descuento no puede ser mayor o igual al total.", TipoMensaje.MsgAdvertencia)
+                End If
 
-                CalculaTotalesVenta()
-                RegistraScript("$('#ModalDescPS').modal('hide');")
             End If
         Else
             Alert("No se pudo aplicar el descuento", TipoMensaje.MsgAdvertencia)
         End If
 
     End Sub
+
 End Class