diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 99efd2b31..eeaf57f4e 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -454,7 +454,8 @@ Public Class ClsVentas Optional CorreoNotificacion As String = "", Optional FormaPaqueteria As Integer = 1, Optional FacturarSucursal As Boolean = False, Optional VentaDesglosaIEPS As Boolean = False, Optional ServicioDomicilio As Boolean = False, Optional RFCReceptor As String = "", Optional Adjunto As String = "-1", Optional DevolucionImportePagado As Decimal = 0, Optional EsGarantia As Boolean = False, Optional CveLineaAdicional As Integer = -1, Optional DescripcionVenta As String = "", Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False, - Optional FechaParaSurtir As DateTime = MinFecha, Optional Paciente As String = "-1", Optional Episodio As String = "-1", Optional EsFacturaGlobal As Boolean = False, Optional CveSATPeriodicidad As Integer = -1, Optional CveSATMes As Integer = -1, Optional SATAnio As Integer = -1, Optional CveMotivoDevolucion As Integer = -1) As Boolean + Optional FechaParaSurtir As DateTime = MinFecha, Optional Paciente As String = "-1", Optional Episodio As String = "-1", Optional EsFacturaGlobal As Boolean = False, Optional CveSATPeriodicidad As Integer = -1, Optional CveSATMes As Integer = -1, Optional SATAnio As Integer = -1, Optional CveMotivoDevolucion As Integer = -1, + Optional Addenda As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_VentasAdd") @@ -569,6 +570,7 @@ Public Class ClsVentas .Add("@SATAnio", SqlDbType.Int).Value = SATAnio .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue .Add("@CveMotivoDevolucion", SqlDbType.Int).Value = CveMotivoDevolucion + .Add("@Addenda", SqlDbType.VarChar).Value = Addenda End With 'SqlTypes.SqlDateTime.Null Try diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index d98568038..d89ca7f8b 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -5,6 +5,7 @@ Imports System.Data Imports System.IO Imports System.Net.Http Imports System.Xml +Imports System.Xml.Serialization Imports Extensiones Imports Microsoft.Reporting.WebForms @@ -401,6 +402,25 @@ Namespace Modelos Public Property TipoFolio As String Public Property Valido As Boolean + + End Class + + + Public Class M_REM + + Public Property NOS As String + + Public Property _OR As String + + Public Property CLUES As String + + Public Property CONTRATO As String + + Public Property FEEX As String + + Public Property FEEN As String + + Public Property FERE As String End Class Public Enum TipoMensajeRespuesta TextoLimpio = 0 @@ -8037,6 +8057,7 @@ Namespace Modelos Public Property CveMotivoCancelacion As Integer = -1 Public Property MotivoCancelacion As String = "" Public Property TipoContable As Integer = -1 + Public Property Addenda As String = "" #End Region diff --git a/App_Code/Timbrado.vb b/App_Code/Timbrado.vb index 273a16ad0..a593378e5 100644 --- a/App_Code/Timbrado.vb +++ b/App_Code/Timbrado.vb @@ -2237,6 +2237,13 @@ Public Class Timbrado GeneraAddendaFord(RutaCadena, FolioFactura, Ventas.FordASN, Ventas.FordGSDB) End If + + 'Si tiene una addenda personalizada, agregarla al xml + If Not String.IsNullOrEmpty(Ventas.Addenda) Then + Dim RutaCadena As String = String.Format("{0}{1}.xml", RutaArchivo, NombreArchivoXML) + GeneraAddenda(RutaCadena, Ventas.Addenda) + End If + End If End Select '---------------------- @@ -3013,6 +3020,12 @@ concep.DescripcionesEspecificas.NumeroSerie) End If + 'Si tiene una addenda personalizada, agregarla al xml + If Not String.IsNullOrEmpty(Ventas.Addenda) Then + Dim RutaCadena As String = String.Format("{0}{1}.xml", RutaArchivo, NombreArchivoXML) + GeneraAddenda(RutaCadena, Ventas.Addenda) + End If + End If End Select @@ -3288,6 +3301,12 @@ concep.DescripcionesEspecificas.NumeroSerie) End If + 'Si tiene una addenda personalizada, agregarla al xml + If Not String.IsNullOrEmpty(Ventas.Addenda) Then + Dim RutaCadena As String = String.Format("{0}{1}.xml", RutaArchivo, NombreArchivoXML) + GeneraAddenda(RutaCadena, Ventas.Addenda) + End If + End If End Select @@ -3502,7 +3521,7 @@ concep.DescripcionesEspecificas.NumeroSerie) End Using End Sub - Private Sub GeneraAddendaFord(Archivo As String, pFolio As String, LstFordASN As ListBox, FordGSDBM As String) + Private Sub GeneraAddenda(Archivo As String, Addenda As String) Dim cfdi As String = "" Dim SB As New StringBuilder Try @@ -3513,28 +3532,13 @@ concep.DescripcionesEspecificas.NumeroSerie) End Using Catch e As Exception Alert("The file could not be read:", TipoMensaje.MsgError) - End Try - cfdi = cfdi.Replace("", "") SB.Append(cfdi) - - SB.Append("") - SB.AppendFormat("{0}", FordGSDBM.Trim.ToUpper) - - If pFolio <> "" Then SB.AppendFormat("{0}", pFolio) - 'If TxtFordASN2.Text.Trim <> "" Then SB.AppendFormat("{0}", TxtFordASN2.Text.Trim) - - For Each li As ListItem In LstFordASN.Items - - SB.AppendFormat("{0}", li.Text) - - Next - - SB.Append("") - + SB.AppendFormat("{0}", Addenda) + SB.Append("") Using outfile As New StreamWriter(Archivo) outfile.Write(SB.ToString()) diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index 5e4ec35f7..b98899480 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -935,11 +935,11 @@